From 34f8ec6a29af7a499ce6ab1aab4a484380637889 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Sat, 20 Jan 2024 10:41:21 +0100
Subject: [PATCH 001/210] CH-110 jupyterhub update wip

---
 .../deploy/resources/hub/jupyterhub_config.py |  148 +-
 .../jupyterhub/deploy/resources/hub/z2jh.py   |   21 +-
 .../jupyterhub/deploy/templates/NOTES.txt     |  158 +
 .../deploy/templates/_helpers-auth-rework.tpl |   18 +-
 .../deploy/templates/_helpers-names.tpl       |   62 +-
 .../deploy/templates/_helpers-netpol.tpl      |  101 +
 .../jupyterhub/deploy/templates/_helpers.tpl  |   63 +-
 .../deploy/templates/hub/configmap.yaml       |    1 +
 .../deploy/templates/hub/deployment.yaml      |   24 +-
 .../deploy/templates/hub/netpol.yaml          |   25 +-
 .../jupyterhub/deploy/templates/hub/pdb.yaml  |    4 -
 .../jupyterhub/deploy/templates/hub/rbac.yaml |   15 +-
 .../deploy/templates/hub/serviceaccount.yaml  |   12 +
 .../deploy/templates/image-pull-secret.yaml   |   15 +
 .../image-puller/_helpers-daemonset.tpl       |   51 +-
 .../deploy/templates/image-puller/job.yaml    |   13 +-
 .../templates/image-puller/priorityclass.yaml |   18 +
 .../deploy/templates/image-puller/rbac.yaml   |   27 +-
 .../image-puller/serviceaccount.yaml          |   21 +
 .../templates/proxy/autohttps/_README.txt     |    9 -
 .../templates/proxy/autohttps/configmap.yaml  |   28 -
 .../templates/proxy/autohttps/deployment.yaml |  141 -
 .../templates/proxy/autohttps/rbac.yaml       |   40 -
 .../templates/proxy/autohttps/service.yaml    |   25 -
 .../deploy/templates/proxy/deployment.yaml    |   14 +-
 .../deploy/templates/proxy/netpol.yaml        |   24 +-
 .../deploy/templates/proxy/pdb.yaml           |    4 -
 .../deploy/templates/proxy/service.yaml       |    9 +-
 .../templates/scheduling/priorityclass.yaml   |   13 -
 .../scheduling/user-placeholder/pdb.yaml      |    4 -
 .../user-placeholder/priorityclass.yaml       |   13 -
 .../user-placeholder/statefulset.yaml         |   15 +-
 .../scheduling/user-scheduler/configmap.yaml  |   20 +-
 .../scheduling/user-scheduler/deployment.yaml |   31 +-
 .../scheduling/user-scheduler/pdb.yaml        |    4 -
 .../scheduling/user-scheduler/rbac.yaml       |   78 +-
 .../user-scheduler/serviceaccount.yaml        |   14 +
 .../deploy/templates/singleuser/netpol.yaml   |   39 +-
 .../deploy/templates/singleuser/secret.yaml   |   17 +
 .../jupyterhub/deploy/values.schema.yaml      | 3014 +++++++++++++++++
 applications/jupyterhub/deploy/values.yaml    |  276 +-
 .../jupyterhub/zero-to-jupyterhub-k8s         |    1 +
 42 files changed, 4013 insertions(+), 617 deletions(-)
 create mode 100644 applications/jupyterhub/deploy/templates/NOTES.txt
 create mode 100644 applications/jupyterhub/deploy/templates/_helpers-netpol.tpl
 create mode 100644 applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml
 create mode 100644 applications/jupyterhub/deploy/templates/image-pull-secret.yaml
 create mode 100644 applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml
 create mode 100644 applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml
 delete mode 100755 applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
 delete mode 100755 applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
 delete mode 100755 applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
 delete mode 100755 applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
 delete mode 100755 applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
 create mode 100644 applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml
 create mode 100644 applications/jupyterhub/deploy/templates/singleuser/secret.yaml
 create mode 100644 applications/jupyterhub/deploy/values.schema.yaml
 create mode 160000 applications/jupyterhub/zero-to-jupyterhub-k8s

diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
index d4b3cee2..8ec801ee 100755
--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
@@ -1,9 +1,17 @@
+# load the config object (satisfies linters)
+c = get_config()  # noqa
+
+import glob
 import os
 import re
 import sys
-import logging
 
+from jupyterhub.utils import url_path_join
+from kubernetes_asyncio import client
 from tornado.httpclient import AsyncHTTPClient
+
+#CLOUDHARNESS: EDIT START
+import logging
 from kubernetes import client
 from jupyterhub.utils import url_path_join
 
@@ -12,7 +20,7 @@
     harness_hub() # activates harness hooks on jupyterhub
 except Exception as e:
     logging.error("could not import harness_jupyter", exc_info=True)
-
+# CLOUDHARNESS: EDIT END
 
 # Make sure that modules placed in the same directory as the jupyterhub config are added to the pythonpath
 configuration_directory = os.path.dirname(os.path.realpath(__file__))
@@ -20,39 +28,13 @@
 
 from z2jh import (
     get_config,
-    set_config_if_not_none,
     get_name,
     get_name_env,
     get_secret_value,
+    set_config_if_not_none,
 )
 
 
-print('Base url is', c.JupyterHub.get('base_url', '/'))
-
-# Configure JupyterHub to use the curl backend for making HTTP requests,
-# rather than the pure-python implementations. The default one starts
-# being too slow to make a large number of requests to the proxy API
-# at the rate required.
-AsyncHTTPClient.configure("tornado.curl_httpclient.CurlAsyncHTTPClient")
-
-c.JupyterHub.spawner_class = 'kubespawner.KubeSpawner'
-
-# Connect to a proxy running in a different pod
-c.ConfigurableHTTPProxy.api_url = 'http://{}:{}'.format(os.environ['PROXY_API_SERVICE_HOST'], int(os.environ['PROXY_API_SERVICE_PORT']))
-c.ConfigurableHTTPProxy.should_start = False
-
-# Do not shut down user pods when hub is restarted
-c.JupyterHub.cleanup_servers = False
-
-# Check that the proxy has routes appropriately setup
-c.JupyterHub.last_activity_interval = 60
-
-# Don't wait at all before redirecting a spawning user to the progress page
-c.JupyterHub.tornado_settings = {
-    'slow_spawn_timeout': 0,
-}
-
-
 def camelCaseify(s):
     """convert snake_case to camelCase
 
@@ -173,6 +155,7 @@ def camelCaseify(s):
     ("events_enabled", "events"),
     ("extra_labels", None),
     ("extra_annotations", None),
+    # ("allow_privilege_escalation", None), # Managed manually below
     ("uid", None),
     ("fs_gid", None),
     ("service_account", "serviceAccountName"),
@@ -206,10 +189,19 @@ def camelCaseify(s):
 if image:
     tag = get_config("singleuser.image.tag")
     if tag:
-        image = "{}:{}".format(image, tag)
+        image = f"{image}:{tag}"
 
     c.KubeSpawner.image = image
 
+# allow_privilege_escalation defaults to False in KubeSpawner 2+. Since its a
+# property where None, False, and True all are valid values that users of the
+# Helm chart may want to set, we can't use the set_config_if_not_none helper
+# function as someone may want to override the default False value to None.
+#
+c.KubeSpawner.allow_privilege_escalation = get_config(
+    "singleuser.allowPrivilegeEscalation"
+)
+
 # Combine imagePullSecret.create (single), imagePullSecrets (list), and
 # singleuser.image.pullSecrets (list).
 image_pull_secrets = []
@@ -255,7 +247,7 @@ def camelCaseify(s):
         pass
     else:
         raise ValueError(
-            "Unrecognized value for matchNodePurpose: %r" % match_node_purpose
+            f"Unrecognized value for matchNodePurpose: {match_node_purpose}"
         )
 
 # Combine the common tolerations for user pods with singleuser tolerations
@@ -271,7 +263,7 @@ def camelCaseify(s):
     pvc_name_template = get_config("singleuser.storage.dynamic.pvcNameTemplate")
     c.KubeSpawner.pvc_name_template = pvc_name_template
     volume_name_template = get_config("singleuser.storage.dynamic.volumeNameTemplate")
-    c.KubeSpawner.storage_pvc_ensure = False
+    c.KubeSpawner.storage_pvc_ensure = True
     set_config_if_not_none(
         c.KubeSpawner, "storage_class", "singleuser.storage.dynamic.storageClass"
     )
@@ -354,41 +346,62 @@ def camelCaseify(s):
 )
 
 c.JupyterHub.services = []
+c.JupyterHub.load_roles = []
 
+# jupyterhub-idle-culler's permissions are scoped to what it needs only, see
+# https://github.com/jupyterhub/jupyterhub-idle-culler#permissions.
+#
 if get_config("cull.enabled", False):
+    jupyterhub_idle_culler_role = {
+        "name": "jupyterhub-idle-culler",
+        "scopes": [
+            "list:users",
+            "read:users:activity",
+            "read:servers",
+            "delete:servers",
+            # "admin:users", # dynamically added if --cull-users is passed
+        ],
+        # assign the role to a jupyterhub service, so it gains these permissions
+        "services": ["jupyterhub-idle-culler"],
+    }
+
     cull_cmd = ["python3", "-m", "jupyterhub_idle_culler"]
     base_url = c.JupyterHub.get("base_url", "/")
     cull_cmd.append("--url=http://localhost:8081" + url_path_join(base_url, "hub/api"))
 
     cull_timeout = get_config("cull.timeout")
     if cull_timeout:
-        cull_cmd.append("--timeout=%s" % cull_timeout)
+        cull_cmd.append(f"--timeout={cull_timeout}")
 
     cull_every = get_config("cull.every")
     if cull_every:
-        cull_cmd.append("--cull-every=%s" % cull_every)
+        cull_cmd.append(f"--cull-every={cull_every}")
 
     cull_concurrency = get_config("cull.concurrency")
     if cull_concurrency:
-        cull_cmd.append("--concurrency=%s" % cull_concurrency)
+        cull_cmd.append(f"--concurrency={cull_concurrency}")
 
     if get_config("cull.users"):
         cull_cmd.append("--cull-users")
+        jupyterhub_idle_culler_role["scopes"].append("admin:users")
+
+    if not get_config("cull.adminUsers"):
+        cull_cmd.append("--cull-admin-users=false")
 
     if get_config("cull.removeNamedServers"):
         cull_cmd.append("--remove-named-servers")
 
     cull_max_age = get_config("cull.maxAge")
     if cull_max_age:
-        cull_cmd.append("--max-age=%s" % cull_max_age)
+        cull_cmd.append(f"--max-age={cull_max_age}")
 
     c.JupyterHub.services.append(
         {
-            "name": "cull-idle",
-            "admin": True,
+            "name": "jupyterhub-idle-culler",
             "command": cull_cmd,
         }
     )
+    c.JupyterHub.load_roles.append(jupyterhub_idle_culler_role)
 
 for key, service in get_config("hub.services", {}).items():
     # c.JupyterHub.services is a list of dicts, but
@@ -402,26 +415,44 @@ def camelCaseify(s):
 
     c.JupyterHub.services.append(service)
 
+for key, role in get_config("hub.loadRoles", {}).items():
+    # c.JupyterHub.load_roles is a list of dicts, but
+    # hub.loadRoles is a dict of dicts to make the config mergable
+    role.setdefault("name", key)
+
+    c.JupyterHub.load_roles.append(role)
+
+# respect explicit null command (distinct from unspecified)
+# this avoids relying on KubeSpawner.cmd's default being None
+_unspecified = object()
+specified_cmd = get_config("singleuser.cmd", _unspecified)
+if specified_cmd is not _unspecified:
+    c.Spawner.cmd = specified_cmd
 
-set_config_if_not_none(c.Spawner, "cmd", "singleuser.cmd")
 set_config_if_not_none(c.Spawner, "default_url", "singleuser.defaultUrl")
 
-cloud_metadata = get_config("singleuser.cloudMetadata", {})
+cloud_metadata = get_config("singleuser.cloudMetadata")
 
 if cloud_metadata.get("blockWithIptables") == True:
     # Use iptables to block access to cloud metadata by default
     network_tools_image_name = get_config("singleuser.networkTools.image.name")
     network_tools_image_tag = get_config("singleuser.networkTools.image.tag")
+    network_tools_resources = get_config("singleuser.networkTools.resources")
+    ip = cloud_metadata["ip"]
     ip_block_container = client.V1Container(
         name="block-cloud-metadata",
         image=f"{network_tools_image_name}:{network_tools_image_tag}",
         command=[
             "iptables",
-            "-A",
+            "--append",
             "OUTPUT",
-            "-d",
-            cloud_metadata.get("ip", "169.254.169.254"),
-            "-j",
+            "--protocol",
+            "tcp",
+            "--destination",
+            ip,
+            "--destination-port",
+            "80",
+            "--jump",
             "DROP",
         ],
         security_context=client.V1SecurityContext(
@@ -429,6 +460,7 @@ def camelCaseify(s):
             run_as_user=0,
             capabilities=client.V1Capabilities(add=["NET_ADMIN"]),
         ),
+        resources=network_tools_resources,
     )
 
     c.KubeSpawner.init_containers.append(ip_block_container)
@@ -438,17 +470,6 @@ def camelCaseify(s):
     c.JupyterHub.log_level = "DEBUG"
     c.Spawner.debug = True
 
-# load /usr/local/etc/jupyterhub/jupyterhub_config.d config files
-config_dir = "/usr/local/etc/jupyterhub/jupyterhub_config.d"
-if os.path.isdir(config_dir):
-    for file_path in sorted(glob.glob(f"{config_dir}/*.py")):
-        file_name = os.path.basename(file_path)
-        print(f"Loading {config_dir} config: {file_name}")
-        with open(file_path) as f:
-            file_content = f.read()
-        # compiling makes debugging easier: https://stackoverflow.com/a/437857
-        exec(compile(source=file_content, filename=file_name, mode="exec"))
-
 # load potentially seeded secrets
 #
 # NOTE: ConfigurableHTTPProxy.auth_token is set through an environment variable
@@ -471,11 +492,23 @@ def camelCaseify(s):
         cfg.pop("keys", None)
     c[app].update(cfg)
 
+# load /usr/local/etc/jupyterhub/jupyterhub_config.d config files
+config_dir = "/usr/local/etc/jupyterhub/jupyterhub_config.d"
+if os.path.isdir(config_dir):
+    for file_path in sorted(glob.glob(f"{config_dir}/*.py")):
+        file_name = os.path.basename(file_path)
+        print(f"Loading {config_dir} config: {file_name}")
+        with open(file_path) as f:
+            file_content = f.read()
+        # compiling makes debugging easier: https://stackoverflow.com/a/437857
+        exec(compile(source=file_content, filename=file_name, mode="exec"))
+
 # execute hub.extraConfig entries
 for key, config_py in sorted(get_config("hub.extraConfig", {}).items()):
-    print("Loading extra config: %s" % key)
+    print(f"Loading extra config: {key}")
     exec(config_py)
 
+# CLOUDHARNESS: EDIT START
 # Allow switching authenticators easily
 auth_type = get_config('hub.config.JupyterHub.authenticator_class')
 email_domain = 'local'
@@ -525,4 +558,5 @@ def camelCaseify(s):
 c.apps = get_config('apps')
 c.registry = get_config('registry')
 c.domain = get_config('root.domain')
-c.namespace = get_config('root.namespace')
\ No newline at end of file
+c.namespace = get_config('root.namespace')
+# CLOUDHARNESS: EDIT END
\ No newline at end of file
diff --git a/applications/jupyterhub/deploy/resources/hub/z2jh.py b/applications/jupyterhub/deploy/resources/hub/z2jh.py
index 834a6b6c..fc368f64 100755
--- a/applications/jupyterhub/deploy/resources/hub/z2jh.py
+++ b/applications/jupyterhub/deploy/resources/hub/z2jh.py
@@ -3,15 +3,15 @@
 
 Methods here can be imported by extraConfig in values.yaml
 """
-from collections import Mapping
-from functools import lru_cache
 import os
-import re
+from collections.abc import Mapping
+from functools import lru_cache
 
 import yaml
 
+
 # memoize so we only load config once
-@lru_cache()
+@lru_cache
 def _load_config():
     """Load the Helm chart configuration used to render the Helm templates of
     the chart from a mounted k8s Secret, and merge in values from an optionally
@@ -27,6 +27,7 @@ def _load_config():
             cfg = _merge_dictionaries(cfg, values)
         else:
             print(f"No config at {path}")
+    # EDIT: CLOUDHARNESS START
     path = f"/opt/cloudharness/resources/allvalues.yaml"
     if os.path.exists(path):
         print("Loading global CloudHarness config at", path)
@@ -34,11 +35,11 @@ def _load_config():
             values = yaml.safe_load(f)
         cfg = _merge_dictionaries(cfg, values)
         cfg['root'] = values
-
+    # EDIT: CLOUDHARNESS END
     return cfg
 
 
-@lru_cache()
+@lru_cache
 def _get_config_value(key):
     """Load value from the k8s ConfigMap given a key."""
 
@@ -50,7 +51,7 @@ def _get_config_value(key):
         raise Exception(f"{path} not found!")
 
 
-@lru_cache()
+@lru_cache
 def get_secret_value(key, default="never-explicitly-set"):
     """Load value from the user managed k8s Secret or the default k8s Secret
     given a key."""
@@ -117,7 +118,7 @@ def get_config(key, default=None):
         else:
             value = value[level]
 
-    
+    # EDIT: CLOUDHARNESS START
     if value and isinstance(value, str):
         replace_var = re.search("{{.*?}}",  value)
         if replace_var:
@@ -128,6 +129,7 @@ def get_config(key, default=None):
             if repl:
                 print("replace", variable, "in", value, ":", repl)
                 value = re.sub("{{.*?}}", repl, value)
+    # EDIT: CLOUDHARNESS END
     return value
 
 
@@ -137,6 +139,5 @@ def set_config_if_not_none(cparent, name, key):
     configuration item if not None
     """
     data = get_config(key)
-    
     if data is not None:
-        setattr(cparent, name, data)
\ No newline at end of file
+        setattr(cparent, name, data)
diff --git a/applications/jupyterhub/deploy/templates/NOTES.txt b/applications/jupyterhub/deploy/templates/NOTES.txt
new file mode 100644
index 00000000..9769a9c7
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/NOTES.txt
@@ -0,0 +1,158 @@
+{{- $proxy_service := include "jupyterhub.proxy-public.fullname" . -}}
+
+{{- /* Generated with https://patorjk.com/software/taag/#p=display&h=0&f=Slant&t=JupyterHub */}}
+.      __                          __                  __  __          __
+      / / __  __  ____    __  __  / /_  ___    _____  / / / / __  __  / /_
+ __  / / / / / / / __ \  / / / / / __/ / _ \  / ___/ / /_/ / / / / / / __ \
+/ /_/ / / /_/ / / /_/ / / /_/ / / /_  /  __/ / /    / __  / / /_/ / / /_/ /
+\____/  \__,_/ / .___/  \__, /  \__/  \___/ /_/    /_/ /_/  \__,_/ /_.___/
+              /_/      /____/
+
+       You have successfully installed the official JupyterHub Helm chart!
+
+### Installation info
+
+  - Kubernetes namespace: {{ .Release.Namespace }}
+  - Helm release name:    {{ .Release.Name }}
+  - Helm chart version:   {{ .Chart.Version }}
+  - JupyterHub version:   {{ .Chart.AppVersion }}
+  - Hub pod packages:     See https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/{{ include "jupyterhub.chart-version-to-git-ref" .Chart.Version }}/images/hub/requirements.txt
+
+### Followup links
+
+  - Documentation:  https://z2jh.jupyter.org
+  - Help forum:     https://discourse.jupyter.org
+  - Social chat:    https://gitter.im/jupyterhub/jupyterhub
+  - Issue tracking: https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues
+
+### Post-installation checklist
+
+  - Verify that created Pods enter a Running state:
+
+      kubectl --namespace={{ .Release.Namespace }} get pod
+
+    If a pod is stuck with a Pending or ContainerCreating status, diagnose with:
+
+      kubectl --namespace={{ .Release.Namespace }} describe pod <name of pod>
+
+    If a pod keeps restarting, diagnose with:
+
+      kubectl --namespace={{ .Release.Namespace }} logs --previous <name of pod>
+  {{- println }}
+
+  {{- if eq .Values.apps.jupyterhub.proxy.service.type "LoadBalancer" }}
+  - Verify an external IP is provided for the k8s Service {{ $proxy_service }}.
+
+      kubectl --namespace={{ .Release.Namespace }} get service {{ $proxy_service }}
+
+    If the external ip remains <pending>, diagnose with:
+
+      kubectl --namespace={{ .Release.Namespace }} describe service {{ $proxy_service }}
+  {{- end }}
+
+  - Verify web based access:
+  {{- println }}
+  {{- if .Values.apps.jupyterhub.ingress.enabled }}
+    {{- range $host := .Values.apps.jupyterhub.ingress.hosts }}
+    Try insecure HTTP access: http://{{ $host }}{{ $.Values.apps.jupyterhub.hub.baseUrl | trimSuffix "/" }}/
+    {{- end }}
+
+    {{- range $tls := .Values.apps.jupyterhub.ingress.tls }}
+    {{- range $host := $tls.hosts }}
+    Try secure HTTPS access: https://{{ $host }}{{ $.Values.apps.jupyterhub.hub.baseUrl | trimSuffix "/" }}/
+    {{- end }}
+    {{- end }}
+  {{- else }}
+    You have not configured a k8s Ingress resource so you need to access the k8s
+    Service {{ $proxy_service }} directly.
+    {{- println }}
+
+    {{- if eq .Values.apps.jupyterhub.proxy.service.type "NodePort" }}
+    The k8s Service {{ $proxy_service }} is exposed via NodePorts. That means
+    that all the k8s cluster's nodes are exposing the k8s Service via those
+    ports.
+
+    Try insecure HTTP access: http://<any k8s nodes ip>:{{ .Values.apps.jupyterhub.proxy.service.nodePorts.http | default "no-http-nodeport-set"}}
+    Try secure HTTPS access: https://<any k8s nodes address>:{{ .Values.apps.jupyterhub.proxy.service.nodePorts.https | default "no-https-nodeport-set" }}
+
+    {{- else }}
+    If your computer is outside the k8s cluster, you can port-forward traffic to
+    the k8s Service {{ $proxy_service }} with kubectl to access it from your
+    computer.
+
+      kubectl --namespace={{ .Release.Namespace }} port-forward service/{{ $proxy_service }} 8080:http
+
+    Try insecure HTTP access: http://localhost:8080
+    {{- end }}
+  {{- end }}
+  {{- println }}
+
+
+
+
+
+{{- /*
+  Warnings for likely misconfigurations
+*/}}
+
+{{- if and (not .Values.apps.jupyterhub.scheduling.podPriority.enabled) (and .Values.apps.jupyterhub.scheduling.userPlaceholder.enabled .Values.apps.jupyterhub.scheduling.userPlaceholder.replicas) }}
+#################################################################################
+######   WARNING: You are using user placeholders without pod priority      #####
+######            enabled*, either enable pod priority or stop using the    #####
+######            user placeholders** to avoid having placeholders that     #####
+######            refuse to make room for a real user.                      #####
+######                                                                      #####
+######            *scheduling.podPriority.enabled                           #####
+######            **scheduling.userPlaceholder.enabled                      #####
+######            **scheduling.userPlaceholder.replicas                     #####
+#################################################################################
+{{- println }}
+{{- end }}
+
+
+
+
+
+{{- /*
+  Breaking changes and failures for likely misconfigurations.
+*/}}
+
+{{- $breaking := "" }}
+{{- $breaking_title := "\n" }}
+{{- $breaking_title = print $breaking_title "\n#################################################################################" }}
+{{- $breaking_title = print $breaking_title "\n######   BREAKING: The config values passed contained no longer accepted    #####" }}
+{{- $breaking_title = print $breaking_title "\n######             options. See the messages below for more details.        #####" }}
+{{- $breaking_title = print $breaking_title "\n######                                                                      #####" }}
+{{- $breaking_title = print $breaking_title "\n######             To verify your updated config is accepted, you can use   #####" }}
+{{- $breaking_title = print $breaking_title "\n######             the `helm template` command.                             #####" }}
+{{- $breaking_title = print $breaking_title "\n#################################################################################" }}
+
+
+{{- /*
+  This is an example (in a helm template comment) on how to detect and
+  communicate with regards to a breaking chart config change.
+
+  {{- if hasKey .Values.apps.jupyterhub.singleuser.cloudMetadata "enabled" }}
+  {{- $breaking = print $breaking "\n\nCHANGED: singleuser.cloudMetadata.enabled must as of 1.0.0 be configured using singleuser.cloudMetadata.blockWithIptables with the opposite value." }}
+  {{- end }}
+*/}}
+
+
+{{- if hasKey .Values.apps.jupyterhub.rbac "enabled" }}
+{{- $breaking = print $breaking "\n\nCHANGED: rbac.enabled must as of version 2.0.0 be configured via rbac.create and <hub|proxy.traefik|scheduling.userScheduler|prePuller.hook>.serviceAccount.create." }}
+{{- end }}
+
+
+{{- if hasKey .Values.apps.jupyterhub.hub "fsGid" }}
+{{- $breaking = print $breaking "\n\nCHANGED: hub.fsGid must as of version 2.0.0 be configured via hub.podSecurityContext.fsGroup." }}
+{{- end }}
+
+
+{{- if and .Values.apps.jupyterhub.singleuser.cloudMetadata.blockWithIptables (and .Values.apps.jupyterhub.singleuser.networkPolicy.enabled .Values.apps.jupyterhub.singleuser.networkPolicy.egressAllowRules.cloudMetadataServer) }}
+{{- $breaking = print $breaking "\n\nCHANGED: singleuser.cloudMetadata.blockWithIptables must as of version 3.0.0 not be configured together with singleuser.networkPolicy.egressAllowRules.cloudMetadataServer as it leads to an ambiguous configuration." }}
+{{- end }}
+
+
+{{- if $breaking }}
+{{- fail (print $breaking_title $breaking "\n\n") }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
index b742a126..3159d103 100644
--- a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
+++ b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
@@ -168,30 +168,30 @@ ldap.dn.user.useLookupName: LDAPAuthenticator.use_lookup_dn_username
     {{- $c := dict }}
     {{- $result := (dict "hub" (dict "config" $c)) }}
     {{- /*
-        Flattens the config in .Values.apps.jupyterhub.auth to a format of
+        Flattens the config in .Values.apps.jupyterhub.apps.jupyterhub.auth to a format of
         "keyX.keyY...": "value". Writes output to $c.
     */}}
-    {{- include "jupyterhub.flattenDict" (list $c (omit .Values.apps.jupyterhub.auth "type" "custom")) }}
+    {{- include "jupyterhub.flattenDict" (list $c (omit .Values.apps.jupyterhub.apps.jupyterhub.auth "type" "custom")) }}
 
     {{- /*
         Transform the flattened config using a dictionary
         representing the old z2jh config, output the result
         in $c.
     */}}
-    {{- include "jupyterhub.authDep.remapOldToNew.mappable" (list $c .Values.apps.jupyterhub.global.safeToShowValues) }}
+    {{- include "jupyterhub.authDep.remapOldToNew.mappable" (list $c .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub. }}
 
-    {{- $class_old_config_key := .Values.apps.jupyterhub.auth.type | default "" }}  {{- /* ldap                                - github */}}
+    {{- $class_old_config_key := .Values.apps.jupyterhub.apps.jupyterhub.auth.type | default "" }}  {{- /* ldap                                - github */}}
     {{- $class_new_entrypoint := "" }}                              {{- /* ldapauthenticator.LDAPAuthenticator - github */}}
     {{- $class_new_config_key := "" }}                              {{- /* LDAPAuthenticator                   - GitHubOAuthenticator */}}
 
     {{- /* SET $class_new_entrypoint, $class_new_config_key */}}
     {{- if eq $class_old_config_key "custom" }}
-        {{- $class_new_entrypoint = .Values.apps.jupyterhub.auth.custom.className | default "custom.className wasn't configured!" }}
+        {{- $class_new_entrypoint = .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.className | default "custom.className wasn't configured!" }}
         {{- $class_new_config_key = $class_new_entrypoint | splitList "." | last }}
         {{- /* UPDATE c dict explicitly with auth.custom.config */}}
-        {{- if .Values.apps.jupyterhub.auth.custom.config }}
-            {{- $custom_config := merge (dict) .Values.apps.jupyterhub.auth.custom.config }}
-            {{- if not .Values.apps.jupyterhub.global.safeToShowValues }}
+        {{- if .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.config }}
+            {{- $custom_config := merge (dict) .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.config }}
+            {{- if not .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub.}}
                 {{- range $key, $val := $custom_config }}
                     {{- $_ := set $custom_config $key "***" }}
                 {{- end }}
@@ -213,7 +213,7 @@ The JupyterHub Helm chart's auth config has been reworked and requires changes.
 
 The new way to configure authentication in chart version 0.11.0+ is printed
 below for your convenience. The values are not shown by default to ensure no
-secrets are exposed, run helm upgrade with --set global.safeToShowValues=true
+secrets are exposed, run helm upgrade with --set global.safeToSho.Values.apps.jupyterhub.true
 to show them.
 
 {{ $result | toYaml }}
diff --git a/applications/jupyterhub/deploy/templates/_helpers-names.tpl b/applications/jupyterhub/deploy/templates/_helpers-names.tpl
index e9cf7bb6..401d601a 100644
--- a/applications/jupyterhub/deploy/templates/_helpers-names.tpl
+++ b/applications/jupyterhub/deploy/templates/_helpers-names.tpl
@@ -3,8 +3,8 @@
     parent charts to reference these dynamic resource names.
 
     To avoid duplicating documentation, for more information, please see the the
-    fullnameOverride entry in schema.yaml or the configuration reference that
-    schema.yaml renders to.
+    fullnameOverride entry in values.schema.yaml or the configuration reference
+    that values.schema.yaml renders to.
 
     https://z2jh.jupyter.org/en/latest/resources/reference.html#fullnameOverride
 */}}
@@ -38,8 +38,8 @@
     {{- $name_override := .Values.apps.jupyterhub.nameOverride }}
     {{- if ne .Chart.Name "jupyterhub" }}
         {{- if .Values.apps.jupyterhub.jupyterhub }}
-            {{- $fullname_override = .Values.apps.jupyterhub.fullnameOverride }}
-            {{- $name_override = .Values.apps.jupyterhub.nameOverride }}
+            {{- $fullname_override = .Values.apps.jupyterhub.jupyterhub.fullnameOverride }}
+            {{- $name_override = .Values.apps.jupyterhub.jupyterhub.nameOverride }}
         {{- end }}
     {{- end }}
 
@@ -76,12 +76,23 @@
     {{- include "jupyterhub.fullname.dash" . }}hub
 {{- end }}
 
+{{- /* hub-serviceaccount ServiceAccount */}}
+{{- define "jupyterhub.hub-serviceaccount.fullname" -}}
+    {{- if .Values.apps.jupyterhub.hub.serviceAccount.create }}
+        {{- .Values.apps.jupyterhub.hub.serviceAccount.name | default (include "jupyterhub.hub.fullname" .) }}
+    {{- else }}
+        {{- .Values.apps.jupyterhub.hub.serviceAccount.name | default "default" }}
+    {{- end }}
+{{- end }}
+
 {{- /* hub-existing-secret Secret */}}
 {{- define "jupyterhub.hub-existing-secret.fullname" -}}
     {{- /* A hack to avoid issues from invoking this from a parent Helm chart. */}}
     {{- $existing_secret := .Values.apps.jupyterhub.hub.existingSecret }}
     {{- if ne .Chart.Name "jupyterhub" }}
-        {{- $existing_secret = .Values.apps.jupyterhub.hub.existingSecret }}
+        {{- if .Values.apps.jupyterhub.jupyterhub }}
+            {{- $existing_secret = .Values.apps.jupyterhub.jupyterhub.hub.existingSecret }}
+        {{- end }}
     {{- end }}
     {{- if $existing_secret }}
         {{- $existing_secret }}
@@ -133,11 +144,29 @@
     {{- include "jupyterhub.fullname.dash" . }}autohttps
 {{- end }}
 
+{{- /* autohttps-serviceaccount ServiceAccount */}}
+{{- define "jupyterhub.autohttps-serviceaccount.fullname" -}}
+    {{- if .Values.apps.jupyterhub.proxy.traefik.serviceAccount.create }}
+        {{- .Values.apps.jupyterhub.proxy.traefik.serviceAccount.name | default (include "jupyterhub.autohttps.fullname" .) }}
+    {{- else }}
+        {{- .Values.apps.jupyterhub.proxy.traefik.serviceAccount.name | default "default" }}
+    {{- end }}
+{{- end }}
+
 {{- /* user-scheduler Deployment */}}
 {{- define "jupyterhub.user-scheduler-deploy.fullname" -}}
     {{- include "jupyterhub.fullname.dash" . }}user-scheduler
 {{- end }}
 
+{{- /* user-scheduler-serviceaccount ServiceAccount */}}
+{{- define "jupyterhub.user-scheduler-serviceaccount.fullname" -}}
+    {{- if .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.create }}
+        {{- .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.name | default (include "jupyterhub.user-scheduler-deploy.fullname" .) }}
+    {{- else }}
+        {{- .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.name | default "default" }}
+    {{- end }}
+{{- end }}
+
 {{- /* user-scheduler leader election lock resource */}}
 {{- define "jupyterhub.user-scheduler-lock.fullname" -}}
     {{- include "jupyterhub.user-scheduler-deploy.fullname" . }}-lock
@@ -153,6 +182,15 @@
     {{- include "jupyterhub.fullname.dash" . }}hook-image-awaiter
 {{- end }}
 
+{{- /* image-awaiter-serviceaccount ServiceAccount */}}
+{{- define "jupyterhub.hook-image-awaiter-serviceaccount.fullname" -}}
+    {{- if .Values.apps.jupyterhub.prePuller.hook.serviceAccount.create }}
+        {{- .Values.apps.jupyterhub.prePuller.hook.serviceAccount.name | default (include "jupyterhub.hook-image-awaiter.fullname" .) }}
+    {{- else }}
+        {{- .Values.apps.jupyterhub.prePuller.hook.serviceAccount.name | default "default" }}
+    {{- end }}
+{{- end }}
+
 {{- /* hook-image-puller DaemonSet */}}
 {{- define "jupyterhub.hook-image-puller.fullname" -}}
     {{- include "jupyterhub.fullname.dash" . }}hook-image-puller
@@ -210,6 +248,15 @@
     {{- end }}
 {{- end }}
 
+{{- /* image-puller Priority */}}
+{{- define "jupyterhub.image-puller-priority.fullname" -}}
+    {{- if (include "jupyterhub.fullname" .) }}
+        {{- include "jupyterhub.fullname.dash" . }}image-puller
+    {{- else }}
+        {{- .Release.Name }}-image-puller-priority
+    {{- end }}
+{{- end }}
+
 {{- /* user-scheduler's registered name */}}
 {{- define "jupyterhub.user-scheduler.fullname" -}}
     {{- if (include "jupyterhub.fullname" .) }}
@@ -231,6 +278,7 @@
 fullname: {{ include "jupyterhub.fullname" . | quote }}
 fullname-dash: {{ include "jupyterhub.fullname.dash" . | quote }}
 hub: {{ include "jupyterhub.hub.fullname" . | quote }}
+hub-serviceaccount: {{ include "jupyterhub.hub-serviceaccount.fullname" . | quote }}
 hub-existing-secret: {{ include "jupyterhub.hub-existing-secret.fullname" . | quote }}
 hub-existing-secret-or-default: {{ include "jupyterhub.hub-existing-secret-or-default.fullname" . | quote }}
 hub-pvc: {{ include "jupyterhub.hub-pvc.fullname" . | quote }}
@@ -241,10 +289,14 @@ proxy-public: {{ include "jupyterhub.proxy-public.fullname" . | quote }}
 proxy-public-tls: {{ include "jupyterhub.proxy-public-tls.fullname" . | quote }}
 proxy-public-manual-tls: {{ include "jupyterhub.proxy-public-manual-tls.fullname" . | quote }}
 autohttps: {{ include "jupyterhub.autohttps.fullname" . | quote }}
+autohttps-serviceaccount: {{ include "jupyterhub.autohttps-serviceaccount.fullname" . | quote }}
 user-scheduler-deploy: {{ include "jupyterhub.user-scheduler-deploy.fullname" . | quote }}
+user-scheduler-serviceaccount: {{ include "jupyterhub.user-scheduler-serviceaccount.fullname" . | quote }}
 user-scheduler-lock: {{ include "jupyterhub.user-scheduler-lock.fullname" . | quote }}
 user-placeholder: {{ include "jupyterhub.user-placeholder.fullname" . | quote }}
+image-puller-priority: {{ include "jupyterhub.image-puller-priority.fullname" . | quote }}
 hook-image-awaiter: {{ include "jupyterhub.hook-image-awaiter.fullname" . | quote }}
+hook-image-awaiter-serviceaccount: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . | quote }}
 hook-image-puller: {{ include "jupyterhub.hook-image-puller.fullname" . | quote }}
 continuous-image-puller: {{ include "jupyterhub.continuous-image-puller.fullname" . | quote }}
 singleuser: {{ include "jupyterhub.singleuser.fullname" . | quote }}
diff --git a/applications/jupyterhub/deploy/templates/_helpers-netpol.tpl b/applications/jupyterhub/deploy/templates/_helpers-netpol.tpl
new file mode 100644
index 00000000..4075569e
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/_helpers-netpol.tpl
@@ -0,0 +1,101 @@
+{{- /*
+  This named template renders egress rules for NetworkPolicy resources based on
+  common configuration.
+
+  It is rendering based on the `egressAllowRules` and `egress` keys of the
+  passed networkPolicy config object. Each flag set to true under
+  `egressAllowRules` is rendered to a egress rule that next to any custom user
+  defined rules from the `egress` config.
+
+  This named template needs to render based on a specific networkPolicy
+  resource, but also needs access to the root context. Due to that, it
+  accepts a list as its scope, where the first element is supposed to be the
+  root context and the second element is supposed to be the networkPolicy
+  configuration object.
+
+  As an example, this is how you would render this named template from a
+  NetworkPolicy resource under its egress:
+
+    egress:
+      # other rules here...
+
+      {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.hub.networkPolicy)) }}
+      {{- . | nindent 4 }}
+      {{- end }}
+
+  Note that the reference to privateIPs and nonPrivateIPs relate to
+  https://en.wikipedia.org/wiki/Private_network#Private_IPv4_addresses.
+*/}}
+
+{{- define "jupyterhub.networkPolicy.renderEgressRules" -}}
+{{- $root := index . 0 }}
+{{- $netpol := index . 1 }}
+{{- if or (or $netpol.egressAllowRules.dnsPortsCloudMetadataServer $netpol.egressAllowRules.dnsPortsKubeSystemNamespace) $netpol.egressAllowRules.dnsPortsPrivateIPs }}
+- ports:
+    - port: 53
+      protocol: UDP
+    - port: 53
+      protocol: TCP
+  to:
+  {{- if $netpol.egressAllowRules.dnsPortsCloudMetadataServer }}
+    # Allow outbound connections to DNS ports on the cloud metadata server
+    - ipBlock:
+        cidr: {{ $root.Values.apps.jupyterhub.singleuser.cloudMetadata.ip }}/32
+  {{- end }}
+  {{- if $netpol.egressAllowRules.dnsPortsKubeSystemNamespace }}
+    # Allow outbound connections to DNS ports on pods in the kube-system
+    # namespace
+    - namespaceSelector:
+        matchLabels:
+          kubernetes.io/metadata.name: kube-system
+  {{- end }}
+  {{- if $netpol.egressAllowRules.dnsPortsPrivateIPs }}
+    # Allow outbound connections to DNS ports on destinations in the private IP
+    # ranges
+    - ipBlock:
+        cidr: 10.0.0.0/8
+    - ipBlock:
+        cidr: 172.16.0.0/12
+    - ipBlock:
+        cidr: 192.168.0.0/16
+  {{- end }}
+{{- end }}
+
+{{- if $netpol.egressAllowRules.nonPrivateIPs }}
+# Allow outbound connections to non-private IP ranges
+- to:
+    - ipBlock:
+        cidr: 0.0.0.0/0
+        except:
+          # As part of this rule:
+          # - don't allow outbound connections to private IPs
+          - 10.0.0.0/8
+          - 172.16.0.0/12
+          - 192.168.0.0/16
+          # - don't allow outbound connections to the cloud metadata server
+          - {{ $root.Values.apps.jupyterhub.singleuser.cloudMetadata.ip }}/32
+{{- end }}
+
+{{- if $netpol.egressAllowRules.privateIPs }}
+# Allow outbound connections to private IP ranges
+- to:
+    - ipBlock:
+        cidr: 10.0.0.0/8
+    - ipBlock:
+        cidr: 172.16.0.0/12
+    - ipBlock:
+        cidr: 192.168.0.0/16
+{{- end }}
+
+{{- if $netpol.egressAllowRules.cloudMetadataServer }}
+# Allow outbound connections to the cloud metadata server
+- to:
+    - ipBlock:
+        cidr: {{ $root.Values.apps.jupyterhub.singleuser.cloudMetadata.ip }}/32
+{{- end }}
+
+{{- with $netpol.egress }}
+# Allow outbound connections based on user specified rules
+{{ . | toYaml }}
+{{- end }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/_helpers.tpl b/applications/jupyterhub/deploy/templates/_helpers.tpl
index efea86d1..a2023639 100755
--- a/applications/jupyterhub/deploy/templates/_helpers.tpl
+++ b/applications/jupyterhub/deploy/templates/_helpers.tpl
@@ -12,7 +12,7 @@
 
   When you ask a helper to render its content, one often forward the current
   scope to the helper in order to allow it to access .Release.Name,
-  .Values.apps.jupyterhub.rbac.enabled and similar values.
+  .Values.apps.jupyterhub.rbac.create and similar values.
 
   #### Example - Passing the current scope
   {{ include "jupyterhub.commonLabels" . }}
@@ -180,8 +180,51 @@ component: {{ include "jupyterhub.componentLabel" . }}
     Augments passed .pullSecrets with $.Values.apps.jupyterhub.imagePullSecrets
 */}}
 {{- define "jupyterhub.imagePullSecrets" -}}
+    {{- /*
+        We have implemented a trick to allow a parent chart depending on this
+        chart to call this named templates.
+
+        Caveats and notes:
+
+            1. While parent charts can reference these, grandparent charts can't.
+            2. Parent charts must not use an alias for this chart.
+            3. There is no failsafe workaround to above due to
+                https://github.com/helm/helm/issues/9214.
+            4. .Chart is of its own type (*chart.Metadata) and needs to be casted
+                using "toYaml | fromYaml" in order to be able to use normal helm
+                template functions on it.
+    */}}
+    {{- $jupyterhub_values := .root.Values.apps.jupyterhub.}}
+    {{- if ne .root.Chart.Name "jupyterhub" }}
+        {{- if .root.Values.apps.jupyterhub.jupyterhub }}
+            {{- $jupyterhub_values = .root.Values.apps.jupyterhub.jupyterhub }}
+        {{- end }}
+    {{- end }}
 
+    {{- /* Populate $_.list with all relevant entries */}}
+    {{- $_ := dict "list" (concat .image.pullSecrets $jupyterhub_values.imagePullSecrets | uniq) }}
+    {{- if and $jupyterhub_values.imagePullSecret.create $jupyterhub_values.imagePullSecret.automaticReferenceInjection }}
+        {{- $__ := set $_ "list" (append $_.list (include "jupyterhub.image-pull-secret.fullname" .root) | uniq) }}
+    {{- end }}
 
+    {{- /* Decide if something should be written */}}
+    {{- if not (eq ($_.list | toJson) "[]") }}
+
+        {{- /* Process the $_.list where strings become dicts with a name key and the
+        strings become the name keys' values into $_.res */}}
+        {{- $_ := set $_ "res" list }}
+        {{- range $_.list }}
+            {{- if eq (typeOf .) "string" }}
+                {{- $__ := set $_ "res" (append $_.res (dict "name" .)) }}
+            {{- else }}
+                {{- $__ := set $_ "res" (append $_.res .) }}
+            {{- end }}
+        {{- end }}
+
+        {{- /* Write the results */}}
+        {{- $_.res | toJson }}
+
+    {{- end }}
 {{- end }}
 
 {{- /*
@@ -339,3 +382,21 @@ limits:
         {{- print "\n\nextraFiles entries (" $file_key ") must only contain one of the fields: 'data', 'stringData', and 'binaryData'." | fail }}
     {{- end }}
 {{- end }}
+
+{{- /*
+  jupyterhub.chart-version-to-git-ref:
+    Renders a valid git reference from a chartpress generated version string.
+    In practice, either a git tag or a git commit hash will be returned.
+
+    - The version string will follow a chartpress pattern, see
+      https://github.com/jupyterhub/chartpress#examples-chart-versions-and-image-tags.
+
+    - The regexReplaceAll function is a sprig library function, see
+      https://masterminds.github.io/sprig/strings.html.
+
+    - The regular expression is in golang syntax, but \d had to become \\d for
+      example.
+*/}}
+{{- define "jupyterhub.chart-version-to-git-ref" -}}
+{{- regexReplaceAll ".*[.-]n\\d+[.]h(.*)" . "${1}" }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/hub/configmap.yaml b/applications/jupyterhub/deploy/templates/hub/configmap.yaml
index c913f678..f52feb6a 100755
--- a/applications/jupyterhub/deploy/templates/hub/configmap.yaml
+++ b/applications/jupyterhub/deploy/templates/hub/configmap.yaml
@@ -29,5 +29,6 @@ data:
   */}}
   checksum_hook-image-puller: {{ include "jupyterhub.imagePuller.daemonset.hook.checksum" . | quote }}
 
+  # EDIT: CLOUDHARNESS
   allvalues.yaml: |
     {{- .Values | toYaml | nindent 4 }}
\ No newline at end of file
diff --git a/applications/jupyterhub/deploy/templates/hub/deployment.yaml b/applications/jupyterhub/deploy/templates/hub/deployment.yaml
index 82132c62..d105ecca 100755
--- a/applications/jupyterhub/deploy/templates/hub/deployment.yaml
+++ b/applications/jupyterhub/deploy/templates/hub/deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 spec:
+  {{- if typeIs "int" .Values.apps.jupyterhub.hub.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.apps.jupyterhub.hub.revisionHistoryLimit }}
+  {{- end }}
   replicas: 1
   selector:
     matchLabels:
@@ -30,11 +33,14 @@ spec:
         {{- . | toYaml | nindent 8 }}
         {{- end }}
     spec:
-{{ include "deploy_utils.etcHosts" . | indent 6 }}
+{{ include "deploy_utils.etcHosts" . | indent 6 }}  # EDIT: CLOUDHARNESS
       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
       priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
       {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.hub.nodeSelector }}
+      {{- with .Values.apps.jupyterhub.hub.nodeSelector }}
+      nodeSelector:
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.hub.tolerations }}
       tolerations:
         {{- . | toYaml | nindent 8 }}
@@ -44,7 +50,7 @@ spec:
         - name: config
           configMap:
             name: {{ include "jupyterhub.hub.fullname" . }}
-        {{- /* This is needed by cloudharness libraries */}}
+        {{- /*  EDIT: CLOUDHARNESS This is needed by cloudharness libraries */}}
         - name: cloudharness-allvalues
           configMap:
             name: cloudharness-allvalues
@@ -82,11 +88,13 @@ spec:
           persistentVolumeClaim:
             claimName: {{ include "jupyterhub.hub-pvc.fullname" . }}
         {{- end }}
-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
-      serviceAccountName: {{ include "jupyterhub.hub.fullname" . }}
+      {{- with include "jupyterhub.hub-serviceaccount.fullname" . }}
+      serviceAccountName: {{ . }}
       {{- end }}
+      {{- with .Values.apps.jupyterhub.hub.podSecurityContext }}
       securityContext:
-        fsGroup: {{ .Values.apps.jupyterhub.hub.fsGid }}
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.apps.jupyterhub.hub.image) }}
       imagePullSecrets: {{ . }}
       {{- end }}
@@ -153,14 +161,14 @@ spec:
               name: config
             - mountPath: /usr/local/etc/jupyterhub/secret/
               name: secret
-            - name: cloudharness-allvalues
+            - name: cloudharness-allvalues  # EDIT: CLOUDHARNESS START
               mountPath: /opt/cloudharness/resources/allvalues.yaml
               subPath: allvalues.yaml
             {{- if .Values.apps.accounts }}
             - name: cloudharness-kc-accounts
               mountPath: /opt/cloudharness/resources/auth
               readOnly: true
-            {{- end }}
+            {{- end }}  # EDIT: CLOUDHARNESS END
             {{- if (include "jupyterhub.hub-existing-secret.fullname" .) }}
             - mountPath: /usr/local/etc/jupyterhub/existing-secret/
               name: existing-secret
diff --git a/applications/jupyterhub/deploy/templates/hub/netpol.yaml b/applications/jupyterhub/deploy/templates/hub/netpol.yaml
index 9a7a6bc1..d9508e20 100755
--- a/applications/jupyterhub/deploy/templates/hub/netpol.yaml
+++ b/applications/jupyterhub/deploy/templates/hub/netpol.yaml
@@ -61,31 +61,24 @@ spec:
 
   egress:
     # hub --> proxy
-    - ports:
-        - port: 8001
-      to:
+    - to:
         - podSelector:
             matchLabels:
               {{- $_ := merge (dict "componentLabel" "proxy") . }}
               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8001
+
     # hub --> singleuser-server
-    - ports:
-        - port: 8888
-      to:
+    - to:
         - podSelector:
             matchLabels:
               {{- $_ := merge (dict "componentLabel" "singleuser-server") . }}
               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8888
 
-    # hub --> Kubernetes internal DNS
-    - ports:
-        - protocol: UDP
-          port: 53
-        - protocol: TCP
-          port: 53
-
-    {{- with .Values.apps.jupyterhub.hub.networkPolicy.egress }}
-    # hub --> depends, but the default is everything
-    {{- . | toYaml | nindent 4 }}
+    {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.hub.networkPolicy)) }}
+    {{- . | nindent 4 }}
     {{- end }}
 {{- end }}
diff --git a/applications/jupyterhub/deploy/templates/hub/pdb.yaml b/applications/jupyterhub/deploy/templates/hub/pdb.yaml
index 855609d4..bb6c7b16 100755
--- a/applications/jupyterhub/deploy/templates/hub/pdb.yaml
+++ b/applications/jupyterhub/deploy/templates/hub/pdb.yaml
@@ -1,9 +1,5 @@
 {{- if .Values.apps.jupyterhub.hub.pdb.enabled -}}
-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
-{{- else }}
-apiVersion: policy/v1beta1
-{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "jupyterhub.hub.fullname" . }}
diff --git a/applications/jupyterhub/deploy/templates/hub/rbac.yaml b/applications/jupyterhub/deploy/templates/hub/rbac.yaml
index 738daab1..1b689af4 100755
--- a/applications/jupyterhub/deploy/templates/hub/rbac.yaml
+++ b/applications/jupyterhub/deploy/templates/hub/rbac.yaml
@@ -1,15 +1,4 @@
-{{- if .Values.apps.jupyterhub.rbac.enabled -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "jupyterhub.hub.fullname" . }}
-  {{- with .Values.apps.jupyterhub.hub.serviceAccount.annotations }}
-  annotations:
-    {{- . | toYaml | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
----
+{{- if .Values.apps.jupyterhub.rbac.create -}}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -32,7 +21,7 @@ metadata:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "jupyterhub.hub.fullname" . }}
+    name: {{ include "jupyterhub.hub-serviceaccount.fullname" . }}
     namespace: "{{ .Release.Namespace }}"
 roleRef:
   kind: Role
diff --git a/applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml b/applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml
new file mode 100644
index 00000000..817ed661
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.apps.jupyterhub.hub.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "jupyterhub.hub-serviceaccount.fullname" . }}
+  {{- with .Values.apps.jupyterhub.hub.serviceAccount.annotations }}
+  annotations:
+    {{- . | toYaml | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/image-pull-secret.yaml b/applications/jupyterhub/deploy/templates/image-pull-secret.yaml
new file mode 100644
index 00000000..b7544db7
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/image-pull-secret.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.apps.jupyterhub.imagePullSecret.create }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ include "jupyterhub.image-pull-secret.fullname" . }}
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation
+    "helm.sh/hook-weight": "-20"
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ include "jupyterhub.dockerconfigjson" . }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
index e16fd1a9..528345c0 100644
--- a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
+++ b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
@@ -34,6 +34,9 @@ spec:
     type: RollingUpdate
     rollingUpdate:
       maxUnavailable: 100%
+  {{- if typeIs "int" .Values.apps.jupyterhub.prePuller.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.apps.jupyterhub.prePuller.revisionHistoryLimit }}
+  {{- end }}
   template:
     metadata:
       labels:
@@ -44,13 +47,17 @@ spec:
       {{- end }}
     spec:
       {{- /*
-        continuous-image-puller pods are made evictable to save on the k8s pods
-        per node limit all k8s clusters have.
+        image-puller pods are made evictable to save on the k8s pods
+        per node limit all k8s clusters have and have a higher priority
+        than user-placeholder pods that could block an entire node.
       */}}
-      {{- if and (not .hook) .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
-      priorityClassName: {{ include "jupyterhub.user-placeholder-priority.fullname" . }}
+      {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+      priorityClassName: {{ include "jupyterhub.image-puller-priority.fullname" . }}
+      {{- end }}
+      {{- with .Values.apps.jupyterhub.singleuser.nodeSelector }}
+      nodeSelector:
+        {{- . | toYaml | nindent 8 }}
       {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.singleuser.nodeSelector }}
       {{- with concat .Values.apps.jupyterhub.scheduling.userPods.tolerations .Values.apps.jupyterhub.singleuser.extraTolerations .Values.apps.jupyterhub.prePuller.extraTolerations }}
       tolerations:
         {{- . | toYaml | nindent 8 }}
@@ -127,6 +134,7 @@ spec:
         {{- /* --- Conditionally pull profileList images --- */}}
         {{- if .Values.apps.jupyterhub.prePuller.pullProfileListImages }}
         {{- range $k, $container := .Values.apps.jupyterhub.singleuser.profileList }}
+        {{- /* profile's kubespawner_override */}}
         {{- if $container.kubespawner_override }}
         {{- if $container.kubespawner_override.image }}
         - name: image-pull-singleuser-profilelist-{{ $k }}
@@ -145,13 +153,15 @@ spec:
           {{- end }}
         {{- end }}
         {{- end }}
-        {{- end }}
-        {{- end }}
-
-        {{- /* --- Pull extra images --- */}}
-        {{- range $k, $v := .Values.apps.jupyterhub.prePuller.extraImages }}
-        - name: image-pull-{{ $k }}
-          image: {{ $v.name }}:{{ $v.tag }}
+        {{- /* kubespawner_override in profile's profile_options */}}
+        {{- if $container.profile_options }}
+        {{- range $option, $option_spec := $container.profile_options }}
+        {{- if $option_spec.choices }}
+        {{- range $choice, $choice_spec := $option_spec.choices }}
+        {{- if $choice_spec.kubespawner_override }}
+        {{- if $choice_spec.kubespawner_override.image }}
+        - name: image-pull-profile-{{ $k }}-option-{{ $option }}-{{ $choice }}
+          image: {{ $choice_spec.kubespawner_override.image }}
           command:
             - /bin/sh
             - -c
@@ -163,13 +173,20 @@ spec:
           {{- with $.Values.apps.jupyterhub.prePuller.containerSecurityContext }}
           securityContext:
             {{- . | toYaml | nindent 12 }}
-          {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
         {{- end }}
 
-        {{- /* --- Pull CloudHarness tasks images --- */}}
-        {{- range $k, $v := ( index .Values "task-images" )  }}
-        - name: image-pull-{{ $k | replace "-" "" }}
-          image: {{ $v }}
+        {{- /* --- Pull extra images --- */}}
+        {{- range $k, $v := .Values.apps.jupyterhub.prePuller.extraImages }}
+        - name: image-pull-{{ $k }}
+          image: {{ $v.name }}:{{ $v.tag }}
           command:
             - /bin/sh
             - -c
diff --git a/applications/jupyterhub/deploy/templates/image-puller/job.yaml b/applications/jupyterhub/deploy/templates/image-puller/job.yaml
index bdd9f63c..cc6db3ec 100755
--- a/applications/jupyterhub/deploy/templates/image-puller/job.yaml
+++ b/applications/jupyterhub/deploy/templates/image-puller/job.yaml
@@ -28,16 +28,22 @@ spec:
       labels:
         {{- /* Changes here will cause the Job to restart the pods. */}}
         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
+        {{- with .Values.apps.jupyterhub.prePuller.labels }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
       {{- with .Values.apps.jupyterhub.prePuller.annotations }}
       annotations:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
     spec:
       restartPolicy: Never
-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
-      serviceAccountName: {{ include "jupyterhub.hook-image-awaiter.fullname" . }}
+      {{- with include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
+      serviceAccountName: {{ . }}
+      {{- end }}
+      {{- with .Values.apps.jupyterhub.prePuller.hook.nodeSelector }}
+      nodeSelector:
+        {{- . | toYaml | nindent 8 }}
       {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.prePuller.hook.nodeSelector }}
       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.prePuller.hook.tolerations }}
       tolerations:
         {{- . | toYaml | nindent 8 }}
@@ -58,6 +64,7 @@ spec:
             - -api-server-address=https://kubernetes.default.svc:$(KUBERNETES_SERVICE_PORT)
             - -namespace={{ .Release.Namespace }}
             - -daemonset={{ include "jupyterhub.hook-image-puller.fullname" . }}
+            - -pod-scheduling-wait-duration={{ .Values.apps.jupyterhub.prePuller.hook.podSchedulingWaitDuration }}
           {{- with .Values.apps.jupyterhub.prePuller.hook.containerSecurityContext }}
           securityContext:
             {{- . | toYaml | nindent 12 }}
diff --git a/applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml b/applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml
new file mode 100644
index 00000000..1a3fca33
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+{{- if or .Values.apps.jupyterhub.prePuller.hook.enabled .Values.apps.jupyterhub.prePuller.continuous.enabled -}}
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: {{ include "jupyterhub.image-puller-priority.fullname" . }}
+  annotations:
+    meta.helm.sh/release-name: "{{ .Release.Name }}"
+    meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+value: {{ .Values.apps.jupyterhub.scheduling.podPriority.imagePullerPriority }}
+globalDefault: false
+description: >-
+  Enables [hook|continuous]-image-puller pods to fit on nodes even though they
+  are clogged by user-placeholder pods, while not evicting normal user pods.
+{{- end }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml b/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
index 95c86ddf..5946896b 100755
--- a/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
+++ b/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
@@ -1,29 +1,8 @@
 {{- /*
 Permissions to be used by the hook-image-awaiter job
 */}}
-{{- if .Values.apps.jupyterhub.rbac.enabled }}
-{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) }}
-{{- /*
-This service account...
-*/ -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "jupyterhub.hook-image-awaiter.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-    hub.jupyter.org/deletable: "true"
-  annotations:
-    "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "0"
-    {{- with .Values.apps.jupyterhub.prePuller.hook.serviceAccount.annotations }}
-    {{- . | toYaml | nindent 4 }}
-    {{- end }}
----
-{{- /*
-... will be used by this role...
-*/}}
+{{- if .Values.apps.jupyterhub.rbac.create -}}
+{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -56,7 +35,7 @@ metadata:
     "helm.sh/hook-weight": "0"
 subjects:
   - kind: ServiceAccount
-    name: {{ include "jupyterhub.hook-image-awaiter.fullname" . }}
+    name: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
     namespace: "{{ .Release.Namespace }}"
 roleRef:
   kind: Role
diff --git a/applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml b/applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml
new file mode 100644
index 00000000..2e5fa728
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml
@@ -0,0 +1,21 @@
+{{- /*
+ServiceAccount for the pre-puller hook's image-awaiter-job
+*/}}
+{{- if .Values.apps.jupyterhub.prePuller.hook.serviceAccount.create -}}
+{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+    hub.jupyter.org/deletable: "true"
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-weight": "0"
+    {{- with .Values.apps.jupyterhub.prePuller.hook.serviceAccount.annotations }}
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+{{- end }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt b/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
deleted file mode 100755
index 08bd7bba..00000000
--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Automatic HTTPS Terminator
-
-This directory has Kubernetes objects for automatic Let's Encrypt Support.
-When enabled, we create a new deployment object that has an nginx-ingress
-and kube-lego container in it. This is responsible for requesting,
-storing and renewing certificates as needed from Let's Encrypt.
-
-The only change required outside of this directory is in the `proxy-public`
-service, which targets different hubs based on automatic HTTPS status.
\ No newline at end of file
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
deleted file mode 100755
index 8d71a971..00000000
--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
-{{- if $autoHTTPS -}}
-{{- $_ := .Values.apps.jupyterhub.proxy.https.letsencrypt.contactEmail | required "proxy.https.letsencrypt.contactEmail is a required field" -}}
-
-# This configmap contains Traefik configuration files to be mounted.
-# - traefik.yaml will only be read during startup (static configuration)
-# - dynamic.yaml will be read on change (dynamic configuration)
-#
-# ref: https://docs.traefik.io/getting-started/configuration-overview/
-#
-# The configuration files are first rendered with Helm templating to large YAML
-# strings. Then we use the fromYAML function on these strings to get an object,
-# that we in turn merge with user provided extra configuration.
-#
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-data:
-  traefik.yaml: |
-    {{- include "jupyterhub.traefik.yaml" . | fromYaml | merge .Values.apps.jupyterhub.proxy.traefik.extraStaticConfig | toYaml | nindent 4 }}
-  dynamic.yaml: |
-    {{- include "jupyterhub.dynamic.yaml" . | fromYaml | merge .Values.apps.jupyterhub.proxy.traefik.extraDynamicConfig | toYaml | nindent 4 }}
-
-{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
deleted file mode 100755
index fcb062fd..00000000
--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
-{{- if $autoHTTPS -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      {{- include "jupyterhub.matchLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- include "jupyterhub.matchLabels" . | nindent 8 }}
-        hub.jupyter.org/network-access-proxy-http: "true"
-        {{- with .Values.apps.jupyterhub.proxy.traefik.labels }}
-        {{- . | toYaml | nindent 8 }}
-        {{- end }}
-      annotations:
-        # Only force a restart through a change to this checksum when the static
-        # configuration is changed, as the dynamic can be updated after start.
-        # Any disruptions to this deployment impacts everything, it is the
-        # entrypoint of all network traffic.
-        checksum/static-config: {{ include "jupyterhub.traefik.yaml" . | fromYaml | merge .Values.apps.jupyterhub.proxy.traefik.extraStaticConfig | toYaml | sha256sum }}
-    spec:
-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
-      serviceAccountName: {{ include "jupyterhub.autohttps.fullname" . }}
-      {{- end }}
-      {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
-      priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
-      {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.proxy.traefik.nodeSelector }}
-      {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.proxy.traefik.tolerations }}
-      tolerations:
-        {{- . | toYaml | nindent 8 }}
-      {{- end }}
-      {{- include "jupyterhub.coreAffinity" . | nindent 6 }}
-      volumes:
-        - name: certificates
-          emptyDir: {}
-        - name: traefik-config
-          configMap:
-            name: {{ include "jupyterhub.autohttps.fullname" . }}
-        {{- with .Values.apps.jupyterhub.proxy.traefik.extraVolumes }}
-        {{- . | toYaml | nindent 8 }}
-        {{- end }}
-      {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.apps.jupyterhub.proxy.traefik.image) }}
-      imagePullSecrets: {{ . }}
-      {{- end }}
-      initContainers:
-        - name: load-acme
-          image: "{{ .Values.apps.jupyterhub.proxy.secretSync.image.name }}:{{ .Values.apps.jupyterhub.proxy.secretSync.image.tag }}"
-          {{- with .Values.apps.jupyterhub.proxy.secretSync.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
-          args:
-            - load
-            - {{ include "jupyterhub.proxy-public-tls.fullname" . }}
-            - acme.json
-            - /etc/acme/acme.json
-          env:
-            # We need this to get logs immediately
-            - name: PYTHONUNBUFFERED
-              value: "True"
-            {{- with .Values.apps.jupyterhub.proxy.traefik.extraEnv }}
-            {{- include "jupyterhub.extraEnv" . | nindent 12 }}
-            {{- end }}
-          volumeMounts:
-            - name: certificates
-              mountPath: /etc/acme
-          {{- with .Values.apps.jupyterhub.proxy.secretSync.containerSecurityContext }}
-          securityContext:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-      containers:
-        - name: traefik
-          image: "{{ .Values.apps.jupyterhub.proxy.traefik.image.name }}:{{ .Values.apps.jupyterhub.proxy.traefik.image.tag }}"
-          {{- with .Values.apps.jupyterhub.proxy.traefik.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
-          {{- with .Values.apps.jupyterhub.proxy.traefik.resources }}
-          resources:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-          ports:
-            - name: http
-              containerPort: 8080
-            - name: https
-              containerPort: 8443
-            {{- with .Values.apps.jupyterhub.proxy.traefik.extraPorts }}
-            {{- . | toYaml | nindent 12 }}
-            {{- end }}
-          volumeMounts:
-            - name: traefik-config
-              mountPath: /etc/traefik
-            - name: certificates
-              mountPath: /etc/acme
-            {{- with .Values.apps.jupyterhub.proxy.traefik.extraVolumeMounts }}
-            {{- . | toYaml | nindent 12 }}
-            {{- end }}
-          {{- with .Values.apps.jupyterhub.proxy.traefik.extraEnv }}
-          env:
-            {{- include "jupyterhub.extraEnv" . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.apps.jupyterhub.proxy.traefik.containerSecurityContext }}
-          securityContext:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-        - name: secret-sync
-          image: "{{ .Values.apps.jupyterhub.proxy.secretSync.image.name }}:{{ .Values.apps.jupyterhub.proxy.secretSync.image.tag }}"
-          {{- with .Values.apps.jupyterhub.proxy.secretSync.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
-          args:
-            - watch-save
-            - --label=app={{ include "jupyterhub.appLabel" . }}
-            - --label=release={{ .Release.Name }}
-            - --label=chart={{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-            - --label=heritage=secret-sync
-            - {{ include "jupyterhub.proxy-public-tls.fullname" . }}
-            - acme.json
-            - /etc/acme/acme.json
-          env:
-          # We need this to get logs immediately
-          - name: PYTHONUNBUFFERED
-            value: "True"
-          volumeMounts:
-            - name: certificates
-              mountPath: /etc/acme
-          {{- with .Values.apps.jupyterhub.proxy.secretSync.containerSecurityContext }}
-          securityContext:
-            {{- . | toYaml | nindent 12 }}
-          {{- end }}
-      {{- with .Values.apps.jupyterhub.proxy.traefik.extraPodSpec }}
-      {{- . | toYaml | nindent 6 }}
-      {{- end }}
-{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
deleted file mode 100755
index ea43b672..00000000
--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
-{{- if (and $autoHTTPS .Values.apps.jupyterhub.rbac.enabled) -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-  {{- with .Values.apps.jupyterhub.proxy.traefik.serviceAccount.annotations }}
-  annotations:
-    {{- . | toYaml | nindent 4 }}
-  {{- end }}
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  verbs: ["get", "patch", "list", "create"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  apiGroup:
-roleRef:
-  kind: Role
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "jupyterhub.autohttps.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
deleted file mode 100755
index d57c135d..00000000
--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
-{{- if $autoHTTPS -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "jupyterhub.proxy-http.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-    {{- with .Values.apps.jupyterhub.proxy.service.labels }}
-    {{- . | toYaml | nindent 4 }}
-    {{- end }}
-  {{- with .Values.apps.jupyterhub.proxy.service.annotations }}
-  annotations:
-    {{- . | toYaml | nindent 4 }}
-  {{- end }}
-spec:
-  type: ClusterIP
-  selector:
-    {{- $_ := merge (dict "componentLabel" "proxy") . }}
-    {{- include "jupyterhub.matchLabels" $_ | nindent 4 }}
-  ports:
-    - port: 8000
-      targetPort: http
-{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/deployment.yaml b/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
index 6d63ba88..bb37b8f0 100755
--- a/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
+++ b/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
@@ -7,6 +7,9 @@ metadata:
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 spec:
+  {{- if typeIs "int" .Values.apps.jupyterhub.proxy.chp.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.apps.jupyterhub.proxy.chp.revisionHistoryLimit }}
+  {{- end }}
   replicas: 1
   selector:
     matchLabels:
@@ -35,7 +38,7 @@ spec:
         # match the k8s Secret during the first upgrade following an auth_token
         # was generated.
         checksum/auth-token: {{ include "jupyterhub.hub.config.ConfigurableHTTPProxy.auth_token" . | sha256sum | trunc 4 | quote }}
-        checksum/proxy-secret: {{ include (print $.Template.BasePath "/jupyterhub/hub/secret.yaml") . | sha256sum }}
+        checksum/proxy-secret: {{ include (print $.Template.BasePath "/jupyterhub/proxy/secret.yaml") . | sha256sum | quote }}
         {{- with .Values.apps.jupyterhub.proxy.annotations }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}
@@ -44,7 +47,10 @@ spec:
       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
       priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
       {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.proxy.chp.nodeSelector }}
+      {{- with .Values.apps.jupyterhub.proxy.chp.nodeSelector }}
+      nodeSelector:
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.proxy.chp.tolerations }}
       tolerations:
         {{- . | toYaml | nindent 8 }}
@@ -135,6 +141,8 @@ spec:
           livenessProbe:
             initialDelaySeconds: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.failureThreshold }}
             httpGet:
               path: /_chp_healthz
               {{- if or $manualHTTPS $manualHTTPSwithsecret }}
@@ -149,6 +157,8 @@ spec:
           readinessProbe:
             initialDelaySeconds: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.failureThreshold }}
             httpGet:
               path: /_chp_healthz
               {{- if or $manualHTTPS $manualHTTPSwithsecret }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/netpol.yaml b/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
index adc82773..88a00be6 100755
--- a/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
+++ b/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
@@ -85,32 +85,24 @@ spec:
 
   egress:
     # proxy --> hub
-    - ports:
-        - port: 8081
-      to:
+    - to:
         - podSelector:
             matchLabels:
               {{- $_ := merge (dict "componentLabel" "hub") . }}
               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8081
 
     # proxy --> singleuser-server
-    - ports:
-        - port: 8888
-      to:
+    - to:
         - podSelector:
             matchLabels:
               {{- $_ := merge (dict "componentLabel" "singleuser-server") . }}
               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8888
 
-    # proxy --> Kubernetes internal DNS
-    - ports:
-      - protocol: UDP
-        port: 53
-      - protocol: TCP
-        port: 53
-
-    {{- with .Values.apps.jupyterhub.proxy.chp.networkPolicy.egress }}
-    # proxy --> depends, but the default is everything
-    {{- . | toYaml | nindent 4 }}
+    {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.proxy.chp.networkPolicy)) }}
+    {{- . | nindent 4 }}
     {{- end }}
 {{- end }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/pdb.yaml b/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
index 1846a3b0..155895b0 100755
--- a/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
+++ b/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
@@ -1,9 +1,5 @@
 {{- if .Values.apps.jupyterhub.proxy.chp.pdb.enabled -}}
-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
-{{- else }}
-apiVersion: policy/v1beta1
-{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "jupyterhub.proxy.fullname" . }}
diff --git a/applications/jupyterhub/deploy/templates/proxy/service.yaml b/applications/jupyterhub/deploy/templates/proxy/service.yaml
index 0d9ca5b2..f634ba9e 100755
--- a/applications/jupyterhub/deploy/templates/proxy/service.yaml
+++ b/applications/jupyterhub/deploy/templates/proxy/service.yaml
@@ -35,12 +35,15 @@ metadata:
   {{- end }}
 spec:
   selector:
+    # This service will target the autohttps pod if autohttps is configured, and
+    # the proxy pod if not. When autohttps is configured, the service proxy-http
+    # will be around to target the proxy pod directly.
     {{- if $autoHTTPS }}
-    component: autohttps
+    {{- $_ := merge (dict "componentLabel" "autohttps") . -}}
+    {{- include "jupyterhub.matchLabels" $_ | nindent 4 }}
     {{- else }}
-    component: proxy
+    {{- include "jupyterhub.matchLabels" . | nindent 4 }}
     {{- end }}
-    release: {{ .Release.Name }}
   ports:
     {{- if $HTTPS }}
     - name: https
diff --git a/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml b/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
index 588cf196..1bed905e 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
@@ -4,22 +4,9 @@ kind: PriorityClass
 metadata:
   name: {{ include "jupyterhub.priority.fullname" . }}
   annotations:
-    # FIXME: PriorityClasses must be added before the other resources reference
-    #        them, and in the past a workaround was needed to accomplish this:
-    #        to make the resource a Helm hook.
-    #
-    #        To transition this resource to no longer be a Helm hook resource,
-    #        we explicitly add ownership annotations/labels (in 1.0.0) which
-    #        will allow a future upgrade (in 2.0.0) to remove all hook and
-    #        ownership annotations/labels.
-    #
-    helm.sh/hook: pre-install,pre-upgrade
-    helm.sh/hook-delete-policy: before-hook-creation
-    helm.sh/hook-weight: "-100"
     meta.helm.sh/release-name: "{{ .Release.Name }}"
     meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
   labels:
-    app.kubernetes.io/managed-by: Helm
     {{- $_ := merge (dict "componentLabel" "default-priority") . }}
     {{- include "jupyterhub.labels" $_ | nindent 4 }}
 value: {{ .Values.apps.jupyterhub.scheduling.podPriority.defaultPriority }}
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
index b1dc6c5d..800ac208 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
@@ -3,11 +3,7 @@ The cluster autoscaler should be allowed to evict and reschedule these pods if
 it would help in order to scale down a node.
 */}}
 {{- if .Values.apps.jupyterhub.scheduling.userPlaceholder.enabled -}}
-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
-{{- else }}
-apiVersion: policy/v1beta1
-{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "jupyterhub.user-placeholder.fullname" . }}
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
index e03497db..688e217c 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
@@ -5,22 +5,9 @@ kind: PriorityClass
 metadata:
   name: {{ include "jupyterhub.user-placeholder-priority.fullname" . }}
   annotations:
-    # FIXME: PriorityClasses must be added before the other resources reference
-    #        them, and in the past a workaround was needed to accomplish this:
-    #        to make the resource a Helm hook.
-    #
-    #        To transition this resource to no longer be a Helm hook resource,
-    #        we explicitly add ownership annotations/labels (in 1.0.0) which
-    #        will allow a future upgrade (in 2.0.0) to remove all hook and
-    #        ownership annotations/labels.
-    #
-    helm.sh/hook: pre-install,pre-upgrade
-    helm.sh/hook-delete-policy: before-hook-creation
-    helm.sh/hook-weight: "-100"
     meta.helm.sh/release-name: "{{ .Release.Name }}"
     meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
   labels:
-    app.kubernetes.io/managed-by: Helm
     {{- include "jupyterhub.labels" . | nindent 4 }}
 value: {{ .Values.apps.jupyterhub.scheduling.podPriority.userPlaceholderPriority }}
 globalDefault: false
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
index 114f6262..c243beee 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
@@ -16,6 +16,9 @@ metadata:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 spec:
   podManagementPolicy: Parallel
+  {{- if typeIs "int" .Values.apps.jupyterhub.scheduling.userPlaceholder.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.apps.jupyterhub.scheduling.userPlaceholder.revisionHistoryLimit }}
+  {{- end }}
   replicas: {{ .Values.apps.jupyterhub.scheduling.userPlaceholder.replicas }}
   selector:
     matchLabels:
@@ -23,9 +26,16 @@ spec:
   serviceName: {{ include "jupyterhub.user-placeholder.fullname" . }}
   template:
     metadata:
+      {{- with .Values.apps.jupyterhub.scheduling.userPlaceholder.annotations }}
+      annotations:
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       labels:
         {{- /* Changes here will cause the Deployment to restart the pods. */}}
         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
+        {{- with .Values.apps.jupyterhub.scheduling.userPlaceholder.labels }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
     spec:
       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
       priorityClassName: {{ include "jupyterhub.user-placeholder-priority.fullname" . }}
@@ -33,7 +43,10 @@ spec:
       {{- if .Values.apps.jupyterhub.scheduling.userScheduler.enabled }}
       schedulerName: {{ include "jupyterhub.user-scheduler.fullname" . }}
       {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.singleuser.nodeSelector }}
+      {{- with .Values.apps.jupyterhub.singleuser.nodeSelector }}
+      nodeSelector:
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       {{- with concat .Values.apps.jupyterhub.scheduling.userPods.tolerations .Values.apps.jupyterhub.singleuser.extraTolerations }}
       tolerations:
         {{- . | toYaml | nindent 8 }}
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
index ef8a37f6..3e83b444 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
@@ -6,16 +6,28 @@ metadata:
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 data:
-  # ref: https://kubernetes.io/docs/reference/scheduling/config/
+  {{- /*
+    This is configuration of a k8s official kube-scheduler binary running in the
+    user-scheduler.
+
+    ref: https://kubernetes.io/docs/reference/scheduling/config/
+    ref: https://kubernetes.io/docs/reference/config-api/kube-scheduler-config.v1/
+  */}}
   config.yaml: |
-    apiVersion: kubescheduler.config.k8s.io/v1beta1
+    apiVersion: kubescheduler.config.k8s.io/v1
     kind: KubeSchedulerConfiguration
     leaderElection:
-      resourceLock: endpoints
+      resourceLock: leases
       resourceName: {{ include "jupyterhub.user-scheduler-lock.fullname" . }}
       resourceNamespace: "{{ .Release.Namespace }}"
     profiles:
       - schedulerName: {{ include "jupyterhub.user-scheduler.fullname" . }}
+        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.plugins }}
         plugins:
-          {{- .Values.apps.jupyterhub.scheduling.userScheduler.plugins | toYaml | nindent 10 }}
+          {{- . | toYaml | nindent 10 }}
+        {{- end }}
+        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.pluginConfig }}
+        pluginConfig:
+          {{- . | toYaml | nindent 10 }}
+        {{- end }}
 {{- end }}
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
index 1bcaf317..f22d0de8 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 spec:
+  {{- if typeIs "int" .Values.apps.jupyterhub.scheduling.userScheduler.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ .Values.apps.jupyterhub.scheduling.userScheduler.revisionHistoryLimit }}
+  {{- end }}
   replicas: {{ .Values.apps.jupyterhub.scheduling.userScheduler.replicas }}
   selector:
     matchLabels:
@@ -14,16 +17,25 @@ spec:
     metadata:
       labels:
         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
+        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.labels }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config-map: {{ include (print $.Template.BasePath "/jupyterhub/scheduling/user-scheduler/configmap.yaml") . | sha256sum }}
+        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.annotations }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
     spec:
-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
-      serviceAccountName: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
+      {{ with include "jupyterhub.user-scheduler-serviceaccount.fullname" . }}
+      serviceAccountName: {{ . }}
       {{- end }}
       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
       priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
       {{- end }}
-      nodeSelector: {{ toJson .Values.apps.jupyterhub.scheduling.userScheduler.nodeSelector }}
+      {{- with .Values.apps.jupyterhub.scheduling.userScheduler.nodeSelector }}
+      nodeSelector:
+        {{- . | toYaml | nindent 8 }}
+      {{- end }}
       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.scheduling.userScheduler.tolerations }}
       tolerations:
         {{- . | toYaml | nindent 8 }}
@@ -44,13 +56,6 @@ spec:
           {{- end }}
           command:
             - /usr/local/bin/kube-scheduler
-            # NOTE: --leader-elect-... (new) and --lock-object-... (deprecated)
-            #       flags are silently ignored in favor of whats defined in the
-            #       passed KubeSchedulerConfiguration whenever --config is
-            #       passed.
-            #
-            # ref: https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler/
-            #
             # NOTE: --authentication-skip-lookup=true is used to avoid a
             #       seemingly harmless error, if we need to not skip
             #       "authentication lookup" in the future, see the linked issue.
@@ -65,12 +70,14 @@ spec:
           livenessProbe:
             httpGet:
               path: /healthz
-              port: 10251
+              scheme: HTTPS
+              port: 10259
             initialDelaySeconds: 15
           readinessProbe:
             httpGet:
               path: /healthz
-              port: 10251
+              scheme: HTTPS
+              port: 10259
           {{- with .Values.apps.jupyterhub.scheduling.userScheduler.resources }}
           resources:
             {{- . | toYaml | nindent 12 }}
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
index 04f2af8c..2c9c6de8 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
@@ -1,9 +1,5 @@
 {{- if and .Values.apps.jupyterhub.scheduling.userScheduler.enabled .Values.apps.jupyterhub.scheduling.userScheduler.pdb.enabled -}}
-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
 apiVersion: policy/v1
-{{- else }}
-apiVersion: policy/v1beta1
-{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
index 083e0654..9c7fab73 100755
--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
@@ -1,16 +1,5 @@
 {{- if .Values.apps.jupyterhub.scheduling.userScheduler.enabled -}}
-{{- if .Values.apps.jupyterhub.rbac.enabled }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
-  labels:
-    {{- include "jupyterhub.labels" . | nindent 4 }}
-  {{- with .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.annotations }}
-  annotations:
-    {{- . | toYaml | nindent 4 }}
-  {{- end }}
----
+{{- if .Values.apps.jupyterhub.rbac.create -}}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -19,13 +8,23 @@ metadata:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 rules:
   # Copied from the system:kube-scheduler ClusterRole of the k8s version
-  # matching the kube-scheduler binary we use. A modification of two resource
-  # name references from kube-scheduler to user-scheduler-lock was made.
+  # matching the kube-scheduler binary we use. A modification has been made to
+  # resourceName fields to remain relevant for how we have named our resources
+  # in this Helm chart.
   #
-  # NOTE: These rules have been unchanged between 1.12 and 1.15, then changed in
-  #       1.16 and in 1.17, but unchanged in 1.18 and 1.19.
+  # NOTE: These rules have been:
+  #       - unchanged between 1.12 and 1.15
+  #       - changed in 1.16
+  #       - changed in 1.17
+  #       - unchanged between 1.18 and 1.20
+  #       - changed in 1.21: get/list/watch permission for namespace,
+  #                          csidrivers, csistoragecapacities was added.
+  #       - unchanged between 1.22 and 1.27
+  #       - changed in 1.28: permissions to get/update lock endpoint resource
+  #                          removed
+  #       - unchanged between 1.28 and 1.29
   #
-  # ref: https://github.com/kubernetes/kubernetes/blob/v1.19.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L696-L829
+  # ref: https://github.com/kubernetes/kubernetes/blob/v1.29.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L721-L862
   - apiGroups:
     - ""
     - events.k8s.io
@@ -50,21 +49,6 @@ rules:
     verbs:
     - get
     - update
-  - apiGroups:
-    - ""
-    resources:
-    - endpoints
-    verbs:
-    - create
-  - apiGroups:
-    - ""
-    resourceNames:
-    - {{ include "jupyterhub.user-scheduler-lock.fullname" . }}
-    resources:
-    - endpoints
-    verbs:
-    - get
-    - update
   - apiGroups:
     - ""
     resources:
@@ -159,13 +143,37 @@ rules:
     - get
     - list
     - watch
+  - apiGroups:
+    - ""
+    resources:
+    - namespaces
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - storage.k8s.io
+    resources:
+    - csidrivers
+    verbs:
+    - get
+    - list
+    - watch
+  - apiGroups:
+    - storage.k8s.io
+    resources:
+    - csistoragecapacities
+    verbs:
+    - get
+    - list
+    - watch
 
   # Copied from the system:volume-scheduler ClusterRole of the k8s version
   # matching the kube-scheduler binary we use.
   #
-  # NOTE: These rules have not changed between 1.12 and 1.19.
+  # NOTE: These rules have not changed between 1.12 and 1.29.
   #
-  # ref: https://github.com/kubernetes/kubernetes/blob/v1.19.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L1213-L1240
+  # ref: https://github.com/kubernetes/kubernetes/blob/v1.29.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L1283-L1310
   - apiGroups:
     - ""
     resources:
@@ -203,7 +211,7 @@ metadata:
     {{- include "jupyterhub.labels" . | nindent 4 }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
+    name: {{ include "jupyterhub.user-scheduler-serviceaccount.fullname" . }}
     namespace: "{{ .Release.Namespace }}"
 roleRef:
   kind: ClusterRole
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml
new file mode 100644
index 00000000..67618b03
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.apps.jupyterhub.scheduling.userScheduler.enabled -}}
+{{- if .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "jupyterhub.user-scheduler-serviceaccount.fullname" . }}
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+  {{- with .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.annotations }}
+  annotations:
+    {{- . | toYaml | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml b/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
index 3dfb1378..931a150f 100755
--- a/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
+++ b/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
@@ -62,23 +62,38 @@ spec:
 
   egress:
     # singleuser-server --> hub
-    - ports:
-        - port: 8081
-      to:
+    - to:
         - podSelector:
             matchLabels:
               {{- $_ := merge (dict "componentLabel" "hub") . }}
               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8081
 
-    # singleuser-server --> Kubernetes internal DNS
-    - ports:
-        - protocol: UDP
-          port: 53
-        - protocol: TCP
-          port: 53
+    # singleuser-server --> proxy
+    # singleuser-server --> autohttps
+    #
+    # While not critical for core functionality, a user or library code may rely
+    # on communicating with the proxy or autohttps pods via a k8s Service it can
+    # detected from well known environment variables.
+    #
+    - to:
+        - podSelector:
+            matchLabels:
+              {{- $_ := merge (dict "componentLabel" "proxy") . }}
+              {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8000
+    - to:
+        - podSelector:
+            matchLabels:
+              {{- $_ := merge (dict "componentLabel" "autohttps") . }}
+              {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
+      ports:
+        - port: 8080
+        - port: 8443
 
-    {{- with .Values.apps.jupyterhub.singleuser.networkPolicy.egress }}
-    # singleuser-server --> depends, but the default is everything
-    {{- . | toYaml | nindent 4 }}
+    {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.singleuser.networkPolicy)) }}
+    {{- . | nindent 4 }}
     {{- end }}
 {{- end }}
diff --git a/applications/jupyterhub/deploy/templates/singleuser/secret.yaml b/applications/jupyterhub/deploy/templates/singleuser/secret.yaml
new file mode 100644
index 00000000..e6eab9bd
--- /dev/null
+++ b/applications/jupyterhub/deploy/templates/singleuser/secret.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.apps.jupyterhub.singleuser.extraFiles }}
+kind: Secret
+apiVersion: v1
+metadata:
+  name: {{ include "jupyterhub.singleuser.fullname" . }}
+  labels:
+    {{- include "jupyterhub.labels" . | nindent 4 }}
+type: Opaque
+{{- with include "jupyterhub.extraFiles.data" .Values.apps.jupyterhub.singleuser.extraFiles }}
+data:
+  {{- . | nindent 2 }}
+{{- end }}
+{{- with include "jupyterhub.extraFiles.stringData" .Values.apps.jupyterhub.singleuser.extraFiles }}
+stringData:
+  {{- . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/applications/jupyterhub/deploy/values.schema.yaml b/applications/jupyterhub/deploy/values.schema.yaml
new file mode 100644
index 00000000..69c13a83
--- /dev/null
+++ b/applications/jupyterhub/deploy/values.schema.yaml
@@ -0,0 +1,3014 @@
+# This schema (a jsonschema in YAML format) is used to generate
+# values.schema.json which is packaged with the Helm chart for client side
+# validation by helm of values before template rendering.
+#
+# This schema is also used by our documentation system to build the
+# configuration reference section based on the description fields. See
+# docs/source/conf.py for that logic!
+#
+# We look to document everything we have default values for in values.yaml, but
+# we don't look to enforce the perfect validation logic within this file.
+#
+# ref: https://json-schema.org/learn/getting-started-step-by-step.html
+#
+$schema: http://json-schema.org/draft-07/schema#
+type: object
+additionalProperties: false
+required:
+  - imagePullSecrets
+  - hub
+  - proxy
+  - singleuser
+  - ingress
+  - prePuller
+  - custom
+  - cull
+  - debug
+  - rbac
+  - global
+properties:
+  enabled:
+    type: [boolean, "null"]
+    description: |
+      `enabled` is ignored by the jupyterhub chart itself, but a chart depending
+      on the jupyterhub chart conditionally can make use this config option as
+      the condition.
+  fullnameOverride:
+    type: [string, "null"]
+    description: |
+      fullnameOverride and nameOverride allow you to adjust how the resources
+      part of the Helm chart are named.
+
+      Name format               | Resource types | fullnameOverride | nameOverride | Note
+      ------------------------- | -------------- | ---------------- | ------------ | -
+      component                 | namespaced     | `""`             | *            | Default
+      release-component         | cluster wide   | `""`             | *            | Default
+      fullname-component        | *              | str              | *            | -
+      release-component         | *              | null             | `""`         | -
+      release-(name-)component  | *              | null             | str          | omitted if contained in release
+      release-(chart-)component | *              | null             | null         | omitted if contained in release
+
+      ```{admonition} Warning!
+      :class: warning
+      Changing fullnameOverride or nameOverride after the initial installation
+      of the chart isn't supported. Changing their values likely leads to a
+      reset of non-external JupyterHub databases, abandonment of users' storage,
+      and severed couplings to currently running user pods.
+      ```
+
+      If you are a developer of a chart depending on this chart, you should
+      avoid hardcoding names. If you want to reference the name of a resource in
+      this chart from a parent helm chart's template, you can make use of the
+      global named templates instead.
+
+      ```yaml
+      # some pod definition of a parent chart helm template
+      schedulerName: {{ include "jupyterhub.user-scheduler.fullname" . }}
+      ```
+
+      To access them from a container, you can also rely on the hub ConfigMap
+      that contains entries of all the resource names.
+
+      ```yaml
+      # some container definition in a parent chart helm template
+      env:
+        - name: SCHEDULER_NAME
+          valueFrom:
+            configMapKeyRef:
+              name: {{ include "jupyterhub.user-scheduler.fullname" . }}
+              key: user-scheduler
+      ```
+
+  nameOverride:
+    type: [string, "null"]
+    description: |
+      See the documentation under [`fullnameOverride`](schema_fullnameOverride).
+
+  imagePullSecret:
+    type: object
+    required: [create]
+    if:
+      properties:
+        create:
+          const: true
+    then:
+      additionalProperties: false
+      required: [registry, username, password]
+      description: |
+        This is configuration to create a k8s Secret resource of `type:
+        kubernetes.io/dockerconfigjson`, with credentials to pull images from a
+        private image registry. If you opt to do so, it will be available for use
+        by all pods in their respective `spec.imagePullSecrets` alongside other
+        k8s Secrets defined in `imagePullSecrets` or the pod respective
+        `...image.pullSecrets` configuration.
+
+        In other words, using this configuration option can automate both the
+        otherwise manual creation of a k8s Secret and the otherwise manual
+        configuration to reference this k8s Secret in all the pods of the Helm
+        chart.
+
+        ```sh
+        # you won't need to create a k8s Secret manually...
+        kubectl create secret docker-registry image-pull-secret \
+          --docker-server=<REGISTRY> \
+          --docker-username=<USERNAME> \
+          --docker-email=<EMAIL> \
+          --docker-password=<PASSWORD>
+        ```
+
+        If you just want to let all Pods reference an existing secret, use the
+        [`imagePullSecrets`](schema_imagePullSecrets) configuration instead.
+      properties:
+        create:
+          type: boolean
+          description: |
+            Toggle the creation of the k8s Secret with provided credentials to
+            access a private image registry.
+        automaticReferenceInjection:
+          type: boolean
+          description: |
+            Toggle the automatic reference injection of the created Secret to all
+            pods' `spec.imagePullSecrets` configuration.
+        registry:
+          type: string
+          description: |
+            Name of the private registry you want to create a credential set for.
+            It will default to Docker Hub's image registry.
+
+            Examples:
+              - https://index.docker.io/v1/
+              - quay.io
+              - eu.gcr.io
+              - alexmorreale.privatereg.net
+        username:
+          type: string
+          description: |
+            Name of the user you want to use to connect to your private registry.
+
+            For external gcr.io, you will use the `_json_key`.
+
+            Examples:
+              - alexmorreale
+              - alex@pfc.com
+              - _json_key
+        password:
+          type: string
+          description: |
+            Password for the private image registry's user.
+
+            Examples:
+              - plaintextpassword
+              - abc123SECRETzyx098
+
+            For gcr.io registries the password will be a big JSON blob for a
+            Google cloud service account, it should look something like below.
+
+            ```yaml
+            password: |-
+              {
+                "type": "service_account",
+                "project_id": "jupyter-se",
+                "private_key_id": "f2ba09118a8d3123b3321bd9a7d6d0d9dc6fdb85",
+                ...
+              }
+            ```
+        email:
+          type: [string, "null"]
+          description: |
+            Specification of an email is most often not required, but it is
+            supported.
+
+  imagePullSecrets:
+    type: array
+    description: |
+      Chart wide configuration to _append_ k8s Secret references to all its
+      pod's `spec.imagePullSecrets` configuration.
+
+      This will not override or get overridden by pod specific configuration,
+      but instead augment the pod specific configuration.
+
+      You can use both the k8s native syntax, where each list element is like
+      `{"name": "my-secret-name"}`, or you can let list elements be strings
+      naming the secrets directly.
+
+  hub:
+    type: object
+    additionalProperties: false
+    required: [baseUrl]
+    properties:
+      revisionHistoryLimit: &revisionHistoryLimit
+        type: [integer, "null"]
+        minimum: 0
+        description: |
+          Configures the resource's `spec.revisionHistoryLimit`. This is
+          available for Deployment, StatefulSet, and DaemonSet resources.
+
+          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#revision-history-limit)
+          for more info.
+      config:
+        type: object
+        additionalProperties: true
+        description: |
+          JupyterHub and its components (authenticators, spawners, etc), are
+          Python classes that expose its configuration through
+          [_traitlets_](https://traitlets.readthedocs.io/en/stable/). With this
+          Helm chart configuration (`hub.config`), you can directly configure
+          the Python classes through _static_ YAML values. To _dynamically_ set
+          values, you need to use [`hub.extraConfig`](schema_hub.extraConfig)
+          instead.
+
+          ```{admonition} Currently intended only for auth config
+          :class: warning
+          This config _currently_ (0.11.0) only influence the software in the
+          `hub` Pod, but some Helm chart config options such as
+          [`hub.baseUrl`](schema_hub.baseUrl) is used to set
+          `JupyterHub.base_url` in the `hub` Pod _and_ influence how other Helm
+          templates are rendered.
+
+          As we have not yet mapped out all the potential configuration
+          conflicts except for the authentication related configuration options,
+          please accept that using it for something else at this point can lead
+          to issues.
+          ```
+
+          __Example__
+
+          If you inspect documentation or some `jupyterhub_config.py` to contain
+          the following section:
+
+          ```python
+          c.JupyterHub.admin_access = true
+          c.JupyterHub.admin_users = ["jovyan1", "jovyan2"]
+          c.KubeSpawner.k8s_api_request_timeout = 10
+          c.GitHubOAuthenticator.allowed_organizations = ["jupyterhub"]
+          ```
+
+          Then, you would be able to represent it with this configuration like:
+
+          ```yaml
+          hub:
+            config:
+              JupyterHub:
+                admin_access: true
+                admin_users:
+                  - jovyan1
+                  - jovyan2
+              KubeSpawner:
+                k8s_api_request_timeout: 10
+              GitHubOAuthenticator:
+                allowed_organizations:
+                  - jupyterhub
+          ```
+
+          ```{admonition} YAML limitations
+          :class: tip
+          You can't represent Python `Bytes` or `Set` objects in YAML directly.
+          ```
+
+          ```{admonition} Helm value merging
+          :class: tip
+          `helm` merges a Helm chart's default values with values passed with
+          the `--values` or `-f` flag. During merging, lists are replaced while
+          dictionaries are updated.
+          ```
+      extraFiles: &extraFiles
+        type: object
+        additionalProperties: false
+        description: |
+          A dictionary with extra files to be injected into the pod's container
+          on startup. This can for example be used to inject: configuration
+          files, custom user interface templates, images, and more.
+
+          ```yaml
+          # NOTE: "hub" is used in this example, but the configuration is the
+          #       same for "singleuser".
+          hub:
+            extraFiles:
+              # The file key is just a reference that doesn't influence the
+              # actual file name.
+              <file key>:
+                # mountPath is required and must be the absolute file path.
+                mountPath: <full file path>
+
+                # Choose one out of the three ways to represent the actual file
+                # content: data, stringData, or binaryData.
+                #
+                # data should be set to a mapping (dictionary). It will in the
+                # end be rendered to either YAML, JSON, or TOML based on the
+                # filename extension that are required to be either .yaml, .yml,
+                # .json, or .toml.
+                #
+                # If your content is YAML, JSON, or TOML, it can make sense to
+                # use data to represent it over stringData as data can be merged
+                # instead of replaced if set partially from separate Helm
+                # configuration files.
+                #
+                # Both stringData and binaryData should be set to a string
+                # representing the content, where binaryData should be the
+                # base64 encoding of the actual file content.
+                #
+                data:
+                  myConfig:
+                    myMap:
+                      number: 123
+                      string: "hi"
+                    myList:
+                      - 1
+                      - 2
+                stringData: |
+                  hello world!
+                binaryData: aGVsbG8gd29ybGQhCg==
+
+                # mode is by default 0644 and you can optionally override it
+                # either by octal notation (example: 0400) or decimal notation
+                # (example: 256).
+                mode: <file system permissions>
+          ```
+
+          **Using --set-file**
+
+          To avoid embedding entire files in the Helm chart configuration, you
+          can use the `--set-file` flag during `helm upgrade` to set the
+          stringData or binaryData field.
+
+          ```yaml
+          hub:
+            extraFiles:
+              my_image:
+                mountPath: /usr/local/share/jupyterhub/static/my_image.png
+
+              # Files in /usr/local/etc/jupyterhub/jupyterhub_config.d are
+              # automatically loaded in alphabetical order of the final file
+              # name when JupyterHub starts.
+              my_config:
+                mountPath: /usr/local/etc/jupyterhub/jupyterhub_config.d/my_jupyterhub_config.py
+          ```
+
+          ```bash
+          # --set-file expects a text based file, so you need to base64 encode
+          # it manually first.
+          base64 my_image.png > my_image.png.b64
+
+          helm upgrade <...> \
+              --set-file hub.extraFiles.my_image.binaryData=./my_image.png.b64 \
+              --set-file hub.extraFiles.my_config.stringData=./my_jupyterhub_config.py
+          ```
+
+          **Common uses**
+
+          1. **JupyterHub template customization**
+
+             You can replace the default JupyterHub user interface templates in
+             the hub pod by injecting new ones to
+             `/usr/local/share/jupyterhub/templates`. These can in turn
+             reference custom images injected to
+             `/usr/local/share/jupyterhub/static`.
+
+          1. **JupyterHub standalone file config**
+
+             Instead of embedding JupyterHub python configuration as a string
+             within a YAML file through
+             [`hub.extraConfig`](schema_hub.extraConfig), you can inject a
+             standalone .py file into
+             `/usr/local/etc/jupyterhub/jupyterhub_config.d` that is
+             automatically loaded.
+
+          1. **Flexible configuration**
+
+             By injecting files, you don't have to embed them in a docker image
+             that you have to rebuild.
+
+             If your configuration file is a YAML/JSON/TOML file, you can also
+             use `data` instead of `stringData` which allow you to set various
+             configuration in separate Helm config files. This can be useful to
+             help dependent charts override only some configuration part of the
+             file, or to allow for the configuration be set through multiple
+             Helm configuration files.
+
+          **Limitations**
+
+          1. File size
+
+             The files in `hub.extraFiles` and `singleuser.extraFiles` are
+             respectively stored in their own k8s Secret resource. As k8s
+             Secret's are limited, typically to 1MB, you will be limited to a
+             total file size of less than 1MB as there is also base64 encoding
+             that takes place reducing available capacity to 75%.
+
+          2. File updates
+
+             The files that are mounted are only set during container startup.
+             This is [because we use
+             `subPath`](https://kubernetes.io/docs/concepts/storage/volumes/#secret)
+             as is required to avoid replacing the content of the entire
+             directory we mount in.
+        patternProperties:
+          ".*":
+            type: object
+            additionalProperties: false
+            required: [mountPath]
+            oneOf:
+              - required: [data]
+              - required: [stringData]
+              - required: [binaryData]
+            properties:
+              mountPath:
+                type: string
+              data:
+                type: object
+                additionalProperties: true
+              stringData:
+                type: string
+              binaryData:
+                type: string
+              mode:
+                type: number
+      baseUrl:
+        type: string
+        description: |
+          This is the equivalent of c.JupyterHub.base_url, but it is also needed
+          by the Helm chart in general. So, instead of setting
+          c.JupyterHub.base_url, use this configuration.
+      command:
+        type: array
+        description: |
+          A list of strings to be used to replace the JupyterHub image's
+          `ENTRYPOINT` entry. Note that in k8s lingo, the Dockerfile's
+          `ENTRYPOINT` is called `command`. The list of strings will be expanded
+          with Helm's template function `tpl` which can render Helm template
+          logic inside curly braces (`{{... }}`).
+
+          This could be useful to wrap the invocation of JupyterHub itself in
+          some custom way.
+
+          For more details, see the [Kubernetes
+          documentation](https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/).
+      args:
+        type: array
+        description: |
+          A list of strings to be used to replace the JupyterHub image's `CMD`
+          entry as well as the Helm chart's default way to start JupyterHub.
+          Note that in k8s lingo, the Dockerfile's `CMD` is called `args`. The
+          list of strings will be expanded with Helm's template function `tpl`
+          which can render Helm template logic inside curly braces (`{{... }}`).
+
+          ```{warning}
+          By replacing the entire configuration file, which is mounted to
+          `/usr/local/etc/jupyterhub/jupyterhub_config.py` by the Helm chart,
+          instead of appending to it with `hub.extraConfig`, you expose your
+          deployment for issues stemming from getting out of sync with the Helm
+          chart's config file.
+
+          These kind of issues will be significantly harder to debug and
+          diagnose, and can due to this could cause a lot of time expenditure
+          for both the community maintaining the Helm chart as well as yourself,
+          even if this wasn't the reason for the issue.
+
+          Due to this, we ask that you do your _absolute best to avoid replacing
+          the default provided `jupyterhub_config.py` file. It can often be
+          possible. For example, if your goal is to have a dedicated .py file
+          for more extensive additions that you can syntax highlight and such
+          and feel limited by passing code in `hub.extraConfig` which is part of
+          a YAML file, you can use [this
+          trick](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues/1580#issuecomment-707776237)
+          instead.
+          ```
+
+          ```yaml
+          hub:
+            args:
+              - "jupyterhub"
+              - "--config"
+              - "/usr/local/etc/jupyterhub/jupyterhub_config.py"
+              - "--debug"
+              - "--upgrade-db"
+          ```
+
+          For more details, see the [Kubernetes
+          documentation](https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/).
+      cookieSecret:
+        type: [string, "null"]
+        description: |
+          ```{note}
+          As of version 1.0.0 this will automatically be generated and there is
+          no need to set it manually.
+
+          If you wish to reset a generated key, you can use `kubectl edit` on
+          the k8s Secret typically named `hub` and remove the
+          `hub.config.JupyterHub.cookie_secret` entry in the k8s Secret, then
+          perform a new `helm upgrade`.
+          ```
+
+          A 32-byte cryptographically secure randomly generated string used to sign values of
+          secure cookies set by the hub. If unset, jupyterhub will generate one on startup and
+          save it in the file `jupyterhub_cookie_secret` in the `/srv/jupyterhub` directory of
+          the hub container. A value set here will make JupyterHub overwrite any previous file.
+
+          You do not need to set this at all if you are using the default configuration for
+          storing databases - sqlite on a persistent volume (with `hub.db.type` set to the
+          default `sqlite-pvc`). If you are using an external database, then you must set this
+          value explicitly - or your users will keep getting logged out each time the hub pod
+          restarts.
+
+          Changing this value will all user logins to be invalidated. If this secret leaks,
+          *immediately* change it to something else, or user data can be compromised
+
+          ```sh
+          # to generate a value, run
+          openssl rand -hex 32
+          ```
+      image: &image-spec
+        type: object
+        additionalProperties: false
+        required: [name, tag]
+        description: |
+          Set custom image name, tag, pullPolicy, or pullSecrets for the pod.
+        properties:
+          name:
+            type: string
+            description: |
+              The name of the image, without the tag.
+
+              ```
+              # example name
+              gcr.io/my-project/my-image
+              ```
+          tag:
+            type: string
+            description: |
+              The tag of the image to pull. This is the value following `:` in
+              complete image specifications.
+
+              ```
+              # example tags
+              v1.11.1
+              zhy270a
+              ```
+          pullPolicy:
+            enum: [null, "", IfNotPresent, Always, Never]
+            description: |
+              Configures the Pod's `spec.imagePullPolicy`.
+
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/containers/images/#updating-images)
+              for more info.
+          pullSecrets:
+            type: array
+            description: |
+              A list of references to existing Kubernetes Secrets with
+              credentials to pull the image.
+
+              This Pod's final `imagePullSecrets` k8s specification will be a
+              combination of:
+
+              1. This list of k8s Secrets, specific for this pod.
+              2. The list of k8s Secrets, for use by all pods in the Helm chart,
+                 declared in this Helm charts configuration called
+                 `imagePullSecrets`.
+              3. A k8s Secret, for use by all pods in the Helm chart, if
+                 conditionally created from image registry credentials provided
+                 under `imagePullSecret` if `imagePullSecret.create` is set to
+                 true.
+
+              ```yaml
+              # example - k8s native syntax
+              pullSecrets:
+                - name: my-k8s-secret-with-image-registry-credentials
+
+              # example - simplified syntax
+              pullSecrets:
+                - my-k8s-secret-with-image-registry-credentials
+              ```
+      networkPolicy: &networkPolicy-spec
+        type: object
+        additionalProperties: false
+        description: |
+          This configuration regards the creation and configuration of a k8s
+          _NetworkPolicy resource_.
+        properties:
+          enabled:
+            type: boolean
+            description: |
+              Toggle the creation of the NetworkPolicy resource targeting this
+              pod, and by doing so, restricting its communication to only what
+              is explicitly allowed in the NetworkPolicy.
+          ingress:
+            type: array
+            description: |
+              Additional ingress rules to add besides those that are required
+              for core functionality.
+          egress:
+            type: array
+            description: |
+              Additional egress rules to add besides those that are required for
+              core functionality and those added via
+              [`.egressAllowRules`](schema_hub.networkPolicy.egressAllowRules).
+
+              ```{versionchanged} 2.0.0
+              The default value changed from providing one very permissive rule
+              allowing all egress to providing no rule. The permissive rule is
+              still provided via
+              [`.egressAllowRules`](schema_hub.networkPolicy.egressAllowRules)
+              set to true though.
+              ```
+
+              As an example, below is a configuration that disables the more
+              broadly permissive `.privateIPs` egress allow rule for the hub
+              pod, and instead provides tightly scoped permissions to access a
+              specific k8s local service as identified by pod labels.
+
+              ```yaml
+              hub:
+                networkPolicy:
+                  egressAllowRules:
+                    privateIPs: false
+                  egress:
+                    - to:
+                        - podSelector:
+                            matchLabels:
+                              app: my-k8s-local-service
+                      ports:
+                        - protocol: TCP
+                          port: 5978
+              ```
+          egressAllowRules:
+            type: object
+            additionalProperties: false
+            description: |
+              This is a set of predefined rules that when enabled will be added
+              to the NetworkPolicy list of egress rules.
+
+              The resulting egress rules will be a composition of:
+              - rules specific for the respective pod(s) function within the
+                Helm chart
+              - rules based on enabled `egressAllowRules` flags
+              - rules explicitly specified by the user
+
+              ```{note}
+              Each flag under this configuration will not render into a
+              dedicated rule in the NetworkPolicy resource, but instead combine
+              with the other flags to a reduced set of rules to avoid a
+              performance penalty.
+              ```
+
+              ```{versionadded} 2.0.0
+              ```
+            properties:
+              cloudMetadataServer:
+                type: boolean
+                description: |
+                  Defaults to `false` for singleuser servers, but to `true` for
+                  all other network policies.
+
+                  When enabled this rule allows the respective pod(s) to
+                  establish outbound connections to the cloud metadata server.
+
+                  Note that the `nonPrivateIPs` rule is allowing all non Private
+                  IP ranges but makes an exception for the cloud metadata
+                  server, leaving this as the definitive configuration to allow
+                  access to the cloud metadata server.
+
+                  ```{versionchanged} 3.0.0
+                  This configuration is not allowed to be configured true at the
+                  same time as
+                  [`singleuser.cloudMetadata.blockWithIptables`](schema_singleuser.cloudMetadata.blockWithIptables)
+                  to avoid an ambiguous configuration.
+                  ```
+              dnsPortsCloudMetadataServer:
+                type: boolean
+                description: |
+                  Defaults to `true` for all network policies.
+
+                  When enabled this rule allows the respective pod(s) to
+                  establish outbound connections to the cloud metadata server
+                  via port 53.
+
+                  Relying on this rule for the singleuser config should go hand
+                  in hand with disabling
+                  [`singleuser.cloudMetadata.blockWithIptables`](schema_singleuser.cloudMetadata.blockWithIptables)
+                  to avoid an ambiguous configuration.
+
+                  Known situations when this rule can be relevant:
+
+                  - In GKE clusters with Cloud DNS that is reached at the
+                    cloud metadata server's non-private IP.
+
+                  ```{note}
+                  This chart doesn't know how to identify the DNS server that
+                  pods will rely on due to variations between how k8s clusters
+                  have been setup. Due to that, multiple rules are enabled by
+                  default to ensure DNS connectivity.
+                  ```
+
+                  ```{versionadded} 3.0.0
+                  ```
+              dnsPortsKubeSystemNamespace:
+                type: boolean
+                description: |
+                  Defaults to `true` for all network policies.
+
+                  When enabled this rule allows the respective pod(s) to
+                  establish outbound connections to pods in the kube-system
+                  namespace via port 53.
+
+                  Known situations when this rule can be relevant:
+
+                  - GKE, EKS, AKS, and other clusters relying directly on
+                    `kube-dns` or `coredns` pods in the `kube-system` namespace.
+
+                  ```{note}
+                  This chart doesn't know how to identify the DNS server that
+                  pods will rely on due to variations between how k8s clusters
+                  have been setup. Due to that, multiple rules are enabled by
+                  default to ensure DNS connectivity.
+                  ```
+
+                  ```{versionadded} 3.0.0
+                  ```
+              dnsPortsPrivateIPs:
+                type: boolean
+                description: |
+                  Defaults to `true` for all network policies.
+
+                  When enabled this rule allows the respective pod(s) to
+                  establish outbound connections to private IPs via port 53.
+
+                  Known situations when this rule can be relevant:
+
+                  - GKE clusters relying on a DNS server indirectly via a a node
+                    local DNS cache at an unknown private IP.
+
+                  ```{note}
+                  This chart doesn't know how to identify the DNS server that
+                  pods will rely on due to variations between how k8s clusters
+                  have been setup. Due to that, multiple rules are enabled by
+                  default to ensure DNS connectivity.
+
+                  ```{warning}
+                  This rule is not expected to work in clusters relying on
+                  Cilium to enforce the NetworkPolicy rules (includes GKE
+                  clusters with Dataplane v2), this is due to a [known
+                  limitation](https://github.com/cilium/cilium/issues/9209).
+                  ```
+              nonPrivateIPs:
+                type: boolean
+                description: |
+                  Defaults to `true` for all network policies.
+
+                  When enabled this rule allows the respective pod(s) to
+                  establish outbound connections to the non-private IP ranges
+                  with the exception of the cloud metadata server. This means
+                  respective pod(s) can establish connections to the internet
+                  but not (say) an unsecured prometheus server running in the
+                  same cluster.
+              privateIPs:
+                type: boolean
+                description: |
+                  Defaults to `false` for singleuser servers, but to `true` for
+                  all other network policies.
+
+                  Private IPs refer to the IP ranges `10.0.0.0/8`,
+                  `172.16.0.0/12`, `192.168.0.0/16`.
+
+                  When enabled this rule allows the respective pod(s) to
+                  establish outbound connections to the internal k8s cluster.
+                  This means users can access the internet but not (say) an
+                  unsecured prometheus server running in the same cluster.
+
+                  Since not all workloads in the k8s cluster may have
+                  NetworkPolicies setup to restrict their incoming connections,
+                  having this set to false can be a good defense against
+                  malicious intent from someone in control of software in these
+                  pods.
+
+                  If possible, try to avoid setting this to true as it gives
+                  broad permissions that could be specified more directly via
+                  the [`.egress`](schema_singleuser.networkPolicy.egress).
+
+                  ```{warning}
+                  This rule is not expected to work in clusters relying on
+                  Cilium to enforce the NetworkPolicy rules (includes GKE
+                  clusters with Dataplane v2), this is due to a [known
+                  limitation](https://github.com/cilium/cilium/issues/9209).
+                  ```
+          interNamespaceAccessLabels:
+            enum: [accept, ignore]
+            description: |
+              This configuration option determines if both namespaces and pods
+              in other namespaces, that have specific access labels, should be
+              accepted to allow ingress (set to `accept`), or, if the labels are
+              to be ignored when applied outside the local namespace (set to
+              `ignore`).
+
+              The available access labels for respective NetworkPolicy resources
+              are:
+
+              - `hub.jupyter.org/network-access-hub: "true"` (hub)
+              - `hub.jupyter.org/network-access-proxy-http: "true"` (proxy.chp, proxy.traefik)
+              - `hub.jupyter.org/network-access-proxy-api: "true"` (proxy.chp)
+              - `hub.jupyter.org/network-access-singleuser: "true"` (singleuser)
+          allowedIngressPorts:
+            type: array
+            description: |
+              A rule to allow ingress on these ports will be added no matter
+              what the origin of the request is. The default setting for
+              `proxy.chp` and `proxy.traefik`'s networkPolicy configuration is
+              `[http, https]`, while it is `[]` for other networkPolicies.
+
+              Note that these port names or numbers target a Pod's port name or
+              number, not a k8s Service's port name or number.
+      db:
+        type: object
+        additionalProperties: false
+        properties:
+          type:
+            enum: [sqlite-pvc, sqlite-memory, mysql, postgres, other]
+            description: |
+              Type of database backend to use for the hub database.
+
+              The Hub requires a persistent database to function, and this lets you specify
+              where it should be stored.
+
+              The various options are:
+
+              1. **sqlite-pvc**
+
+                 Use an `sqlite` database kept on a persistent volume attached to the hub.
+
+                 By default, this disk is created by the cloud provider using
+                 *dynamic provisioning* configured by a [storage
+                 class](https://kubernetes.io/docs/concepts/storage/storage-classes/).
+                 You can customize how this disk is created / attached by
+                 setting various properties under `hub.db.pvc`.
+
+                 This is the default setting, and should work well for most cloud provider
+                 deployments.
+
+              2. **sqlite-memory**
+
+                 Use an in-memory `sqlite` database. This should only be used for testing,
+                 since the database is erased whenever the hub pod restarts - causing the hub
+                 to lose all memory of users who had logged in before.
+
+                 When using this for testing, make sure you delete all other objects that the
+                 hub has created (such as user pods, user PVCs, etc) every time the hub restarts.
+                 Otherwise you might run into errors about duplicate resources.
+
+              3. **mysql**
+
+                 Use an externally hosted mysql database.
+
+                 You have to specify an sqlalchemy connection string for the mysql database you
+                 want to connect to in `hub.db.url` if using this option.
+
+                 The general format of the connection string is:
+                 ```
+                 mysql+pymysql://<db-username>:<db-password>@<db-hostname>:<db-port>/<db-name>
+                 ```
+
+                 The user specified in the connection string must have the rights to create
+                 tables in the database specified.
+
+              4. **postgres**
+
+                 Use an externally hosted postgres database.
+
+                 You have to specify an sqlalchemy connection string for the postgres database you
+                 want to connect to in `hub.db.url` if using this option.
+
+                 The general format of the connection string is:
+                 ```
+                 postgresql+psycopg2://<db-username>:<db-password>@<db-hostname>:<db-port>/<db-name>
+                 ```
+
+                 The user specified in the connection string must have the rights to create
+                 tables in the database specified.
+
+              5. **other**
+
+                 Use an externally hosted database of some kind other than mysql
+                 or postgres.
+
+                 When using _other_, the database password must be passed as
+                 part of [hub.db.url](schema_hub.db.url) as
+                 [hub.db.password](schema_hub.db.password) will be ignored.
+          pvc:
+            type: object
+            additionalProperties: false
+            required: [storage]
+            description: |
+              Customize the Persistent Volume Claim used when `hub.db.type` is `sqlite-pvc`.
+            properties:
+              annotations:
+                type: object
+                additionalProperties: false
+                patternProperties: &labels-and-annotations-patternProperties
+                  ".*":
+                    type: string
+                description: |
+                  Annotations to apply to the PVC containing the sqlite database.
+
+                  See [the Kubernetes
+                  documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
+                  for more details about annotations.
+              selector:
+                type: object
+                additionalProperties: true
+                description: |
+                  Label selectors to set for the PVC containing the sqlite database.
+
+                  Useful when you are using a specific PV, and want to bind to
+                  that and only that.
+
+                  See [the Kubernetes
+                  documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)
+                  for more details about using a label selector for what PV to
+                  bind to.
+              storage:
+                type: string
+                description: |
+                  Size of disk to request for the database disk.
+              accessModes:
+                type: array
+                items:
+                  type: [string, "null"]
+                description: |
+                  AccessModes contains the desired access modes the volume
+                  should have. See [the k8s
+                  documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1)
+                  for more information.
+              storageClassName:
+                type: [string, "null"]
+                description: |
+                  Name of the StorageClass required by the claim.
+
+                  If this is a blank string it will be set to a blank string,
+                  while if it is null, it will not be set at all.
+              subPath:
+                type: [string, "null"]
+                description: |
+                  Path within the volume from which the container's volume
+                  should be mounted. Defaults to "" (volume's root).
+          upgrade:
+            type: [boolean, "null"]
+            description: |
+              Users with external databases need to opt-in for upgrades of the
+              JupyterHub specific database schema if needed as part of a
+              JupyterHub version upgrade.
+          url:
+            type: [string, "null"]
+            description: |
+              Connection string when `hub.db.type` is mysql or postgres.
+
+              See documentation for `hub.db.type` for more details on the format of this property.
+          password:
+            type: [string, "null"]
+            description: |
+              Password for the database when `hub.db.type` is mysql or postgres.
+      labels:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          Extra labels to add to the hub pod.
+
+          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+          to learn more about labels.
+      initContainers:
+        type: array
+        description: |
+          list of initContainers to be run with hub pod. See [Kubernetes Docs](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
+
+          ```yaml
+          hub:
+            initContainers:
+              - name: init-myservice
+                image: busybox:1.28
+                command: ['sh', '-c', 'command1']
+              - name: init-mydb
+                image: busybox:1.28
+                command: ['sh', '-c', 'command2']
+          ```
+      extraEnv:
+        type: [object, array]
+        additionalProperties: true
+        description: |
+          Extra environment variables that should be set for the hub pod.
+
+          Environment variables are usually used to:
+            - Pass parameters to some custom code in `hub.extraConfig`.
+            - Configure code running in the hub pod, such as an authenticator or
+              spawner.
+
+          String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
+          is a part of Kubernetes.
+
+          ```yaml
+          hub:
+            extraEnv:
+              # basic notation (for literal values only)
+              MY_ENV_VARS_NAME1: "my env var value 1"
+
+              # explicit notation (the "name" field takes precedence)
+              HUB_NAMESPACE:
+                name: HUB_NAMESPACE
+                valueFrom:
+                  fieldRef:
+                    fieldPath: metadata.namespace
+
+              # implicit notation (the "name" field is implied)
+              PREFIXED_HUB_NAMESPACE:
+                value: "my-prefix-$(HUB_NAMESPACE)"
+              SECRET_VALUE:
+                valueFrom:
+                  secretKeyRef:
+                    name: my-k8s-secret
+                    key: password
+          ```
+
+          For more information, see the [Kubernetes EnvVar
+          specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
+      extraConfig:
+        type: object
+        additionalProperties: true
+        description: |
+          Arbitrary extra python based configuration that should be in `jupyterhub_config.py`.
+
+          This is the *escape hatch* - if you want to configure JupyterHub to do something specific
+          that is not present here as an option, you can write the raw Python to do it here.
+
+          extraConfig is a *dict*, so there can be multiple configuration
+          snippets under different names. The configuration sections are run in
+          alphabetical order based on the keys.
+
+          Non-exhaustive examples of things you can do here:
+            - Subclass authenticator / spawner to do a custom thing
+            - Dynamically launch different images for different sets of images
+            - Inject an auth token from GitHub authenticator into user pod
+            - Anything else you can think of!
+
+          Since this is usually a multi-line string, you want to format it using YAML's
+          [| operator](https://yaml.org/spec/1.2.2/#23-scalars).
+
+          For example:
+
+          ```yaml
+          hub:
+            extraConfig:
+              myConfig.py: |
+                c.JupyterHub.something = 'something'
+                c.Spawner.something_else = 'something else'
+          ```
+
+          ```{note}
+          No code validation is performed until JupyterHub loads it! If you make
+          a typo here, it will probably manifest itself as the hub pod failing
+          to start up and instead entering an `Error` state or the subsequent
+          `CrashLoopBackoff` state.
+
+          To make use of your own programs linters etc, it would be useful to
+          not embed Python code inside a YAML file. To do that, consider using
+          [`hub.extraFiles`](schema_hub.extraFiles) and mounting a file to
+          `/usr/local/etc/jupyterhub/jupyterhub_config.d` in order to load your
+          extra configuration logic.
+          ```
+
+      fsGid:
+        type: [integer, "null"]
+        minimum: 0
+        # This schema entry is needed to help us print a more helpful error
+        # message in NOTES.txt if hub.fsGid is set.
+        #
+        description: |
+          ```{note}
+          Removed in version 2.0.0. Use
+          [`hub.podSecurityContext`](schema_hub.podSecurityContext) and specify
+          `fsGroup` instead.
+          ```
+      service:
+        type: object
+        additionalProperties: false
+        description: |
+          Object to configure the service the JupyterHub will be exposed on by the Kubernetes server.
+        properties:
+          type:
+            enum: [ClusterIP, NodePort, LoadBalancer, ExternalName]
+            description: |
+              The Kubernetes ServiceType to be used.
+
+              The default type is `ClusterIP`.
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)
+              to learn more about service types.
+          ports:
+            type: object
+            additionalProperties: false
+            description: |
+              Object to configure the ports the hub service will be deployed on.
+            properties:
+              nodePort:
+                type: [integer, "null"]
+                minimum: 0
+                description: |
+                  The nodePort to deploy the hub service on.
+          annotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Kubernetes annotations to apply to the hub service.
+          extraPorts:
+            type: array
+            description: |
+              Extra ports to add to the Hub Service object besides `hub` / `8081`.
+              This should be an array that includes `name`, `port`, and `targetPort`.
+              See [Multi-port Services](https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services) for more details.
+          loadBalancerIP:
+            type: [string, "null"]
+            description: |
+              A public IP address the hub Kubernetes service should be exposed
+              on. To expose the hub directly is not recommended. Instead route
+              traffic through the proxy-public service towards the hub.
+
+      pdb: &pdb-spec
+        type: object
+        additionalProperties: false
+        description: |
+          Configure a PodDisruptionBudget for this Deployment.
+
+          These are disabled by default for our deployments that don't support
+          being run in parallel with multiple replicas. Only the user-scheduler
+          currently supports being run in parallel with multiple replicas. If
+          they are enabled for a Deployment with only one replica, they will
+          block `kubectl drain` of a node for example.
+
+          Note that if you aim to block scaling down a node with the
+          hub/proxy/autohttps pod that would cause disruptions of the
+          deployment, then you should instead annotate the pods of the
+          Deployment [as described
+          here](https://github.com/kubernetes/autoscaler/blob/HEAD/cluster-autoscaler/FAQ.md#what-types-of-pods-can-prevent-ca-from-removing-a-node).
+
+              "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
+
+          See [the Kubernetes
+          documentation](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/)
+          for more details about disruptions.
+        properties:
+          enabled:
+            type: boolean
+            description: |
+              Decides if a PodDisruptionBudget is created targeting the
+              Deployment's pods.
+          maxUnavailable:
+            type: [integer, "null"]
+            description: |
+              The maximum number of pods that can be unavailable during
+              voluntary disruptions.
+          minAvailable:
+            type: [integer, "null"]
+            description: |
+              The minimum number of pods required to be available during
+              voluntary disruptions.
+      existingSecret:
+        type: [string, "null"]
+        description: |
+          This option allow you to provide the name of an existing k8s Secret to
+          use alongside of the chart managed k8s Secret. The content of this k8s
+          Secret will be merged with the chart managed k8s Secret, giving
+          priority to the self-managed k8s Secret.
+
+          ```{warning}
+          1. The self managed k8s Secret must mirror the structure in the chart
+             managed secret.
+          2. [`proxy.secretToken`](schema_proxy.secretToken) (aka.
+             `hub.config.ConfigurableHTTPProxy.auth_token`) is only read from
+             the chart managed k8s Secret.
+          ```
+      nodeSelector: &nodeSelector-spec
+        type: object
+        additionalProperties: true
+        description: |
+          An object with key value pairs representing labels. K8s Nodes are
+          required to have match all these labels for this Pod to scheduled on
+          them.
+
+          ```yaml
+          disktype: ssd
+          nodetype: awesome
+          ```
+
+          See [the Kubernetes
+          documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector)
+          for more details.
+      tolerations: &tolerations-spec
+        type: array
+        description: |
+          Tolerations allow a pod to be scheduled on nodes with taints. These
+          tolerations are additional tolerations to the tolerations common to
+          all pods of a their respective kind
+          ([scheduling.corePods.tolerations](schema_scheduling.corePods.tolerations),
+          [scheduling.userPods.tolerations](schema_scheduling.userPods.tolerations)).
+
+          Pass this field an array of
+          [`Toleration`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#toleration-v1-core)
+          objects.
+
+          See the [Kubernetes
+          docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)
+          for more info.
+      activeServerLimit:
+        type: [integer, "null"]
+        description: &jupyterhub-native-config-description |
+          JupyterHub native configuration, see the [JupyterHub
+          documentation](https://jupyterhub.readthedocs.io/en/stable/reference/api/app.html)
+          for more information.
+      allowNamedServers:
+        type: [boolean, "null"]
+        description: *jupyterhub-native-config-description
+      annotations:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          K8s annotations for the hub pod.
+      authenticatePrometheus:
+        type: [boolean, "null"]
+        description: *jupyterhub-native-config-description
+      concurrentSpawnLimit:
+        type: [integer, "null"]
+        description: *jupyterhub-native-config-description
+      consecutiveFailureLimit:
+        type: [integer, "null"]
+        description: *jupyterhub-native-config-description
+      podSecurityContext: &podSecurityContext-spec
+        additionalProperties: true
+        description: |
+          A k8s native specification of the pod's security context, see [the
+          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core)
+          for details.
+      containerSecurityContext: &containerSecurityContext-spec
+        type: object
+        additionalProperties: true
+        description: |
+          A k8s native specification of the container's security context, see [the
+          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#securitycontext-v1-core)
+          for details.
+      deploymentStrategy:
+        type: object
+        additionalProperties: false
+        properties:
+          rollingUpdate:
+            type: [string, "null"]
+          type:
+            type: [string, "null"]
+            description: |
+              JupyterHub does not support running in parallel, due to this we
+              default to using a deployment strategy of Recreate.
+      extraContainers: &extraContainers-spec
+        type: array
+        description: |
+          Additional containers for the Pod. Use a k8s native syntax.
+      extraVolumeMounts: &extraVolumeMounts-spec
+        type: array
+        description: |
+          Additional volume mounts for the Container. Use a k8s native syntax.
+      extraVolumes: &extraVolumes-spec
+        type: array
+        description: |
+          Additional volumes for the Pod. Use a k8s native syntax.
+      livenessProbe: &probe-spec
+        type: object
+        additionalProperties: true
+        required: [enabled]
+        if:
+          properties:
+            enabled:
+              const: true
+        then:
+          description: |
+            This config option is like the k8s native specification of a
+            container probe, except that it also supports an `enabled` boolean
+            flag.
+
+            See [the k8s
+            documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#probe-v1-core)
+            for more details.
+      readinessProbe: *probe-spec
+      namedServerLimitPerUser:
+        type: [integer, "null"]
+        description: *jupyterhub-native-config-description
+      redirectToServer:
+        type: [boolean, "null"]
+        description: *jupyterhub-native-config-description
+      resources: &resources-spec
+        type: object
+        additionalProperties: true
+        description: |
+          A k8s native specification of resources, see [the
+          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core).
+      lifecycle: &lifecycle-spec
+        type: object
+        additionalProperties: false
+        description: |
+          A k8s native specification of lifecycle hooks on the container, see [the
+          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#lifecycle-v1-core).
+        properties:
+          postStart:
+            type: object
+            additionalProperties: true
+          preStop:
+            type: object
+            additionalProperties: true
+      services:
+        type: object
+        additionalProperties: true
+        description: |
+          This is where you register JupyterHub services. For details on how to
+          configure these services in this Helm chart just keep reading but for
+          details on services themselves instead read [JupyterHub's
+          documentation](https://jupyterhub.readthedocs.io/en/stable/reference/api/service.html).
+
+          ```{note}
+          Only a selection of JupyterHub's configuration options that can be
+          configured for a service are documented below. All configuration set
+          here will be applied even if this Helm chart doesn't recognize it.
+          ```
+
+          JupyterHub's native configuration accepts a list of service objects,
+          this Helm chart only accept a dictionary where each key represents the
+          name of a service and the value is the actual service objects.
+
+          When configuring JupyterHub services via this Helm chart, the `name`
+          field can be omitted as it can be implied by the dictionary key.
+          Further, the `api_token` field can be omitted as it will be
+          automatically generated as of version 1.1.0 of this Helm chart.
+
+          If you have an external service that needs to access the automatically
+          generated api_token for the service, you can access it from the `hub`
+          k8s Secret part of this Helm chart under the key
+          `hub.services.my-service-config-key.apiToken`.
+
+          Here is an example configuration of two services where the first
+          explicitly sets a name and api_token, while the second omits those and
+          lets the name be implied from the key name and the api_token be
+          automatically generated.
+
+          ```yaml
+          hub:
+            services:
+              my-service-1:
+                admin: true
+                name: my-explicitly-set-service-name
+                api_token: my-explicitly-set-api_token
+
+              # the name of the following service will be my-service-2
+              # the api_token of the following service will be generated
+              my-service-2: {}
+          ```
+
+          If you develop a Helm chart depending on the JupyterHub Helm chart and
+          want to let some Pod's environment variable be populated with the
+          api_token of a service registered like above, then do something along
+          these lines.
+
+          ```yaml
+          # ... container specification of a pod ...
+          env:
+            - name: MY_SERVICE_1_API_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  # Don't hardcode the name, use the globally accessible
+                  # named templates part of the JupyterHub Helm chart.
+                  name: {{ include "jupyterhub.hub.fullname" . }}
+                  # Note below the use of the configuration key my-service-1
+                  # rather than the explicitly set service name.
+                  key: hub.services.my-service-1.apiToken
+          ```
+        properties:
+          name:
+            type: string
+            description: |
+              The name can be implied via the key name under which this
+              service is configured, and is due to that allowed to be
+              omitted in this Helm chart configuration of JupyterHub.
+          admin:
+            type: boolean
+          command:
+            type: [string, array]
+          url:
+            type: string
+          api_token:
+            type: [string, "null"]
+            description: |
+              The api_token will be automatically generated if not
+              explicitly set. It will also be exposed in via a k8s Secret
+              part of this Helm chart under a specific key.
+
+              See the documentation under
+              [`hub.services`](schema_hub.services) for details about this.
+          apiToken:
+            type: [string, "null"]
+            description: |
+              An alias for api_token provided for backward compatibility by
+              the JupyterHub Helm chart that will be transformed to
+              api_token.
+      loadRoles:
+        type: object
+        additionalProperties: true
+        description: |
+          This is where you should define JupyterHub roles and apply them to
+          JupyterHub users, groups, and services to grant them additional
+          permissions as defined in JupyterHub's RBAC system.
+
+          Complement this documentation with [JupyterHub's
+          documentation](https://jupyterhub.readthedocs.io/en/stable/rbac/roles.html#defining-roles)
+          about `load_roles`.
+
+          Note that while JupyterHub's native configuration `load_roles` accepts
+          a list of role objects, this Helm chart only accepts a dictionary where
+          each key represents the name of a role and the value is the actual
+          role object.
+
+          ```yaml
+          hub:
+            loadRoles:
+              teacher:
+                description: Access to users' information and group membership
+
+                # this role provides permissions to...
+                scopes: [users, groups]
+
+                # this role will be assigned to...
+                users: [erik]
+                services: [grading-service]
+                groups: [teachers]
+          ```
+
+          When configuring JupyterHub roles via this Helm chart, the `name`
+          field can be omitted as it can be implied by the dictionary key.
+      shutdownOnLogout:
+        type: [boolean, "null"]
+        description: *jupyterhub-native-config-description
+      templatePaths:
+        type: array
+        description: *jupyterhub-native-config-description
+      templateVars:
+        type: object
+        additionalProperties: true
+        description: *jupyterhub-native-config-description
+      serviceAccount: &serviceAccount
+        type: object
+        required: [create]
+        additionalProperties: false
+        description: |
+          Configuration for a k8s ServiceAccount dedicated for use by the
+          specific pod which this configuration is nested under.
+        properties:
+          create:
+            type: boolean
+            description: |
+              Whether or not to create the `ServiceAccount` resource.
+          name:
+            type: ["string", "null"]
+            description: |
+              This configuration serves multiple purposes:
+
+              - It will be the `serviceAccountName` referenced by related Pods.
+              - If `create` is set, the created ServiceAccount resource will be named like this.
+              - If [`rbac.create`](schema_rbac.create) is set, the associated (Cluster)RoleBindings will bind to this name.
+
+              If not explicitly provided, a default name will be used.
+          annotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Kubernetes annotations to apply to the k8s ServiceAccount.
+      extraPodSpec: &extraPodSpec-spec
+        type: object
+        additionalProperties: true
+        description: |
+          Arbitrary extra k8s pod specification as a YAML object. The default
+          value of this setting is an empty object, i.e. no extra configuration.
+          The value of this property is augmented to the pod specification as-is.
+
+          This is a powerful tool for expert k8s administrators with advanced
+          configuration requirements. This setting should only be used for
+          configuration that cannot be accomplished through the other settings.
+          Misusing this setting can break your deployment and/or compromise
+          your system security.
+
+          This is one of four related settings for inserting arbitrary pod
+          specification:
+
+          1. hub.extraPodSpec
+          2. proxy.chp.extraPodSpec
+          3. proxy.traefik.extraPodSpec
+          4. scheduling.userScheduler.extraPodSpec
+
+          One real-world use of these settings is to enable host networking. For
+          example, to configure host networking for the hub pod, add the
+          following to your helm configuration values:
+
+          ```yaml
+          hub:
+            extraPodSpec:
+              hostNetwork: true
+              dnsPolicy: ClusterFirstWithHostNet
+          ```
+
+          Likewise, to configure host networking for the proxy pod, add the
+          following:
+
+          ```yaml
+          proxy:
+            chp:
+              extraPodSpec:
+                hostNetwork: true
+                dnsPolicy: ClusterFirstWithHostNet
+          ```
+
+          N.B. Host networking has special security implications and can easily
+          break your deployment. This is an example—not an endorsement.
+
+          See [PodSpec](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec)
+          for the latest pod resource specification.
+
+  proxy:
+    type: object
+    additionalProperties: false
+    properties:
+      chp:
+        type: object
+        additionalProperties: false
+        description: |
+          Configure the configurable-http-proxy (chp) pod managed by jupyterhub to route traffic
+          both to itself and to user pods.
+        properties:
+          revisionHistoryLimit: *revisionHistoryLimit
+          networkPolicy: *networkPolicy-spec
+          extraCommandLineFlags:
+            type: array
+            description: |
+              A list of strings to be added as command line options when
+              starting
+              [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy#command-line-options)
+              that will be expanded with Helm's template function `tpl` which
+              can render Helm template logic inside curly braces (`{{ ... }}`).
+
+              ```yaml
+              proxy:
+                chp:
+                  extraCommandLineFlags:
+                    - "--auto-rewrite"
+                    - "--custom-header {{ .Values.myCustomStuff }}"
+              ```
+
+              Note that these will be appended last, and if you provide the same
+              flag twice, the last flag will be used, which mean you can
+              override the default flag values as well.
+          extraEnv:
+            type: [object, array]
+            additionalProperties: true
+            description: |
+              Extra environment variables that should be set for the chp pod.
+
+              Environment variables are usually used here to:
+                - override HUB_SERVICE_PORT or HUB_SERVICE_HOST default values
+                - set CONFIGPROXY_SSL_KEY_PASSPHRASE for setting passphrase of SSL keys
+
+              String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
+              is a part of Kubernetes.
+
+              ```yaml
+              proxy:
+                chp:
+                  extraEnv:
+                    # basic notation (for literal values only)
+                    MY_ENV_VARS_NAME1: "my env var value 1"
+
+                    # explicit notation (the "name" field takes precedence)
+                    CHP_NAMESPACE:
+                      name: CHP_NAMESPACE
+                      valueFrom:
+                        fieldRef:
+                          fieldPath: metadata.namespace
+
+                    # implicit notation (the "name" field is implied)
+                    PREFIXED_CHP_NAMESPACE:
+                      value: "my-prefix-$(CHP_NAMESPACE)"
+                    SECRET_VALUE:
+                      valueFrom:
+                        secretKeyRef:
+                          name: my-k8s-secret
+                          key: password
+              ```
+
+              For more information, see the [Kubernetes EnvVar
+              specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
+          pdb: *pdb-spec
+          nodeSelector: *nodeSelector-spec
+          tolerations: *tolerations-spec
+          containerSecurityContext: *containerSecurityContext-spec
+          image: *image-spec
+          livenessProbe: *probe-spec
+          readinessProbe: *probe-spec
+          resources: *resources-spec
+          defaultTarget:
+            type: [string, "null"]
+            description: |
+              Override the URL for the default routing target for the proxy.
+              Defaults to JupyterHub itself.
+              This will generally only have an effect while JupyterHub is not running,
+              as JupyterHub adds itself as the default target after it starts.
+          errorTarget:
+            type: [string, "null"]
+            description: |
+              Override the URL for the error target for the proxy.
+              Defaults to JupyterHub itself.
+              Useful to reduce load on the Hub
+              or produce more informative error messages than the Hub's default,
+              e.g. in highly customized deployments such as BinderHub.
+              See Configurable HTTP Proxy for details on implementing an error target.
+          extraPodSpec: *extraPodSpec-spec
+      secretToken:
+        type: [string, "null"]
+        description: |
+          ```{note}
+          As of version 1.0.0 this will automatically be generated and there is
+          no need to set it manually.
+
+          If you wish to reset a generated key, you can use `kubectl edit` on
+          the k8s Secret typically named `hub` and remove the
+          `hub.config.ConfigurableHTTPProxy.auth_token` entry in the k8s Secret,
+          then perform a new `helm upgrade`.
+          ```
+
+          A 32-byte cryptographically secure randomly generated string used to
+          secure communications between the hub pod and the proxy pod running a
+          [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)
+          instance.
+
+          ```sh
+          # to generate a value, run
+          openssl rand -hex 32
+          ```
+
+          Changing this value will cause the proxy and hub pods to restart. It is good security
+          practice to rotate these values over time. If this secret leaks, *immediately* change
+          it to something else, or user data can be compromised.
+      service:
+        type: object
+        additionalProperties: false
+        description: |
+          Configuration of the k8s Service `proxy-public` which either will
+          point to the `autohttps` pod running Traefik for TLS termination, or
+          the `proxy` pod running ConfigurableHTTPProxy. Incoming traffic from
+          users on the internet should always go through this k8s Service.
+
+          When this service targets the `autohttps` pod which then routes to the
+          `proxy` pod, a k8s Service named `proxy-http` will be added targeting
+          the `proxy` pod and only accepting HTTP traffic on port 80.
+        properties:
+          type:
+            enum: [ClusterIP, NodePort, LoadBalancer, ExternalName]
+            description: |
+              Default `LoadBalancer`.
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)
+              to learn more about service types.
+          labels:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Extra labels to add to the proxy service.
+
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+              to learn more about labels.
+          annotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Annotations to apply to the service that is exposing the proxy.
+
+              See [the Kubernetes
+              documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
+              for more details about annotations.
+          nodePorts:
+            type: object
+            additionalProperties: false
+            description: |
+              Object to set NodePorts to expose the service on for http and https.
+
+              See [the Kubernetes
+              documentation](https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport)
+              for more details about NodePorts.
+            properties:
+              http:
+                type: [integer, "null"]
+                description: |
+                  The HTTP port the proxy-public service should be exposed on.
+              https:
+                type: [integer, "null"]
+                description: |
+                  The HTTPS port the proxy-public service should be exposed on.
+          disableHttpPort:
+            type: boolean
+            description: |
+              Default `false`.
+
+              If `true`, port 80 for incoming HTTP traffic will no longer be exposed. This should not be used with `proxy.https.type=letsencrypt` or `proxy.https.enabled=false` as it would remove the only exposed port.
+          extraPorts:
+            type: array
+            description: |
+              Extra ports the k8s Service should accept incoming traffic on,
+              which will be redirected to either the `autohttps` pod (treafik)
+              or the `proxy` pod (chp).
+
+              See [the Kubernetes
+              documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#serviceport-v1-core)
+              for the structure of the items in this list.
+          loadBalancerIP:
+            type: [string, "null"]
+            description: |
+              The public IP address the proxy-public Kubernetes service should
+              be exposed on. This entry will end up at the configurable proxy
+              server that JupyterHub manages, which will direct traffic to user
+              pods at the `/user` path and the hub pod at the `/hub` path.
+
+              Set this if you want to use a fixed external IP address instead of
+              a dynamically acquired one. This is relevant if you have a domain
+              name that you want to point to a specific IP and want to ensure it
+              doesn't change.
+          loadBalancerSourceRanges:
+            type: array
+            description: |
+              A list of IP CIDR ranges that are allowed to access the load balancer service.
+              Defaults to allowing everyone to access it.
+      https:
+        type: object
+        additionalProperties: false
+        description: |
+          Object for customizing the settings for HTTPS used by the JupyterHub's proxy.
+          For more information on configuring HTTPS for your JupyterHub, see the [HTTPS section in our security guide](https)
+        properties:
+          enabled:
+            type: [boolean, "null"]
+            description: |
+              Indicator to set whether HTTPS should be enabled or not on the proxy. Defaults to `true` if the https object is provided.
+          type:
+            enum: [null, "", letsencrypt, manual, offload, secret]
+            description: |
+              The type of HTTPS encryption that is used.
+              Decides on which ports and network policies are used for communication via HTTPS. Setting this to `secret` sets the type to manual HTTPS with a secret that has to be provided in the `https.secret` object.
+              Defaults to `letsencrypt`.
+          letsencrypt:
+            type: object
+            additionalProperties: false
+            properties:
+              contactEmail:
+                type: [string, "null"]
+                description: |
+                  The contact email to be used for automatically provisioned HTTPS certificates by Let's Encrypt. For more information see [Set up automatic HTTPS](setup-automatic-https).
+                  Required for automatic HTTPS.
+              acmeServer:
+                type: [string, "null"]
+                description: |
+                  Let's Encrypt is one of various ACME servers that can provide
+                  a certificate, and by default their production server is used.
+
+                  Let's Encrypt staging:    https://acme-staging-v02.api.letsencrypt.org/directory
+                  Let's Encrypt production: acmeServer: https://acme-v02.api.letsencrypt.org/directory
+          manual:
+            type: object
+            additionalProperties: false
+            description: |
+              Object for providing own certificates for manual HTTPS configuration. To be provided when setting `https.type` to `manual`.
+              See [Set up manual HTTPS](setup-manual-https)
+            properties:
+              key:
+                type: [string, "null"]
+                description: |
+                  The RSA private key to be used for HTTPS.
+                  To be provided in the form of
+
+                  ```
+                  key: |
+                    -----BEGIN RSA PRIVATE KEY-----
+                    ...
+                    -----END RSA PRIVATE KEY-----
+                  ```
+              cert:
+                type: [string, "null"]
+                description: |
+                  The certificate to be used for HTTPS.
+                  To be provided in the form of
+
+                  ```
+                  cert: |
+                    -----BEGIN CERTIFICATE-----
+                    ...
+                    -----END CERTIFICATE-----
+                  ```
+          secret:
+            type: object
+            additionalProperties: false
+            description: |
+              Secret to be provided when setting `https.type` to `secret`.
+            properties:
+              name:
+                type: [string, "null"]
+                description: |
+                  Name of the secret
+              key:
+                type: [string, "null"]
+                description: |
+                  Path to the private key to be used for HTTPS.
+                  Example: `'tls.key'`
+              crt:
+                type: [string, "null"]
+                description: |
+                  Path to the certificate to be used for HTTPS.
+                  Example: `'tls.crt'`
+          hosts:
+            type: array
+            description: |
+              You domain in list form.
+              Required for automatic HTTPS. See [Set up automatic HTTPS](setup-automatic-https).
+              To be provided like:
+              ```
+              hosts:
+                - <your-domain-name>
+              ```
+      traefik:
+        type: object
+        additionalProperties: false
+        description: |
+          Configure the traefik proxy used to terminate TLS when 'autohttps' is enabled
+        properties:
+          revisionHistoryLimit: *revisionHistoryLimit
+          labels:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Extra labels to add to the traefik pod.
+
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+              to learn more about labels.
+          networkPolicy: *networkPolicy-spec
+          extraInitContainers:
+            type: array
+            description: |
+              list of extraInitContainers to be run with traefik pod, after the containers set in the chart. See [Kubernetes Docs](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
+
+              ```yaml
+              proxy:
+                traefik:
+                  extraInitContainers:
+                    - name: init-myservice
+                      image: busybox:1.28
+                      command: ['sh', '-c', 'command1']
+                    - name: init-mydb
+                      image: busybox:1.28
+                      command: ['sh', '-c', 'command2']
+              ```
+          extraEnv:
+            type: [object, array]
+            additionalProperties: true
+            description: |
+              Extra environment variables that should be set for the traefik pod.
+
+              Environment Variables here may be used to configure traefik.
+
+              String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
+              is a part of Kubernetes.
+
+              ```yaml
+              proxy:
+                traefik:
+                  extraEnv:
+                    # basic notation (for literal values only)
+                    MY_ENV_VARS_NAME1: "my env var value 1"
+
+                    # explicit notation (the "name" field takes precedence)
+                    TRAEFIK_NAMESPACE:
+                      name: TRAEFIK_NAMESPACE
+                      valueFrom:
+                        fieldRef:
+                          fieldPath: metadata.namespace
+
+                    # implicit notation (the "name" field is implied)
+                    PREFIXED_TRAEFIK_NAMESPACE:
+                      value: "my-prefix-$(TRAEFIK_NAMESPACE)"
+                    SECRET_VALUE:
+                      valueFrom:
+                        secretKeyRef:
+                          name: my-k8s-secret
+                          key: password
+              ```
+
+              For more information, see the [Kubernetes EnvVar
+              specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
+          pdb: *pdb-spec
+          nodeSelector: *nodeSelector-spec
+          tolerations: *tolerations-spec
+          containerSecurityContext: *containerSecurityContext-spec
+          extraDynamicConfig:
+            type: object
+            additionalProperties: true
+            description: |
+              This refers to traefik's post-startup configuration.
+
+              This Helm chart already provide such configuration, so this is a
+              place where you can merge in additional configuration. If you are
+              about to use this configuration, you may want to inspect the
+              default configuration declared
+              [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/jupyterhub/templates/proxy/autohttps/_configmap-dynamic.yaml).
+          extraPorts:
+            type: array
+            description: |
+              Extra ports for the traefik container within the autohttps pod
+              that you would like to expose, formatted in a k8s native way.
+          extraStaticConfig:
+            type: object
+            additionalProperties: true
+            description: |
+              This refers to traefik's startup configuration.
+
+              This Helm chart already provide such configuration, so this is a
+              place where you can merge in additional configuration. If you are
+              about to use this configuration, you may want to inspect the
+              default configuration declared
+              [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/jupyterhub/templates/proxy/autohttps/_configmap-traefik.yaml).
+          extraVolumes: *extraVolumes-spec
+          extraVolumeMounts: *extraVolumeMounts-spec
+          hsts:
+            type: object
+            additionalProperties: false
+            required: [includeSubdomains, maxAge, preload]
+            description: |
+              This section regards a HTTP Strict-Transport-Security (HSTS)
+              response header. It can act as a request for a visiting web
+              browsers to enforce HTTPS on their end in for a given time into
+              the future, and optionally also for future requests to subdomains.
+
+              These settings relate to traefik configuration which we use as a
+              TLS termination proxy.
+
+              See [Mozilla's
+              documentation](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security)
+              for more information.
+            properties:
+              includeSubdomains:
+                type: boolean
+              maxAge:
+                type: integer
+              preload:
+                type: boolean
+          image: *image-spec
+          resources: *resources-spec
+          serviceAccount: *serviceAccount
+          extraPodSpec: *extraPodSpec-spec
+      labels:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          K8s labels for the proxy pod.
+
+          ```{note}
+          For consistency, this should really be located under
+          proxy.chp.labels but isn't for historical reasons.
+          ```
+      annotations:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          K8s annotations for the proxy pod.
+
+          ```{note}
+          For consistency, this should really be located under
+          proxy.chp.annotations but isn't for historical reasons.
+          ```
+      deploymentStrategy:
+        type: object
+        additionalProperties: false
+        properties:
+          rollingUpdate:
+            type: [string, "null"]
+          type:
+            type: [string, "null"]
+            description: |
+              While the proxy pod running
+              [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)
+              could run in parallel, two instances running in parallel wouldn't
+              both receive updates from JupyterHub regarding how it should route
+              traffic. Due to this we default to using a deployment strategy of
+              Recreate instead of RollingUpdate.
+      secretSync:
+        type: object
+        additionalProperties: false
+        description: |
+          This configuration section refers to configuration of the sidecar
+          container in the autohttps pod running next to its traefik container
+          responsible for TLS termination.
+
+          The purpose of this container is to store away and load TLS
+          certificates from a k8s Secret. The TLS certificates are acquired by
+          the ACME client (LEGO) that is running within the traefik container,
+          where traefik is using them for TLS termination.
+        properties:
+          containerSecurityContext: *containerSecurityContext-spec
+          image: *image-spec
+          resources: *resources-spec
+
+  singleuser:
+    type: object
+    additionalProperties: false
+    description: |
+      Options for customizing the environment that is provided to the users after they log in.
+    properties:
+      networkPolicy: *networkPolicy-spec
+      podNameTemplate:
+        type: [string, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.pod_name_template](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.pod_name_template).
+      cpu:
+        type: object
+        additionalProperties: false
+        description: |
+          Set CPU limits & guarantees that are enforced for each user.
+
+          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
+          for more info.
+        properties:
+          limit:
+            type: [number, "null"]
+          guarantee:
+            type: [number, "null"]
+      memory:
+        type: object
+        additionalProperties: false
+        description: |
+          Set Memory limits & guarantees that are enforced for each user.
+
+          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
+          for more info.
+        properties:
+          limit:
+            type: [number, string, "null"]
+          guarantee:
+            type: [number, string, "null"]
+            description: |
+              Note that this field is referred to as *requests* by the Kubernetes API.
+      image: *image-spec
+      initContainers:
+        type: array
+        description: |
+          list of initContainers to be run every singleuser pod. See [Kubernetes Docs](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
+
+          ```yaml
+          singleuser:
+            initContainers:
+              - name: init-myservice
+                image: busybox:1.28
+                command: ['sh', '-c', 'command1']
+              - name: init-mydb
+                image: busybox:1.28
+                command: ['sh', '-c', 'command2']
+          ```
+      profileList:
+        type: array
+        description: |
+          For more information about the profile list, see [KubeSpawner's
+          documentation](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner)
+          as this is simply a passthrough to that configuration.
+
+          ```{note}
+          The image-pullers are aware of the overrides of images in
+          `singleuser.profileList` but they won't be if you configure it in
+          JupyterHub's configuration of '`c.KubeSpawner.profile_list`.
+          ```
+
+          ```yaml
+          singleuser:
+            profileList:
+              - display_name: "Default: Shared, 8 CPU cores"
+                description: "Your code will run on a shared machine with CPU only."
+                default: True
+              - display_name: "Personal, 4 CPU cores & 26GB RAM, 1 NVIDIA Tesla K80 GPU"
+                description: "Your code will run a personal machine with a GPU."
+                kubespawner_override:
+                  extra_resource_limits:
+                    nvidia.com/gpu: "1"
+          ```
+      extraFiles: *extraFiles
+      extraEnv:
+        type: [object, array]
+        additionalProperties: true
+        description: |
+          Extra environment variables that should be set for the user pods.
+
+          String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
+          is a part of Kubernetes. Note that the user pods will already have
+          access to a set of environment variables that you can use, like
+          `JUPYTERHUB_USER` and `JUPYTERHUB_HOST`. For more information about these
+          inspect [this source
+          code](https://github.com/jupyterhub/jupyterhub/blob/cc8e7806530466dce8968567d1bbd2b39a7afa26/jupyterhub/spawner.py#L763).
+
+          ```yaml
+          singleuser:
+            extraEnv:
+              # basic notation (for literal values only)
+              MY_ENV_VARS_NAME1: "my env var value 1"
+
+              # explicit notation (the "name" field takes precedence)
+              USER_NAMESPACE:
+                name: USER_NAMESPACE
+                valueFrom:
+                  fieldRef:
+                    fieldPath: metadata.namespace
+
+              # implicit notation (the "name" field is implied)
+              PREFIXED_USER_NAMESPACE:
+                value: "my-prefix-$(USER_NAMESPACE)"
+              SECRET_VALUE:
+                valueFrom:
+                  secretKeyRef:
+                    name: my-k8s-secret
+                    key: password
+          ```
+
+          For more information, see the [Kubernetes EnvVar
+          specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
+      nodeSelector: *nodeSelector-spec
+      extraTolerations: *tolerations-spec
+      extraNodeAffinity:
+        type: object
+        additionalProperties: false
+        description: |
+          Affinities describe where pods prefer or require to be scheduled, they
+          may prefer or require a node where they are to be scheduled to have a
+          certain label (node affinity). They may also require to be scheduled
+          in proximity or with a lack of proximity to another pod (pod affinity
+          and anti pod affinity).
+
+          See the [Kubernetes
+          docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)
+          for more info.
+        properties:
+          required:
+            type: array
+            description: |
+              Pass this field an array of
+              [`NodeSelectorTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#nodeselectorterm-v1-core)
+              objects.
+          preferred:
+            type: array
+            description: |
+              Pass this field an array of
+              [`PreferredSchedulingTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#preferredschedulingterm-v1-core)
+              objects.
+      extraPodAffinity:
+        type: object
+        additionalProperties: false
+        description: |
+          See the description of `singleuser.extraNodeAffinity`.
+        properties:
+          required:
+            type: array
+            description: |
+              Pass this field an array of
+              [`PodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podaffinityterm-v1-core)
+              objects.
+          preferred:
+            type: array
+            description: |
+              Pass this field an array of
+              [`WeightedPodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#weightedpodaffinityterm-v1-core)
+              objects.
+      extraPodAntiAffinity:
+        type: object
+        additionalProperties: false
+        description: |
+          See the description of `singleuser.extraNodeAffinity`.
+        properties:
+          required:
+            type: array
+            description: |
+              Pass this field an array of
+              [`PodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podaffinityterm-v1-core)
+              objects.
+          preferred:
+            type: array
+            description: |
+              Pass this field an array of
+              [`WeightedPodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#weightedpodaffinityterm-v1-core)
+              objects.
+      cloudMetadata:
+        type: object
+        additionalProperties: false
+        required: [blockWithIptables, ip]
+        description: |
+          Please refer to dedicated section in [the Helm chart
+          documentation](block-metadata-iptables) for more information about
+          this.
+        properties:
+          blockWithIptables:
+            type: boolean
+          ip:
+            type: string
+
+      cmd:
+        type: [array, string, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.cmd](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.cmd).
+          The default is "jupyterhub-singleuser".
+          Use `cmd: null` to launch a custom CMD from the image,
+          which must launch jupyterhub-singleuser or an equivalent process eventually.
+          For example: Jupyter's docker-stacks images.
+      defaultUrl:
+        type: [string, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.default_url](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.default_url).
+      # FIXME: name mismatch, named events_enabled in kubespawner
+      events:
+        type: [boolean, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.events_enabled](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.events_enabled).
+      extraAnnotations:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.extra_annotations](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_annotations).
+      extraContainers:
+        type: array
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.extra_containers](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_containers).
+      extraLabels:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.extra_labels](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_labels).
+      extraPodConfig:
+        type: object
+        additionalProperties: true
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.extra_pod_config](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_pod_config).
+      extraResource:
+        type: object
+        additionalProperties: false
+        properties:
+          # FIXME: name mismatch, named extra_resource_guarantees in kubespawner
+          guarantees:
+            type: object
+            additionalProperties: true
+            description: |
+              Passthrough configuration for
+              [KubeSpawner.extra_resource_guarantees](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_resource_guarantees).
+          # FIXME: name mismatch, named extra_resource_limits in kubespawner
+          limits:
+            type: object
+            additionalProperties: true
+            description: |
+              Passthrough configuration for
+              [KubeSpawner.extra_resource_limits](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_resource_limits).
+      fsGid:
+        type: [integer, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.fs_gid](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.fs_gid).
+      lifecycleHooks:
+        type: object
+        additionalProperties: false
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.lifecycle_hooks](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.lifecycle_hooks).
+        properties:
+          postStart:
+            type: object
+            additionalProperties: true
+          preStop:
+            type: object
+            additionalProperties: true
+      networkTools:
+        type: object
+        additionalProperties: false
+        description: |
+          This configuration section refers to configuration of a conditionally
+          created initContainer for the user pods with a purpose to block a
+          specific IP address.
+
+          This initContainer will be created if
+          [`singleuser.cloudMetadata.blockWithIptables`](schema_singleuser.cloudMetadata.blockWithIptables)
+          is set to true.
+        properties:
+          image: *image-spec
+          resources: *resources-spec
+      # FIXME: name mismatch, named service_account in kubespawner
+      serviceAccountName:
+        type: [string, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.service_account](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.service_account).
+      startTimeout:
+        type: [integer, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.start_timeout](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.start_timeout).
+      storage:
+        type: object
+        additionalProperties: false
+        required: [type, homeMountPath]
+        description: |
+          This section configures KubeSpawner directly to some extent but also
+          indirectly through Helm chart specific configuration options such as
+          [`singleuser.storage.type`](schema_singleuser.storage.type).
+        properties:
+          capacity:
+            type: [string, "null"]
+            description: |
+              Configures `KubeSpawner.storage_capacity`.
+
+              See the [KubeSpawner
+              documentation](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html)
+              for more information.
+          dynamic:
+            type: object
+            additionalProperties: false
+            properties:
+              pvcNameTemplate:
+                type: [string, "null"]
+                description: |
+                  Configures `KubeSpawner.pvc_name_template` which will be the
+                  resource name of the PVC created by KubeSpawner for each user
+                  if needed.
+              storageAccessModes:
+                type: array
+                items:
+                  type: [string, "null"]
+                description: |
+                  Configures `KubeSpawner.storage_access_modes`.
+
+                  See KubeSpawners documentation and [the k8s
+                  documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes)
+                  for more information.
+              storageClass:
+                type: [string, "null"]
+                description: |
+                  Configures `KubeSpawner.storage_class`, which can be an
+                  explicit StorageClass to dynamically provision storage for the
+                  PVC that KubeSpawner will create.
+
+                  There is of a default StorageClass available in k8s clusters
+                  for use if this is unspecified.
+              volumeNameTemplate:
+                type: [string, "null"]
+                description: |
+                  Configures `KubeSpawner.volume_name_template`, which is the
+                  name to reference from the containers volumeMounts section.
+          extraLabels:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Configures `KubeSpawner.storage_extra_labels`. Note that these
+              labels are set on the PVC during creation only and won't be
+              updated after creation.
+          extraVolumeMounts: *extraVolumeMounts-spec
+          extraVolumes: *extraVolumes-spec
+          homeMountPath:
+            type: string
+            description: |
+              The location within the container where the home folder storage
+              should be mounted.
+          static:
+            type: object
+            additionalProperties: false
+            properties:
+              pvcName:
+                type: [string, "null"]
+                description: |
+                  Configures `KubeSpawner.pvc_claim_name` to reference
+                  pre-existing storage.
+              subPath:
+                type: [string, "null"]
+                description: |
+                  Configures the `subPath` field of a
+                  `KubeSpawner.volume_mounts` entry added by the Helm chart.
+
+                  Path within the volume from which the container's volume
+                  should be mounted.
+          type:
+            enum: [dynamic, static, none]
+            description: |
+              Decide if you want storage to be provisioned dynamically
+              (dynamic), or if you want to attach existing storage (static), or
+              don't want any storage to be attached (none).
+      allowPrivilegeEscalation:
+        type: [boolean, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.allow_privilege_escalation](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.allow_privilege_escalation).
+      uid:
+        type: [integer, "null"]
+        description: |
+          Passthrough configuration for
+          [KubeSpawner.uid](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.uid).
+
+          This dictates as what user the main container will start up as.
+
+          As an example of when this is needed, consider if you want to enable
+          sudo rights for some of your users. This can be done by starting up as
+          root, enabling it from the container in a startup script, and then
+          transitioning to the normal user.
+
+          Default is 1000, set to null to use the container's default.
+
+  scheduling:
+    type: object
+    additionalProperties: false
+    description: |
+      Objects for customizing the scheduling of various pods on the nodes and
+      related labels.
+    properties:
+      userScheduler:
+        type: object
+        additionalProperties: false
+        required: [enabled, plugins, pluginConfig, logLevel]
+        description: |
+          The user scheduler is making sure that user pods are scheduled
+          tight on nodes, this is useful for autoscaling of user node pools.
+        properties:
+          enabled:
+            type: boolean
+            description: |
+              Enables the user scheduler.
+          revisionHistoryLimit: *revisionHistoryLimit
+          replicas:
+            type: integer
+            description: |
+              You can have multiple schedulers to share the workload or improve
+              availability on node failure.
+          image: *image-spec
+          pdb: *pdb-spec
+          nodeSelector: *nodeSelector-spec
+          tolerations: *tolerations-spec
+          labels:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Extra labels to add to the userScheduler pods.
+
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+              to learn more about labels.
+          annotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Extra annotations to add to the user-scheduler pods.
+          containerSecurityContext: *containerSecurityContext-spec
+          logLevel:
+            type: integer
+            description: |
+              Corresponds to the verbosity level of logging made by the
+              kube-scheduler binary running within the user-scheduler pod.
+          plugins:
+            type: object
+            additionalProperties: true
+            description: |
+              These plugins refers to kube-scheduler plugins as documented
+              [here](https://kubernetes.io/docs/reference/scheduling/config/).
+
+              The user-scheduler is really just a kube-scheduler configured in a
+              way to pack users tight on nodes using these plugins. See
+              values.yaml for information about the default plugins.
+          pluginConfig:
+            type: array
+            description: |
+              Individually activated plugins can be configured further.
+          resources: *resources-spec
+          serviceAccount: *serviceAccount
+          extraPodSpec: *extraPodSpec-spec
+      podPriority:
+        type: object
+        additionalProperties: false
+        description: |
+          Pod Priority is used to allow real users evict user placeholder pods
+          that in turn by entering a Pending state can trigger a scale up by a
+          cluster autoscaler.
+
+          Having this option enabled only make sense if the following conditions
+          are met:
+
+          1. A cluster autoscaler is installed.
+          2. user-placeholer pods are configured to have a priority equal or
+             higher than the cluster autoscaler's "priority cutoff" so that the
+             cluster autoscaler scales up a node in advance for a pending user
+             placeholder pod.
+          3. Normal user pods have a higher priority than the user-placeholder
+             pods.
+          4. Image puller pods have a priority between normal user pods and
+             user-placeholder pods.
+
+          Note that if the default priority cutoff if not configured on cluster
+          autoscaler, it will currently default to 0, and that in the future
+          this is meant to be lowered. If your cloud provider is installing the
+          cluster autoscaler for you, they may also configure this specifically.
+
+          Recommended settings for a cluster autoscaler...
+
+          ... with a priority cutoff of -10 (GKE):
+
+          ```yaml
+          podPriority:
+            enabled: true
+            globalDefault: false
+            defaultPriority: 0
+            imagePullerPriority: -5
+            userPlaceholderPriority: -10
+          ```
+
+          ... with a priority cutoff of 0:
+
+          ```yaml
+          podPriority:
+            enabled: true
+            globalDefault: true
+            defaultPriority: 10
+            imagePullerPriority: 5
+            userPlaceholderPriority: 0
+          ```
+        properties:
+          enabled:
+            type: boolean
+          globalDefault:
+            type: boolean
+            description: |
+              Warning! This will influence all pods in the cluster.
+
+              The priority a pod usually get is 0. But this can be overridden
+              with a PriorityClass resource if it is declared to be the global
+              default. This configuration option allows for the creation of such
+              global default.
+          defaultPriority:
+            type: integer
+            description: |
+              The actual value for the default pod priority.
+          imagePullerPriority:
+            type: integer
+            description: |
+              The actual value for the [hook|continuous]-image-puller pods' priority.
+          userPlaceholderPriority:
+            type: integer
+            description: |
+              The actual value for the user-placeholder pods' priority.
+      userPlaceholder:
+        type: object
+        additionalProperties: false
+        description: |
+          User placeholders simulate users but will thanks to PodPriority be
+          evicted by the cluster autoscaler if a real user shows up. In this way
+          placeholders allow you to create a headroom for the real users and
+          reduce the risk of a user having to wait for a node to be added. Be
+          sure to use the the continuous image puller as well along with
+          placeholders, so the images are also available when real users arrive.
+
+          To test your setup efficiently, you can adjust the amount of user
+          placeholders with the following command:
+          ```sh
+          # Configure to have 3 user placeholders
+          kubectl scale sts/user-placeholder --replicas=3
+          ```
+        properties:
+          enabled:
+            type: boolean
+          image: *image-spec
+          revisionHistoryLimit: *revisionHistoryLimit
+          replicas:
+            type: integer
+            description: |
+              How many placeholder pods would you like to have?
+          labels:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Extra labels to add to the userPlaceholder pods.
+
+              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+              to learn more about labels.
+          annotations:
+            type: object
+            additionalProperties: false
+            patternProperties: *labels-and-annotations-patternProperties
+            description: |
+              Extra annotations to add to the placeholder pods.
+          resources:
+            type: object
+            additionalProperties: true
+            description: |
+              Unless specified here, the placeholder pods will request the same
+              resources specified for the real singleuser pods.
+          containerSecurityContext: *containerSecurityContext-spec
+      corePods:
+        type: object
+        additionalProperties: false
+        description: |
+          These settings influence the core pods like the hub, proxy and
+          user-scheduler pods.
+          These settings influence all pods considered core pods, namely:
+
+          - hub
+          - proxy
+          - autohttps
+          - hook-image-awaiter
+          - user-scheduler
+
+          By defaults, the tolerations are:
+
+          - hub.jupyter.org/dedicated=core:NoSchedule
+          - hub.jupyter.org_dedicated=core:NoSchedule
+
+          Note that tolerations set here are combined with the respective
+          components dedicated tolerations, and that `_` is available in case
+          `/` isn't allowed in the clouds tolerations.
+        properties:
+          tolerations: *tolerations-spec
+          nodeAffinity:
+            type: object
+            additionalProperties: false
+            description: |
+              Where should pods be scheduled? Perhaps on nodes with a certain
+              label is preferred or even required?
+            properties:
+              matchNodePurpose:
+                enum: [ignore, prefer, require]
+                description: |
+                  Decide if core pods *ignore*, *prefer* or *require* to
+                  schedule on nodes with this label:
+                  ```
+                  hub.jupyter.org/node-purpose=core
+                  ```
+      userPods:
+        type: object
+        additionalProperties: false
+        description: |
+          These settings influence all pods considered user pods, namely:
+
+          - user-placeholder
+          - hook-image-puller
+          - continuous-image-puller
+          - jupyter-<username>
+
+          By defaults, the tolerations are:
+
+          - hub.jupyter.org/dedicated=core:NoSchedule
+          - hub.jupyter.org_dedicated=core:NoSchedule
+
+          Note that tolerations set here are combined with the respective
+          components dedicated tolerations, and that `_` is available in case
+          `/` isn't allowed in the clouds tolerations.
+        properties:
+          tolerations: *tolerations-spec
+          nodeAffinity:
+            type: object
+            additionalProperties: false
+            description: |
+              Where should pods be scheduled? Perhaps on nodes with a certain
+              label is preferred or even required?
+            properties:
+              matchNodePurpose:
+                enum: [ignore, prefer, require]
+                description: |
+                  Decide if user pods *ignore*, *prefer* or *require* to
+                  schedule on nodes with this label:
+                  ```
+                  hub.jupyter.org/node-purpose=user
+                  ```
+
+  ingress:
+    type: object
+    additionalProperties: false
+    required: [enabled]
+    properties:
+      enabled:
+        type: boolean
+        description: |
+          Enable the creation of a Kubernetes Ingress to proxy-public service.
+
+          See [Advanced Topics — Zero to JupyterHub with Kubernetes
+          0.7.0 documentation](ingress)
+          for more details.
+      annotations:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          Annotations to apply to the Ingress resource.
+
+          See [the Kubernetes
+          documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
+          for more details about annotations.
+      ingressClassName:
+        type: [string, "null"]
+        description: |
+          Maps directly to the Ingress resource's `spec.ingressClassName``.
+
+          See [the Kubernetes
+          documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)
+          for more details.
+      hosts:
+        type: array
+        description: |
+          List of hosts to route requests to the proxy.
+      pathSuffix:
+        type: [string, "null"]
+        description: |
+          Suffix added to Ingress's routing path pattern.
+
+          Specify `*` if your ingress matches path by glob pattern.
+      pathType:
+        enum: [Prefix, Exact, ImplementationSpecific]
+        description: |
+          The path type to use. The default value is 'Prefix'.
+
+          See [the Kubernetes documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/#path-types)
+          for more details about path types.
+      tls:
+        type: array
+        description: |
+          TLS configurations for Ingress.
+
+          See [the Kubernetes
+          documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls)
+          for more details about annotations.
+
+  prePuller:
+    type: object
+    additionalProperties: false
+    required: [hook, continuous]
+    properties:
+      revisionHistoryLimit: *revisionHistoryLimit
+      labels:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          Extra labels to add to the pre puller job pods.
+
+          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
+          to learn more about labels.
+      annotations:
+        type: object
+        additionalProperties: false
+        patternProperties: *labels-and-annotations-patternProperties
+        description: |
+          Annotations to apply to the hook and continous image puller pods. One example use case is to
+          disable istio sidecars which could interfere with the image pulling.
+      resources:
+        type: object
+        additionalProperties: true
+        description: |
+          These are standard Kubernetes resources with requests and limits for
+          cpu and memory. They will be used on the containers in the pods
+          pulling images. These should be set extremely low as the containers
+          shut down directly or is a pause container that just idles.
+
+          They were made configurable as usage of ResourceQuota may require
+          containers in the namespace to have explicit resources set.
+      extraTolerations: *tolerations-spec
+      hook:
+        type: object
+        additionalProperties: false
+        required: [enabled]
+        description: |
+          See the [*optimization
+          section*](pulling-images-before-users-arrive)
+          for more details.
+        properties:
+          enabled:
+            type: boolean
+          pullOnlyOnChanges:
+            type: boolean
+            description: |
+              Pull only if changes have been made to the images to pull, or more
+              accurately if the hook-image-puller daemonset has changed in any
+              way.
+          podSchedulingWaitDuration:
+            description: |
+              The `hook-image-awaiter` has a criteria to await all the
+              `hook-image-puller` DaemonSet's pods to both schedule and finish
+              their image pulling. This flag can be used to relax this criteria
+              to instead only await the pods that _has already scheduled_ to
+              finish image pulling after a certain duration.
+
+              The value of this is that sometimes the newly created
+              `hook-image-puller` pods cannot be scheduled because nodes are
+              full, and then it probably won't make sense to block a `helm
+              upgrade`.
+
+              An infinite duration to wait for pods to schedule can be
+              represented by `-1`. This was the default behavior of version
+              0.9.0 and earlier.
+            type: integer
+          nodeSelector: *nodeSelector-spec
+          tolerations: *tolerations-spec
+          containerSecurityContext: *containerSecurityContext-spec
+          image: *image-spec
+          resources: *resources-spec
+          serviceAccount: *serviceAccount
+      continuous:
+        type: object
+        additionalProperties: false
+        required: [enabled]
+        description: |
+          See the [*optimization
+          section*](pulling-images-before-users-arrive)
+          for more details.
+
+          ```{note}
+          If used with a Cluster Autoscaler (an autoscaling node pool), also add
+          user-placeholders and enable pod priority.
+          ```
+        properties:
+          enabled:
+            type: boolean
+      pullProfileListImages:
+        type: boolean
+        description: |
+          The singleuser.profileList configuration can provide a selection of
+          images. This option determines if all images identified there should
+          be pulled, both by the hook and continuous pullers.
+
+          Images are looked for under `kubespawner_override`, and also
+          `profile_options.choices.kubespawner_override` since version 3.2.0.
+
+          The reason to disable this, is that if you have for example 10 images
+          which start pulling in order from 1 to 10, a user that arrives and
+          wants to start a pod with image number 10 will need to wait for all
+          images to be pulled, and then it may be preferable to just let the
+          user arriving wait for a single image to be pulled on arrival.
+      extraImages:
+        type: object
+        additionalProperties: false
+        description: |
+          See the [*optimization section*](images-that-will-be-pulled) for more
+          details.
+
+          ```yaml
+          prePuller:
+            extraImages:
+              my-extra-image-i-want-pulled:
+                name: jupyter/all-spark-notebook
+                tag: 2343e33dec46
+          ```
+        patternProperties:
+          ".*":
+            type: object
+            additionalProperties: false
+            required: [name, tag]
+            properties:
+              name:
+                type: string
+              tag:
+                type: string
+      containerSecurityContext: *containerSecurityContext-spec
+      pause:
+        type: object
+        additionalProperties: false
+        description: |
+          The image-puller pods rely on initContainer to pull all images, and
+          their actual container when they are done is just running a `pause`
+          container. These are settings for that pause container.
+        properties:
+          containerSecurityContext: *containerSecurityContext-spec
+          image: *image-spec
+
+  custom:
+    type: object
+    additionalProperties: true
+    description: |
+      Additional values to pass to the Hub.
+      JupyterHub will not itself look at these,
+      but you can read values in your own custom config via `hub.extraConfig`.
+      For example:
+
+      ```yaml
+      custom:
+        myHost: "https://example.horse"
+      hub:
+        extraConfig:
+          myConfig.py: |
+            c.MyAuthenticator.host = get_config("custom.myHost")
+      ```
+
+  cull:
+    type: object
+    additionalProperties: false
+    required: [enabled]
+    description: |
+      The
+      [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler)
+      can run as a JupyterHub managed service to _cull_ running servers.
+    properties:
+      enabled:
+        type: boolean
+        description: |
+          Enable/disable use of jupyter-idle-culler.
+      users:
+        type: [boolean, "null"]
+        description: See the `--cull-users` flag.
+      adminUsers:
+        type: [boolean, "null"]
+        description: See the `--cull-admin-users` flag.
+      removeNamedServers:
+        type: [boolean, "null"]
+        description: See the `--remove-named-servers` flag.
+      timeout:
+        type: [integer, "null"]
+        description: See the `--timeout` flag.
+      every:
+        type: [integer, "null"]
+        description: See the `--cull-every` flag.
+      concurrency:
+        type: [integer, "null"]
+        description: See the `--concurrency` flag.
+      maxAge:
+        type: [integer, "null"]
+        description: See the `--max-age` flag.
+
+  debug:
+    type: object
+    additionalProperties: false
+    required: [enabled]
+    properties:
+      enabled:
+        type: boolean
+        description: |
+          Increases the loglevel throughout the resources in the Helm chart.
+
+  rbac:
+    type: object
+    additionalProperties: false
+    required: [create]
+    properties:
+      enabled:
+        type: boolean
+        # This schema entry is needed to help us print a more helpful error
+        # message in NOTES.txt if hub.fsGid is set.
+        #
+        description: |
+          ````{note}
+          Removed in version 2.0.0. If you have been using `rbac.enable=false`
+          (strongly discouraged), then the equivalent configuration would be:
+
+          ```yaml
+          rbac:
+            create: false
+          hub:
+            serviceAccount:
+              create: false
+          proxy:
+            traefik:
+              serviceAccount:
+                create: false
+          scheduling:
+            userScheduler:
+              serviceAccount:
+                create: false
+          prePuller:
+            hook:
+              serviceAccount:
+                create: false
+          ```
+          ````
+      create:
+        type: boolean
+        description: |
+          Decides if (Cluster)Role and (Cluster)RoleBinding resources are
+          created and bound to the configured serviceAccounts.
+
+  global:
+    type: object
+    additionalProperties: true
+    properties:
+      safeToShowValues:
+        type: boolean
+        description: |
+          A flag that should only be set to true temporarily when experiencing a
+          deprecation message that contain censored content that you wish to
+          reveal.
diff --git a/applications/jupyterhub/deploy/values.yaml b/applications/jupyterhub/deploy/values.yaml
index 2f5cbca3..41e108d6 100755
--- a/applications/jupyterhub/deploy/values.yaml
+++ b/applications/jupyterhub/deploy/values.yaml
@@ -1,4 +1,4 @@
-harness:
+harness: # EDIT: CLOUDHARNESS
   subdomain: hub
   service:
     auto: false
@@ -31,6 +31,11 @@ harness:
 fullnameOverride: ""
 nameOverride:
 
+# enabled is ignored by the jupyterhub chart itself, but a chart depending on
+# the jupyterhub chart conditionally can make use this config option as the
+# condition.
+enabled:
+
 # custom can contain anything you want to pass to the hub pod, as all passed
 # Helm template values will be made available there.
 custom: {}
@@ -54,10 +59,11 @@ imagePullSecrets: []
 # ConfigurableHTTPProxy speaks with the actual ConfigurableHTTPProxy server in
 # the proxy pod.
 hub:
+  revisionHistoryLimit:
   config:
     JupyterHub:
       admin_access: true
-      authenticator_class: keycloak
+      authenticator_class: keycloak # EDIT: CLOUDHARNESS
   service:
     type: ClusterIP
     annotations: {}
@@ -68,7 +74,6 @@ hub:
   baseUrl: /
   cookieSecret:
   initContainers: []
-  fsGid: 1000
   nodeSelector: {}
   tolerations: []
   concurrentSpawnLimit: 64
@@ -106,37 +111,38 @@ hub:
   extraVolumes: []
   extraVolumeMounts: []
   image:
-    name: jupyterhub/k8s-hub
-    tag: "1.1.3"
+    name: quay.io/jupyterhub/k8s-hub
+    tag: "3.2.1"
     pullPolicy:
     pullSecrets: []
   resources: {}
+  podSecurityContext:
+    fsGroup: 1000
   containerSecurityContext:
     runAsUser: 1000
     runAsGroup: 1000
     allowPrivilegeEscalation: false
   lifecycle: {}
+  loadRoles: {}
   services: {}
   pdb:
     enabled: false
     maxUnavailable:
     minAvailable: 1
   networkPolicy:
-    enabled: false
+    enabled: true
     ingress: []
-    ## egress for JupyterHub already includes Kubernetes internal DNS and
-    ## access to the proxy, but can be restricted further, but ensure to allow
-    ## access to the Kubernetes API server that couldn't be pinned ahead of
-    ## time.
-    ##
-    ## ref: https://stackoverflow.com/a/59016417/2220152
-    egress:
-      - to:
-          - ipBlock:
-              cidr: 0.0.0.0/0
+    egress: []
+    egressAllowRules:
+      cloudMetadataServer: true
+      dnsPortsCloudMetadataServer: true
+      dnsPortsKubeSystemNamespace: true
+      dnsPortsPrivateIPs: true
+      nonPrivateIPs: true
+      privateIPs: true
     interNamespaceAccessLabels: ignore
     allowedIngressPorts: []
-  allowNamedServers: true
+  allowNamedServers: true # EDIT: CLOUDHARNESS
   namedServerLimitPerUser:
   authenticatePrometheus:
   redirectToServer:
@@ -163,11 +169,13 @@ hub:
     timeoutSeconds: 1
   existingSecret:
   serviceAccount:
+    create: true
+    name:
     annotations: {}
   extraPodSpec: {}
 
 rbac:
-  enabled: true
+  create: true
 
 # proxy relates to the proxy pod, the proxy-public service, and the autohttps
 # pod and proxy-http service.
@@ -202,7 +210,7 @@ proxy:
     rollingUpdate:
   # service relates to the proxy-public service
   service:
-    type: NodePort
+    type: NodePort # EDIT: CLOUDHARNESS
     labels: {}
     annotations: {}
     nodePorts:
@@ -215,13 +223,17 @@ proxy:
   # chp relates to the proxy pod, which is responsible for routing traffic based
   # on dynamic configuration sent from JupyterHub to CHP's REST API.
   chp:
+    revisionHistoryLimit:
     containerSecurityContext:
       runAsUser: 65534 # nobody user
       runAsGroup: 65534 # nobody group
       allowPrivilegeEscalation: false
     image:
-      name: jupyterhub/configurable-http-proxy
-      tag: 4.5.0 # https://github.com/jupyterhub/configurable-http-proxy/releases
+      name: quay.io/jupyterhub/configurable-http-proxy
+      # tag is automatically bumped to new patch versions by the
+      # watch-dependencies.yaml workflow.
+      #
+      tag: "4.6.1" # https://github.com/jupyterhub/configurable-http-proxy/tags
       pullPolicy:
       pullSecrets: []
     extraCommandLineFlags: []
@@ -229,11 +241,14 @@ proxy:
       enabled: true
       initialDelaySeconds: 60
       periodSeconds: 10
+      failureThreshold: 30
+      timeoutSeconds: 3
     readinessProbe:
       enabled: true
       initialDelaySeconds: 0
       periodSeconds: 2
       failureThreshold: 1000
+      timeoutSeconds: 1
     resources: {}
     defaultTarget:
     errorTarget:
@@ -241,12 +256,16 @@ proxy:
     nodeSelector: {}
     tolerations: []
     networkPolicy:
-      enabled: false
+      enabled: true
       ingress: []
-      egress:
-        - to:
-            - ipBlock:
-                cidr: 0.0.0.0/0
+      egress: []
+      egressAllowRules:
+        cloudMetadataServer: true
+        dnsPortsCloudMetadataServer: true
+        dnsPortsKubeSystemNamespace: true
+        dnsPortsPrivateIPs: true
+        nonPrivateIPs: true
+        privateIPs: true
       interNamespaceAccessLabels: ignore
       allowedIngressPorts: [http, https]
     pdb:
@@ -257,13 +276,17 @@ proxy:
   # traefik relates to the autohttps pod, which is responsible for TLS
   # termination when proxy.https.type=letsencrypt.
   traefik:
+    revisionHistoryLimit:
     containerSecurityContext:
       runAsUser: 65534 # nobody user
       runAsGroup: 65534 # nobody group
       allowPrivilegeEscalation: false
     image:
       name: traefik
-      tag: v2.4.11 # ref: https://hub.docker.com/_/traefik?tab=tags
+      # tag is automatically bumped to new patch versions by the
+      # watch-dependencies.yaml workflow.
+      #
+      tag: "v2.10.7" # ref: https://hub.docker.com/_/traefik?tab=tags
       pullPolicy:
       pullSecrets: []
     hsts:
@@ -272,6 +295,7 @@ proxy:
       maxAge: 15724800 # About 6 months
     resources: {}
     labels: {}
+    extraInitContainers: []
     extraEnv: {}
     extraVolumes: []
     extraVolumeMounts: []
@@ -283,10 +307,14 @@ proxy:
     networkPolicy:
       enabled: true
       ingress: []
-      egress:
-        - to:
-            - ipBlock:
-                cidr: 0.0.0.0/0
+      egress: []
+      egressAllowRules:
+        cloudMetadataServer: true
+        dnsPortsCloudMetadataServer: true
+        dnsPortsKubeSystemNamespace: true
+        dnsPortsPrivateIPs: true
+        nonPrivateIPs: true
+        privateIPs: true
       interNamespaceAccessLabels: ignore
       allowedIngressPorts: [http, https]
     pdb:
@@ -294,6 +322,8 @@ proxy:
       maxUnavailable:
       minAvailable: 1
     serviceAccount:
+      create: true
+      name:
       annotations: {}
     extraPodSpec: {}
   secretSync:
@@ -302,8 +332,8 @@ proxy:
       runAsGroup: 65534 # nobody group
       allowPrivilegeEscalation: false
     image:
-      name: jupyterhub/k8s-secret-sync
-      tag: "1.1.3"
+      name: quay.io/jupyterhub/k8s-secret-sync
+      tag: "3.2.1"
       pullPolicy:
       pullSecrets: []
     resources: {}
@@ -342,29 +372,27 @@ singleuser:
     preferred: []
   networkTools:
     image:
-      name: jupyterhub/k8s-network-tools
-      tag: "1.1.3"
+      name: quay.io/jupyterhub/k8s-network-tools
+      tag: "3.2.1"
       pullPolicy:
       pullSecrets: []
+    resources: {}
   cloudMetadata:
     # block set to true will append a privileged initContainer using the
     # iptables to block the sensitive metadata server at the provided ip.
-    blockWithIptables: false
+    blockWithIptables: true
+    ip: 169.254.169.254
   networkPolicy:
-    enabled: false
+    enabled: true
     ingress: []
-    egress:
-      # Required egress to communicate with the hub and DNS servers will be
-      # augmented to these egress rules.
-      #
-      # This default rule explicitly allows all outbound traffic from singleuser
-      # pods, except to a typical IP used to return metadata that can be used by
-      # someone with malicious intent.
-      - to:
-          - ipBlock:
-              cidr: 0.0.0.0/0
-              except:
-                - 169.254.169.254/32
+    egress: []
+    egressAllowRules:
+      cloudMetadataServer: false
+      dnsPortsCloudMetadataServer: true
+      dnsPortsKubeSystemNamespace: true
+      dnsPortsPrivateIPs: true
+      nonPrivateIPs: true
+      privateIPs: false
     interNamespaceAccessLabels: ignore
     allowedIngressPorts: []
   events: true
@@ -376,6 +404,7 @@ singleuser:
   lifecycleHooks: {}
   initContainers: []
   extraContainers: []
+  allowPrivilegeEscalation: false
   uid: 1000
   fsGid: 100
   serviceAccountName:
@@ -387,29 +416,29 @@ singleuser:
     static:
       pvcName:
       subPath: "{username}"
-    capacity: 10Mi
-    homeMountPath: /home/workspace
+    capacity: 10Mi # EDIT: CLOUDHARNESS
+    homeMountPath: /home/workspace # EDIT: CLOUDHARNESS
     dynamic:
       storageClass:
-      pvcNameTemplate: jupyter-{username}
-      volumeNameTemplate: jupyter-{username}
+      pvcNameTemplate: jupyter-{username} # EDIT: CLOUDHARNESS
+      volumeNameTemplate: jupyter-{username} # EDIT: CLOUDHARNESS
       storageAccessModes: [ReadWriteOnce]
   image:
-    name: jupyter/base-notebook
-    tag: "hub-1.4.2"
+    name: quay.io/jupyterhub/k8s-singleuser-sample
+    tag: "3.2.1"
     pullPolicy:
     pullSecrets: []
   startTimeout: 300
   cpu:
-    limit: 0.4
-    guarantee: 0.05
+    limit: 0.4  # EDIT: CLOUDHARNESS
+    guarantee: 0.05  # EDIT: CLOUDHARNESS
   memory:
-    limit: 0.5G
-    guarantee: 0.1G
+    limit: 0.5G # EDIT: CLOUDHARNESS 
+    guarantee: 0.1G # EDIT: CLOUDHARNESS
   extraResource:
     limits: {}
     guarantees: {}
-  cmd: /usr/local/bin/start-singleuser.sh
+  cmd: jupyterhub-singleuser
   defaultUrl:
   extraPodConfig: {}
   profileList: []
@@ -417,74 +446,146 @@ singleuser:
 # scheduling relates to the user-scheduler pods and user-placeholder pods.
 scheduling:
   userScheduler:
-    enabled: false
+    enabled: false # EDIT: CLOUDHARNESS
+    revisionHistoryLimit:
     replicas: 2
     logLevel: 4
+    # plugins are configured on the user-scheduler to make us score how we
+    # schedule user pods in a way to help us schedule on the most busy node. By
+    # doing this, we help scale down more effectively. It isn't obvious how to
+    # enable/disable scoring plugins, and configure them, to accomplish this.
+    #
     # plugins ref: https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins-1
+    # migration ref: https://kubernetes.io/docs/reference/scheduling/config/#scheduler-configuration-migrations
+    #
     plugins:
       score:
+        # These scoring plugins are enabled by default according to
+        # https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins
+        # 2022-02-22.
+        #
+        # Enabled with high priority:
+        # - NodeAffinity
+        # - InterPodAffinity
+        # - NodeResourcesFit
+        # - ImageLocality
+        # Remains enabled with low default priority:
+        # - TaintToleration
+        # - PodTopologySpread
+        # - VolumeBinding
+        # Disabled for scoring:
+        # - NodeResourcesBalancedAllocation
+        #
         disabled:
-          - name: SelectorSpread
-          - name: TaintToleration
-          - name: PodTopologySpread
+          # We disable these plugins (with regards to scoring) to not interfere
+          # or complicate our use of NodeResourcesFit.
           - name: NodeResourcesBalancedAllocation
-          - name: NodeResourcesLeastAllocated
           # Disable plugins to be allowed to enable them again with a different
           # weight and avoid an error.
-          - name: NodePreferAvoidPods
           - name: NodeAffinity
           - name: InterPodAffinity
+          - name: NodeResourcesFit
           - name: ImageLocality
         enabled:
-          - name: NodePreferAvoidPods
-            weight: 161051
           - name: NodeAffinity
             weight: 14631
           - name: InterPodAffinity
             weight: 1331
-          - name: NodeResourcesMostAllocated
+          - name: NodeResourcesFit
             weight: 121
           - name: ImageLocality
             weight: 11
+    pluginConfig:
+      # Here we declare that we should optimize pods to fit based on a
+      # MostAllocated strategy instead of the default LeastAllocated.
+      - name: NodeResourcesFit
+        args:
+          scoringStrategy:
+            resources:
+              - name: cpu
+                weight: 1
+              - name: memory
+                weight: 1
+            type: MostAllocated
     containerSecurityContext:
       runAsUser: 65534 # nobody user
       runAsGroup: 65534 # nobody group
       allowPrivilegeEscalation: false
     image:
       # IMPORTANT: Bumping the minor version of this binary should go hand in
-      #            hand with an inspection of the user-scheduelrs RBAC resources
-      #            that we have forked.
-      name: k8s.gcr.io/kube-scheduler
-      tag: v1.19.13 # ref: https://github.com/kubernetes/website/blob/main/content/en/releases/patch-releases.md
+      #            hand with an inspection of the user-scheduelr's RBAC
+      #            resources that we have forked in
+      #            templates/scheduling/user-scheduler/rbac.yaml.
+      #
+      #            Debugging advice:
+      #
+      #            - Is configuration of kube-scheduler broken in
+      #              templates/scheduling/user-scheduler/configmap.yaml?
+      #
+      #            - Is the kube-scheduler binary's compatibility to work
+      #              against a k8s api-server that is too new or too old?
+      #
+      #            - You can update the GitHub workflow that runs tests to
+      #              include "deploy/user-scheduler" in the k8s namespace report
+      #              and reduce the user-scheduler deployments replicas to 1 in
+      #              dev-config.yaml to get relevant logs from the user-scheduler
+      #              pods. Inspect the "Kubernetes namespace report" action!
+      #
+      #            - Typical failures are that kube-scheduler fails to search for
+      #              resources via its "informers", and won't start trying to
+      #              schedule pods before they succeed which may require
+      #              additional RBAC permissions or that the k8s api-server is
+      #              aware of the resources.
+      #
+      #            - If "successfully acquired lease" can be seen in the logs, it
+      #              is a good sign kube-scheduler is ready to schedule pods.
+      #
+      name: registry.k8s.io/kube-scheduler
+      # tag is automatically bumped to new patch versions by the
+      # watch-dependencies.yaml workflow. The minor version is pinned in the
+      # workflow, and should be updated there if a minor version bump is done
+      # here. We aim to stay around 1 minor version behind the latest k8s
+      # version.
+      #
+      tag: "v1.28.6" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
       pullPolicy:
       pullSecrets: []
     nodeSelector: {}
     tolerations: []
+    labels: {}
+    annotations: {}
     pdb:
       enabled: true
       maxUnavailable: 1
       minAvailable:
     resources: {}
     serviceAccount:
+      create: true
+      name:
       annotations: {}
     extraPodSpec: {}
   podPriority:
     enabled: false
     globalDefault: false
     defaultPriority: 0
+    imagePullerPriority: -5
     userPlaceholderPriority: -10
   userPlaceholder:
     enabled: true
     image:
-      name: k8s.gcr.io/pause
-      # tag's can be updated by inspecting the output of the command:
-      # gcloud container images list-tags k8s.gcr.io/pause --sort-by=~tags
+      name: registry.k8s.io/pause
+      # tag is automatically bumped to new patch versions by the
+      # watch-dependencies.yaml workflow.
       #
       # If you update this, also update prePuller.pause.image.tag
-      tag: "3.5"
+      #
+      tag: "3.9"
       pullPolicy:
       pullSecrets: []
+    revisionHistoryLimit:
     replicas: 0
+    labels: {}
+    annotations: {}
     containerSecurityContext:
       runAsUser: 65534 # nobody user
       runAsGroup: 65534 # nobody group
@@ -517,6 +618,8 @@ scheduling:
 
 # prePuller relates to the hook|continuous-image-puller DaemonsSets
 prePuller:
+  revisionHistoryLimit:
+  labels: {}
   annotations: {}
   resources: {}
   containerSecurityContext:
@@ -530,8 +633,8 @@ prePuller:
     pullOnlyOnChanges: true
     # image and the configuration below relates to the hook-image-awaiter Job
     image:
-      name: jupyterhub/k8s-image-awaiter
-      tag: "1.1.3"
+      name: quay.io/jupyterhub/k8s-image-awaiter
+      tag: "3.2.1"
       pullPolicy:
       pullSecrets: []
     containerSecurityContext:
@@ -543,6 +646,8 @@ prePuller:
     tolerations: []
     resources: {}
     serviceAccount:
+      create: true
+      name:
       annotations: {}
   continuous:
     enabled: true
@@ -554,18 +659,20 @@ prePuller:
       runAsGroup: 65534 # nobody group
       allowPrivilegeEscalation: false
     image:
-      name: k8s.gcr.io/pause
-      # tag's can be updated by inspecting the output of the command:
-      # gcloud container images list-tags k8s.gcr.io/pause --sort-by=~tags
+      name: registry.k8s.io/pause
+      # tag is automatically bumped to new patch versions by the
+      # watch-dependencies.yaml workflow.
       #
       # If you update this, also update scheduling.userPlaceholder.image.tag
-      tag: "3.5"
+      #
+      tag: "3.9"
       pullPolicy:
       pullSecrets: []
 
 ingress:
   enabled: false
   annotations: {}
+  ingressClassName:
   hosts: []
   pathSuffix:
   pathType: Prefix
@@ -581,7 +688,8 @@ ingress:
 cull:
   enabled: true
   users: false # --cull-users
-  removeNamedServers: true # --remove-named-servers
+  adminUsers: true # --cull-admin-users
+  removeNamedServers: true  # EDIT: CLOUDHARNESS
   timeout: 3600 # --timeout
   every: 600 # --cull-every
   concurrency: 10 # --concurrency
diff --git a/applications/jupyterhub/zero-to-jupyterhub-k8s b/applications/jupyterhub/zero-to-jupyterhub-k8s
new file mode 160000
index 00000000..c92c1237
--- /dev/null
+++ b/applications/jupyterhub/zero-to-jupyterhub-k8s
@@ -0,0 +1 @@
+Subproject commit c92c12374795e84f36f5f16c4e8b8a448ad2f230

From cff3c6b7d85b0d6c3f99f3d84222eb6062bd3d85 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Sat, 20 Jan 2024 11:31:34 +0100
Subject: [PATCH 002/210] CH-110 jupyterhub update wip

---
 applications/jupyterhub/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/applications/jupyterhub/README.md b/applications/jupyterhub/README.md
index d961d034..d7d67d4d 100755
--- a/applications/jupyterhub/README.md
+++ b/applications/jupyterhub/README.md
@@ -31,3 +31,13 @@ To support the pre pulling of task images see (https://github.com/MetaCell/cloud
 the template `templates/image-puller/_helpers-daemonset.tpl` has been changed (see line 167 and on)
 
 TODO: remember to implement/revise this code after you have updated/changed the templates of JupyterHub
+
+## How to update
+
+The helm chart is based on the [zero-to-jupyterhub](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/) helm chart.
+
+1. Run update.sh [TAG] # Do not use latest!
+2. Restore from the diff files with EDIT: CLOUDHARNESS
+
+Customize notebook image: quay.io/jupyterhub/k8s-singleuser-sample:[TAG]
+

From 428d83d75b91cb956c6cf758cc87cb5ab4a25efa Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Sat, 20 Jan 2024 11:31:46 +0100
Subject: [PATCH 003/210] CH-110 jupyterhub update wip

---
 applications/jupyterhub/Dockerfile            |   26 +-
 applications/jupyterhub/README.md             |    3 +-
 .../deploy/resources/hub/jupyterhub_config.py |    1 +
 .../jupyterhub/deploy/resources/hub/z2jh.py   |    1 +
 .../deploy/templates/_helpers-auth-rework.tpl |    4 +-
 .../jupyterhub/deploy/templates/_helpers.tpl  |    2 +-
 applications/jupyterhub/update.patch          | 5845 +++++++++++++++++
 applications/jupyterhub/update.sh             |   28 +
 deployment/codefresh-test-local.yaml          |  439 +-
 9 files changed, 6050 insertions(+), 299 deletions(-)
 create mode 100644 applications/jupyterhub/update.patch
 create mode 100644 applications/jupyterhub/update.sh

diff --git a/applications/jupyterhub/Dockerfile b/applications/jupyterhub/Dockerfile
index 8b279adc..907ce672 100755
--- a/applications/jupyterhub/Dockerfile
+++ b/applications/jupyterhub/Dockerfile
@@ -1,31 +1,39 @@
 ARG CLOUDHARNESS_BASE
 FROM $CLOUDHARNESS_BASE as base
 
-FROM jupyterhub/k8s-hub:1.1.3
+FROM quay.io/jupyterhub/k8s-hub:3.2.1
 USER root
 
 
 COPY --from=base  libraries/models/requirements.txt /libraries/models/requirements.txt
-RUN pip install -r /libraries/models/requirements.txt
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+    pip install -r /libraries/models/requirements.txt
 COPY --from=base  libraries/cloudharness-common/requirements.txt /libraries/cloudharness-common/requirements.txt
-RUN pip install -r /libraries/cloudharness-common/requirements.txt
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+    pip install -r /libraries/cloudharness-common/requirements.txt
 COPY --from=base  libraries/client/cloudharness_cli/requirements.txt /libraries/client/cloudharness_cli/requirements.txt
-RUN pip install -r /libraries/client/cloudharness_cli/requirements.txt
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+    pip install -r /libraries/client/cloudharness_cli/requirements.txt
 
 COPY --from=base  libraries/models /libraries/models
-RUN pip install -e /libraries/models
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+   pip install -e /libraries/models
 
 COPY --from=base  libraries/cloudharness-common /libraries/cloudharness-common
 COPY --from=base  libraries/client/cloudharness_cli /libraries/client/cloudharness_cli
 
 #
 
-RUN pip install -e /libraries/cloudharness-common
-RUN pip install -e /libraries/client/cloudharness_cli
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+   pip install -e /libraries/cloudharness-common
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+   pip install -e /libraries/client/cloudharness_cli
 
 
 COPY src src
-RUN pip install ./src/harness_jupyter
-RUN pip install ./src/chauthenticator
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+    pip install ./src/harness_jupyter
+RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
+    pip install ./src/chauthenticator
 
 USER jovyan
diff --git a/applications/jupyterhub/README.md b/applications/jupyterhub/README.md
index d7d67d4d..9ad78d2f 100755
--- a/applications/jupyterhub/README.md
+++ b/applications/jupyterhub/README.md
@@ -37,7 +37,8 @@ TODO: remember to implement/revise this code after you have updated/changed the
 The helm chart is based on the [zero-to-jupyterhub](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/) helm chart.
 
 1. Run update.sh [TAG] # Do not use latest!
-2. Restore from the diff files with EDIT: CLOUDHARNESS
+2. Restore from the diff files with EDIT: CLOUDHARNESS. Use update.patch as a reference
+3. 3. Update Dockerfile to use the same base image you see on values.yaml: hub/image
 
 Customize notebook image: quay.io/jupyterhub/k8s-singleuser-sample:[TAG]
 
diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
index 8ec801ee..5ebe20b5 100755
--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
@@ -537,6 +537,7 @@ def camelCaseify(s):
     c.Authenticator.auto_login = True
     c.OAuthenticator.client_id = client_id
     c.OAuthenticator.client_secret = client_secret
+    c.OAuthenticator.allow_all = True
 
     c.GenericOAuthenticator.login_service = "CH"
     c.GenericOAuthenticator.username_key = "email"
diff --git a/applications/jupyterhub/deploy/resources/hub/z2jh.py b/applications/jupyterhub/deploy/resources/hub/z2jh.py
index fc368f64..2fe0d25b 100755
--- a/applications/jupyterhub/deploy/resources/hub/z2jh.py
+++ b/applications/jupyterhub/deploy/resources/hub/z2jh.py
@@ -119,6 +119,7 @@ def get_config(key, default=None):
             value = value[level]
 
     # EDIT: CLOUDHARNESS START
+    import re
     if value and isinstance(value, str):
         replace_var = re.search("{{.*?}}",  value)
         if replace_var:
diff --git a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
index 3159d103..e9d2b4f4 100644
--- a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
+++ b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
@@ -178,7 +178,7 @@ ldap.dn.user.useLookupName: LDAPAuthenticator.use_lookup_dn_username
         representing the old z2jh config, output the result
         in $c.
     */}}
-    {{- include "jupyterhub.authDep.remapOldToNew.mappable" (list $c .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub. }}
+    {{- include "jupyterhub.authDep.remapOldToNew.mappable" (list $c .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub) }}
 
     {{- $class_old_config_key := .Values.apps.jupyterhub.apps.jupyterhub.auth.type | default "" }}  {{- /* ldap                                - github */}}
     {{- $class_new_entrypoint := "" }}                              {{- /* ldapauthenticator.LDAPAuthenticator - github */}}
@@ -191,7 +191,7 @@ ldap.dn.user.useLookupName: LDAPAuthenticator.use_lookup_dn_username
         {{- /* UPDATE c dict explicitly with auth.custom.config */}}
         {{- if .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.config }}
             {{- $custom_config := merge (dict) .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.config }}
-            {{- if not .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub.}}
+            {{- if not .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub }}
                 {{- range $key, $val := $custom_config }}
                     {{- $_ := set $custom_config $key "***" }}
                 {{- end }}
diff --git a/applications/jupyterhub/deploy/templates/_helpers.tpl b/applications/jupyterhub/deploy/templates/_helpers.tpl
index a2023639..1737f3d6 100755
--- a/applications/jupyterhub/deploy/templates/_helpers.tpl
+++ b/applications/jupyterhub/deploy/templates/_helpers.tpl
@@ -194,7 +194,7 @@ component: {{ include "jupyterhub.componentLabel" . }}
                 using "toYaml | fromYaml" in order to be able to use normal helm
                 template functions on it.
     */}}
-    {{- $jupyterhub_values := .root.Values.apps.jupyterhub.}}
+    {{- $jupyterhub_values := .root.Values.apps.jupyterhub }}
     {{- if ne .root.Chart.Name "jupyterhub" }}
         {{- if .root.Values.apps.jupyterhub.jupyterhub }}
             {{- $jupyterhub_values = .root.Values.apps.jupyterhub.jupyterhub }}
diff --git a/applications/jupyterhub/update.patch b/applications/jupyterhub/update.patch
new file mode 100644
index 00000000..5241525b
--- /dev/null
+++ b/applications/jupyterhub/update.patch
@@ -0,0 +1,5845 @@
+diff --git a/applications/jupyterhub/README.md b/applications/jupyterhub/README.md
+index d961d03..d7d67d4 100755
+--- a/applications/jupyterhub/README.md
++++ b/applications/jupyterhub/README.md
+@@ -31,3 +31,13 @@ To support the pre pulling of task images see (https://github.com/MetaCell/cloud
+ the template `templates/image-puller/_helpers-daemonset.tpl` has been changed (see line 167 and on)
+ 
+ TODO: remember to implement/revise this code after you have updated/changed the templates of JupyterHub
++
++## How to update
++
++The helm chart is based on the [zero-to-jupyterhub](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/) helm chart.
++
++1. Run update.sh [TAG] # Do not use latest!
++2. Restore from the diff files with EDIT: CLOUDHARNESS
++
++Customize notebook image: quay.io/jupyterhub/k8s-singleuser-sample:[TAG]
++
+diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+index d4b3cee..8ec801e 100755
+--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
++++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+@@ -1,9 +1,17 @@
++# load the config object (satisfies linters)
++c = get_config()  # noqa
++
++import glob
+ import os
+ import re
+ import sys
+-import logging
+ 
++from jupyterhub.utils import url_path_join
++from kubernetes_asyncio import client
+ from tornado.httpclient import AsyncHTTPClient
++
++#CLOUDHARNESS: EDIT START
++import logging
+ from kubernetes import client
+ from jupyterhub.utils import url_path_join
+ 
+@@ -12,7 +20,7 @@ try:
+     harness_hub() # activates harness hooks on jupyterhub
+ except Exception as e:
+     logging.error("could not import harness_jupyter", exc_info=True)
+-
++# CLOUDHARNESS: EDIT END
+ 
+ # Make sure that modules placed in the same directory as the jupyterhub config are added to the pythonpath
+ configuration_directory = os.path.dirname(os.path.realpath(__file__))
+@@ -20,39 +28,13 @@ sys.path.insert(0, configuration_directory)
+ 
+ from z2jh import (
+     get_config,
+-    set_config_if_not_none,
+     get_name,
+     get_name_env,
+     get_secret_value,
++    set_config_if_not_none,
+ )
+ 
+ 
+-print('Base url is', c.JupyterHub.get('base_url', '/'))
+-
+-# Configure JupyterHub to use the curl backend for making HTTP requests,
+-# rather than the pure-python implementations. The default one starts
+-# being too slow to make a large number of requests to the proxy API
+-# at the rate required.
+-AsyncHTTPClient.configure("tornado.curl_httpclient.CurlAsyncHTTPClient")
+-
+-c.JupyterHub.spawner_class = 'kubespawner.KubeSpawner'
+-
+-# Connect to a proxy running in a different pod
+-c.ConfigurableHTTPProxy.api_url = 'http://{}:{}'.format(os.environ['PROXY_API_SERVICE_HOST'], int(os.environ['PROXY_API_SERVICE_PORT']))
+-c.ConfigurableHTTPProxy.should_start = False
+-
+-# Do not shut down user pods when hub is restarted
+-c.JupyterHub.cleanup_servers = False
+-
+-# Check that the proxy has routes appropriately setup
+-c.JupyterHub.last_activity_interval = 60
+-
+-# Don't wait at all before redirecting a spawning user to the progress page
+-c.JupyterHub.tornado_settings = {
+-    'slow_spawn_timeout': 0,
+-}
+-
+-
+ def camelCaseify(s):
+     """convert snake_case to camelCase
+ 
+@@ -173,6 +155,7 @@ for trait, cfg_key in (
+     ("events_enabled", "events"),
+     ("extra_labels", None),
+     ("extra_annotations", None),
++    # ("allow_privilege_escalation", None), # Managed manually below
+     ("uid", None),
+     ("fs_gid", None),
+     ("service_account", "serviceAccountName"),
+@@ -206,10 +189,19 @@ image = get_config("singleuser.image.name")
+ if image:
+     tag = get_config("singleuser.image.tag")
+     if tag:
+-        image = "{}:{}".format(image, tag)
++        image = f"{image}:{tag}"
+ 
+     c.KubeSpawner.image = image
+ 
++# allow_privilege_escalation defaults to False in KubeSpawner 2+. Since its a
++# property where None, False, and True all are valid values that users of the
++# Helm chart may want to set, we can't use the set_config_if_not_none helper
++# function as someone may want to override the default False value to None.
++#
++c.KubeSpawner.allow_privilege_escalation = get_config(
++    "singleuser.allowPrivilegeEscalation"
++)
++
+ # Combine imagePullSecret.create (single), imagePullSecrets (list), and
+ # singleuser.image.pullSecrets (list).
+ image_pull_secrets = []
+@@ -255,7 +247,7 @@ if match_node_purpose:
+         pass
+     else:
+         raise ValueError(
+-            "Unrecognized value for matchNodePurpose: %r" % match_node_purpose
++            f"Unrecognized value for matchNodePurpose: {match_node_purpose}"
+         )
+ 
+ # Combine the common tolerations for user pods with singleuser tolerations
+@@ -271,7 +263,7 @@ if storage_type == "dynamic":
+     pvc_name_template = get_config("singleuser.storage.dynamic.pvcNameTemplate")
+     c.KubeSpawner.pvc_name_template = pvc_name_template
+     volume_name_template = get_config("singleuser.storage.dynamic.volumeNameTemplate")
+-    c.KubeSpawner.storage_pvc_ensure = False
++    c.KubeSpawner.storage_pvc_ensure = True
+     set_config_if_not_none(
+         c.KubeSpawner, "storage_class", "singleuser.storage.dynamic.storageClass"
+     )
+@@ -354,41 +346,62 @@ c.KubeSpawner.volume_mounts.extend(
+ )
+ 
+ c.JupyterHub.services = []
++c.JupyterHub.load_roles = []
+ 
++# jupyterhub-idle-culler's permissions are scoped to what it needs only, see
++# https://github.com/jupyterhub/jupyterhub-idle-culler#permissions.
++#
+ if get_config("cull.enabled", False):
++    jupyterhub_idle_culler_role = {
++        "name": "jupyterhub-idle-culler",
++        "scopes": [
++            "list:users",
++            "read:users:activity",
++            "read:servers",
++            "delete:servers",
++            # "admin:users", # dynamically added if --cull-users is passed
++        ],
++        # assign the role to a jupyterhub service, so it gains these permissions
++        "services": ["jupyterhub-idle-culler"],
++    }
++
+     cull_cmd = ["python3", "-m", "jupyterhub_idle_culler"]
+     base_url = c.JupyterHub.get("base_url", "/")
+     cull_cmd.append("--url=http://localhost:8081" + url_path_join(base_url, "hub/api"))
+ 
+     cull_timeout = get_config("cull.timeout")
+     if cull_timeout:
+-        cull_cmd.append("--timeout=%s" % cull_timeout)
++        cull_cmd.append(f"--timeout={cull_timeout}")
+ 
+     cull_every = get_config("cull.every")
+     if cull_every:
+-        cull_cmd.append("--cull-every=%s" % cull_every)
++        cull_cmd.append(f"--cull-every={cull_every}")
+ 
+     cull_concurrency = get_config("cull.concurrency")
+     if cull_concurrency:
+-        cull_cmd.append("--concurrency=%s" % cull_concurrency)
++        cull_cmd.append(f"--concurrency={cull_concurrency}")
+ 
+     if get_config("cull.users"):
+         cull_cmd.append("--cull-users")
++        jupyterhub_idle_culler_role["scopes"].append("admin:users")
++
++    if not get_config("cull.adminUsers"):
++        cull_cmd.append("--cull-admin-users=false")
+ 
+     if get_config("cull.removeNamedServers"):
+         cull_cmd.append("--remove-named-servers")
+ 
+     cull_max_age = get_config("cull.maxAge")
+     if cull_max_age:
+-        cull_cmd.append("--max-age=%s" % cull_max_age)
++        cull_cmd.append(f"--max-age={cull_max_age}")
+ 
+     c.JupyterHub.services.append(
+         {
+-            "name": "cull-idle",
+-            "admin": True,
++            "name": "jupyterhub-idle-culler",
+             "command": cull_cmd,
+         }
+     )
++    c.JupyterHub.load_roles.append(jupyterhub_idle_culler_role)
+ 
+ for key, service in get_config("hub.services", {}).items():
+     # c.JupyterHub.services is a list of dicts, but
+@@ -402,26 +415,44 @@ for key, service in get_config("hub.services", {}).items():
+ 
+     c.JupyterHub.services.append(service)
+ 
++for key, role in get_config("hub.loadRoles", {}).items():
++    # c.JupyterHub.load_roles is a list of dicts, but
++    # hub.loadRoles is a dict of dicts to make the config mergable
++    role.setdefault("name", key)
++
++    c.JupyterHub.load_roles.append(role)
++
++# respect explicit null command (distinct from unspecified)
++# this avoids relying on KubeSpawner.cmd's default being None
++_unspecified = object()
++specified_cmd = get_config("singleuser.cmd", _unspecified)
++if specified_cmd is not _unspecified:
++    c.Spawner.cmd = specified_cmd
+ 
+-set_config_if_not_none(c.Spawner, "cmd", "singleuser.cmd")
+ set_config_if_not_none(c.Spawner, "default_url", "singleuser.defaultUrl")
+ 
+-cloud_metadata = get_config("singleuser.cloudMetadata", {})
++cloud_metadata = get_config("singleuser.cloudMetadata")
+ 
+ if cloud_metadata.get("blockWithIptables") == True:
+     # Use iptables to block access to cloud metadata by default
+     network_tools_image_name = get_config("singleuser.networkTools.image.name")
+     network_tools_image_tag = get_config("singleuser.networkTools.image.tag")
++    network_tools_resources = get_config("singleuser.networkTools.resources")
++    ip = cloud_metadata["ip"]
+     ip_block_container = client.V1Container(
+         name="block-cloud-metadata",
+         image=f"{network_tools_image_name}:{network_tools_image_tag}",
+         command=[
+             "iptables",
+-            "-A",
++            "--append",
+             "OUTPUT",
+-            "-d",
+-            cloud_metadata.get("ip", "169.254.169.254"),
+-            "-j",
++            "--protocol",
++            "tcp",
++            "--destination",
++            ip,
++            "--destination-port",
++            "80",
++            "--jump",
+             "DROP",
+         ],
+         security_context=client.V1SecurityContext(
+@@ -429,6 +460,7 @@ if cloud_metadata.get("blockWithIptables") == True:
+             run_as_user=0,
+             capabilities=client.V1Capabilities(add=["NET_ADMIN"]),
+         ),
++        resources=network_tools_resources,
+     )
+ 
+     c.KubeSpawner.init_containers.append(ip_block_container)
+@@ -438,17 +470,6 @@ if get_config("debug.enabled", False):
+     c.JupyterHub.log_level = "DEBUG"
+     c.Spawner.debug = True
+ 
+-# load /usr/local/etc/jupyterhub/jupyterhub_config.d config files
+-config_dir = "/usr/local/etc/jupyterhub/jupyterhub_config.d"
+-if os.path.isdir(config_dir):
+-    for file_path in sorted(glob.glob(f"{config_dir}/*.py")):
+-        file_name = os.path.basename(file_path)
+-        print(f"Loading {config_dir} config: {file_name}")
+-        with open(file_path) as f:
+-            file_content = f.read()
+-        # compiling makes debugging easier: https://stackoverflow.com/a/437857
+-        exec(compile(source=file_content, filename=file_name, mode="exec"))
+-
+ # load potentially seeded secrets
+ #
+ # NOTE: ConfigurableHTTPProxy.auth_token is set through an environment variable
+@@ -471,11 +492,23 @@ for app, cfg in get_config("hub.config", {}).items():
+         cfg.pop("keys", None)
+     c[app].update(cfg)
+ 
++# load /usr/local/etc/jupyterhub/jupyterhub_config.d config files
++config_dir = "/usr/local/etc/jupyterhub/jupyterhub_config.d"
++if os.path.isdir(config_dir):
++    for file_path in sorted(glob.glob(f"{config_dir}/*.py")):
++        file_name = os.path.basename(file_path)
++        print(f"Loading {config_dir} config: {file_name}")
++        with open(file_path) as f:
++            file_content = f.read()
++        # compiling makes debugging easier: https://stackoverflow.com/a/437857
++        exec(compile(source=file_content, filename=file_name, mode="exec"))
++
+ # execute hub.extraConfig entries
+ for key, config_py in sorted(get_config("hub.extraConfig", {}).items()):
+-    print("Loading extra config: %s" % key)
++    print(f"Loading extra config: {key}")
+     exec(config_py)
+ 
++# CLOUDHARNESS: EDIT START
+ # Allow switching authenticators easily
+ auth_type = get_config('hub.config.JupyterHub.authenticator_class')
+ email_domain = 'local'
+@@ -525,4 +558,5 @@ set_config_if_not_none(c.Authenticator, 'whitelist', 'auth.whitelist.users')
+ c.apps = get_config('apps')
+ c.registry = get_config('registry')
+ c.domain = get_config('root.domain')
+-c.namespace = get_config('root.namespace')
+\ No newline at end of file
++c.namespace = get_config('root.namespace')
++# CLOUDHARNESS: EDIT END
+\ No newline at end of file
+diff --git a/applications/jupyterhub/deploy/resources/hub/z2jh.py b/applications/jupyterhub/deploy/resources/hub/z2jh.py
+index 834a6b6..fc368f6 100755
+--- a/applications/jupyterhub/deploy/resources/hub/z2jh.py
++++ b/applications/jupyterhub/deploy/resources/hub/z2jh.py
+@@ -3,15 +3,15 @@ Utility methods for use in jupyterhub_config.py and dynamic subconfigs.
+ 
+ Methods here can be imported by extraConfig in values.yaml
+ """
+-from collections import Mapping
+-from functools import lru_cache
+ import os
+-import re
++from collections.abc import Mapping
++from functools import lru_cache
+ 
+ import yaml
+ 
++
+ # memoize so we only load config once
+-@lru_cache()
++@lru_cache
+ def _load_config():
+     """Load the Helm chart configuration used to render the Helm templates of
+     the chart from a mounted k8s Secret, and merge in values from an optionally
+@@ -27,6 +27,7 @@ def _load_config():
+             cfg = _merge_dictionaries(cfg, values)
+         else:
+             print(f"No config at {path}")
++    # EDIT: CLOUDHARNESS START
+     path = f"/opt/cloudharness/resources/allvalues.yaml"
+     if os.path.exists(path):
+         print("Loading global CloudHarness config at", path)
+@@ -34,11 +35,11 @@ def _load_config():
+             values = yaml.safe_load(f)
+         cfg = _merge_dictionaries(cfg, values)
+         cfg['root'] = values
+-
++    # EDIT: CLOUDHARNESS END
+     return cfg
+ 
+ 
+-@lru_cache()
++@lru_cache
+ def _get_config_value(key):
+     """Load value from the k8s ConfigMap given a key."""
+ 
+@@ -50,7 +51,7 @@ def _get_config_value(key):
+         raise Exception(f"{path} not found!")
+ 
+ 
+-@lru_cache()
++@lru_cache
+ def get_secret_value(key, default="never-explicitly-set"):
+     """Load value from the user managed k8s Secret or the default k8s Secret
+     given a key."""
+@@ -117,7 +118,7 @@ def get_config(key, default=None):
+         else:
+             value = value[level]
+ 
+-    
++    # EDIT: CLOUDHARNESS START
+     if value and isinstance(value, str):
+         replace_var = re.search("{{.*?}}",  value)
+         if replace_var:
+@@ -128,6 +129,7 @@ def get_config(key, default=None):
+             if repl:
+                 print("replace", variable, "in", value, ":", repl)
+                 value = re.sub("{{.*?}}", repl, value)
++    # EDIT: CLOUDHARNESS END
+     return value
+ 
+ 
+@@ -137,6 +139,5 @@ def set_config_if_not_none(cparent, name, key):
+     configuration item if not None
+     """
+     data = get_config(key)
+-    
+     if data is not None:
+-        setattr(cparent, name, data)
+\ No newline at end of file
++        setattr(cparent, name, data)
+diff --git a/applications/jupyterhub/deploy/templates/NOTES.txt b/applications/jupyterhub/deploy/templates/NOTES.txt
+new file mode 100644
+index 0000000..9769a9c
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/NOTES.txt
+@@ -0,0 +1,158 @@
++{{- $proxy_service := include "jupyterhub.proxy-public.fullname" . -}}
++
++{{- /* Generated with https://patorjk.com/software/taag/#p=display&h=0&f=Slant&t=JupyterHub */}}
++.      __                          __                  __  __          __
++      / / __  __  ____    __  __  / /_  ___    _____  / / / / __  __  / /_
++ __  / / / / / / / __ \  / / / / / __/ / _ \  / ___/ / /_/ / / / / / / __ \
++/ /_/ / / /_/ / / /_/ / / /_/ / / /_  /  __/ / /    / __  / / /_/ / / /_/ /
++\____/  \__,_/ / .___/  \__, /  \__/  \___/ /_/    /_/ /_/  \__,_/ /_.___/
++              /_/      /____/
++
++       You have successfully installed the official JupyterHub Helm chart!
++
++### Installation info
++
++  - Kubernetes namespace: {{ .Release.Namespace }}
++  - Helm release name:    {{ .Release.Name }}
++  - Helm chart version:   {{ .Chart.Version }}
++  - JupyterHub version:   {{ .Chart.AppVersion }}
++  - Hub pod packages:     See https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/{{ include "jupyterhub.chart-version-to-git-ref" .Chart.Version }}/images/hub/requirements.txt
++
++### Followup links
++
++  - Documentation:  https://z2jh.jupyter.org
++  - Help forum:     https://discourse.jupyter.org
++  - Social chat:    https://gitter.im/jupyterhub/jupyterhub
++  - Issue tracking: https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues
++
++### Post-installation checklist
++
++  - Verify that created Pods enter a Running state:
++
++      kubectl --namespace={{ .Release.Namespace }} get pod
++
++    If a pod is stuck with a Pending or ContainerCreating status, diagnose with:
++
++      kubectl --namespace={{ .Release.Namespace }} describe pod <name of pod>
++
++    If a pod keeps restarting, diagnose with:
++
++      kubectl --namespace={{ .Release.Namespace }} logs --previous <name of pod>
++  {{- println }}
++
++  {{- if eq .Values.apps.jupyterhub.proxy.service.type "LoadBalancer" }}
++  - Verify an external IP is provided for the k8s Service {{ $proxy_service }}.
++
++      kubectl --namespace={{ .Release.Namespace }} get service {{ $proxy_service }}
++
++    If the external ip remains <pending>, diagnose with:
++
++      kubectl --namespace={{ .Release.Namespace }} describe service {{ $proxy_service }}
++  {{- end }}
++
++  - Verify web based access:
++  {{- println }}
++  {{- if .Values.apps.jupyterhub.ingress.enabled }}
++    {{- range $host := .Values.apps.jupyterhub.ingress.hosts }}
++    Try insecure HTTP access: http://{{ $host }}{{ $.Values.apps.jupyterhub.hub.baseUrl | trimSuffix "/" }}/
++    {{- end }}
++
++    {{- range $tls := .Values.apps.jupyterhub.ingress.tls }}
++    {{- range $host := $tls.hosts }}
++    Try secure HTTPS access: https://{{ $host }}{{ $.Values.apps.jupyterhub.hub.baseUrl | trimSuffix "/" }}/
++    {{- end }}
++    {{- end }}
++  {{- else }}
++    You have not configured a k8s Ingress resource so you need to access the k8s
++    Service {{ $proxy_service }} directly.
++    {{- println }}
++
++    {{- if eq .Values.apps.jupyterhub.proxy.service.type "NodePort" }}
++    The k8s Service {{ $proxy_service }} is exposed via NodePorts. That means
++    that all the k8s cluster's nodes are exposing the k8s Service via those
++    ports.
++
++    Try insecure HTTP access: http://<any k8s nodes ip>:{{ .Values.apps.jupyterhub.proxy.service.nodePorts.http | default "no-http-nodeport-set"}}
++    Try secure HTTPS access: https://<any k8s nodes address>:{{ .Values.apps.jupyterhub.proxy.service.nodePorts.https | default "no-https-nodeport-set" }}
++
++    {{- else }}
++    If your computer is outside the k8s cluster, you can port-forward traffic to
++    the k8s Service {{ $proxy_service }} with kubectl to access it from your
++    computer.
++
++      kubectl --namespace={{ .Release.Namespace }} port-forward service/{{ $proxy_service }} 8080:http
++
++    Try insecure HTTP access: http://localhost:8080
++    {{- end }}
++  {{- end }}
++  {{- println }}
++
++
++
++
++
++{{- /*
++  Warnings for likely misconfigurations
++*/}}
++
++{{- if and (not .Values.apps.jupyterhub.scheduling.podPriority.enabled) (and .Values.apps.jupyterhub.scheduling.userPlaceholder.enabled .Values.apps.jupyterhub.scheduling.userPlaceholder.replicas) }}
++#################################################################################
++######   WARNING: You are using user placeholders without pod priority      #####
++######            enabled*, either enable pod priority or stop using the    #####
++######            user placeholders** to avoid having placeholders that     #####
++######            refuse to make room for a real user.                      #####
++######                                                                      #####
++######            *scheduling.podPriority.enabled                           #####
++######            **scheduling.userPlaceholder.enabled                      #####
++######            **scheduling.userPlaceholder.replicas                     #####
++#################################################################################
++{{- println }}
++{{- end }}
++
++
++
++
++
++{{- /*
++  Breaking changes and failures for likely misconfigurations.
++*/}}
++
++{{- $breaking := "" }}
++{{- $breaking_title := "\n" }}
++{{- $breaking_title = print $breaking_title "\n#################################################################################" }}
++{{- $breaking_title = print $breaking_title "\n######   BREAKING: The config values passed contained no longer accepted    #####" }}
++{{- $breaking_title = print $breaking_title "\n######             options. See the messages below for more details.        #####" }}
++{{- $breaking_title = print $breaking_title "\n######                                                                      #####" }}
++{{- $breaking_title = print $breaking_title "\n######             To verify your updated config is accepted, you can use   #####" }}
++{{- $breaking_title = print $breaking_title "\n######             the `helm template` command.                             #####" }}
++{{- $breaking_title = print $breaking_title "\n#################################################################################" }}
++
++
++{{- /*
++  This is an example (in a helm template comment) on how to detect and
++  communicate with regards to a breaking chart config change.
++
++  {{- if hasKey .Values.apps.jupyterhub.singleuser.cloudMetadata "enabled" }}
++  {{- $breaking = print $breaking "\n\nCHANGED: singleuser.cloudMetadata.enabled must as of 1.0.0 be configured using singleuser.cloudMetadata.blockWithIptables with the opposite value." }}
++  {{- end }}
++*/}}
++
++
++{{- if hasKey .Values.apps.jupyterhub.rbac "enabled" }}
++{{- $breaking = print $breaking "\n\nCHANGED: rbac.enabled must as of version 2.0.0 be configured via rbac.create and <hub|proxy.traefik|scheduling.userScheduler|prePuller.hook>.serviceAccount.create." }}
++{{- end }}
++
++
++{{- if hasKey .Values.apps.jupyterhub.hub "fsGid" }}
++{{- $breaking = print $breaking "\n\nCHANGED: hub.fsGid must as of version 2.0.0 be configured via hub.podSecurityContext.fsGroup." }}
++{{- end }}
++
++
++{{- if and .Values.apps.jupyterhub.singleuser.cloudMetadata.blockWithIptables (and .Values.apps.jupyterhub.singleuser.networkPolicy.enabled .Values.apps.jupyterhub.singleuser.networkPolicy.egressAllowRules.cloudMetadataServer) }}
++{{- $breaking = print $breaking "\n\nCHANGED: singleuser.cloudMetadata.blockWithIptables must as of version 3.0.0 not be configured together with singleuser.networkPolicy.egressAllowRules.cloudMetadataServer as it leads to an ambiguous configuration." }}
++{{- end }}
++
++
++{{- if $breaking }}
++{{- fail (print $breaking_title $breaking "\n\n") }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
+index b742a12..3159d10 100644
+--- a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
++++ b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
+@@ -168,30 +168,30 @@ ldap.dn.user.useLookupName: LDAPAuthenticator.use_lookup_dn_username
+     {{- $c := dict }}
+     {{- $result := (dict "hub" (dict "config" $c)) }}
+     {{- /*
+-        Flattens the config in .Values.apps.jupyterhub.auth to a format of
++        Flattens the config in .Values.apps.jupyterhub.apps.jupyterhub.auth to a format of
+         "keyX.keyY...": "value". Writes output to $c.
+     */}}
+-    {{- include "jupyterhub.flattenDict" (list $c (omit .Values.apps.jupyterhub.auth "type" "custom")) }}
++    {{- include "jupyterhub.flattenDict" (list $c (omit .Values.apps.jupyterhub.apps.jupyterhub.auth "type" "custom")) }}
+ 
+     {{- /*
+         Transform the flattened config using a dictionary
+         representing the old z2jh config, output the result
+         in $c.
+     */}}
+-    {{- include "jupyterhub.authDep.remapOldToNew.mappable" (list $c .Values.apps.jupyterhub.global.safeToShowValues) }}
++    {{- include "jupyterhub.authDep.remapOldToNew.mappable" (list $c .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub. }}
+ 
+-    {{- $class_old_config_key := .Values.apps.jupyterhub.auth.type | default "" }}  {{- /* ldap                                - github */}}
++    {{- $class_old_config_key := .Values.apps.jupyterhub.apps.jupyterhub.auth.type | default "" }}  {{- /* ldap                                - github */}}
+     {{- $class_new_entrypoint := "" }}                              {{- /* ldapauthenticator.LDAPAuthenticator - github */}}
+     {{- $class_new_config_key := "" }}                              {{- /* LDAPAuthenticator                   - GitHubOAuthenticator */}}
+ 
+     {{- /* SET $class_new_entrypoint, $class_new_config_key */}}
+     {{- if eq $class_old_config_key "custom" }}
+-        {{- $class_new_entrypoint = .Values.apps.jupyterhub.auth.custom.className | default "custom.className wasn't configured!" }}
++        {{- $class_new_entrypoint = .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.className | default "custom.className wasn't configured!" }}
+         {{- $class_new_config_key = $class_new_entrypoint | splitList "." | last }}
+         {{- /* UPDATE c dict explicitly with auth.custom.config */}}
+-        {{- if .Values.apps.jupyterhub.auth.custom.config }}
+-            {{- $custom_config := merge (dict) .Values.apps.jupyterhub.auth.custom.config }}
+-            {{- if not .Values.apps.jupyterhub.global.safeToShowValues }}
++        {{- if .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.config }}
++            {{- $custom_config := merge (dict) .Values.apps.jupyterhub.apps.jupyterhub.auth.custom.config }}
++            {{- if not .Values.apps.jupyterhub.apps.jupyterhub.global.safeToSho.Values.apps.jupyterhub.}}
+                 {{- range $key, $val := $custom_config }}
+                     {{- $_ := set $custom_config $key "***" }}
+                 {{- end }}
+@@ -213,7 +213,7 @@ The JupyterHub Helm chart's auth config has been reworked and requires changes.
+ 
+ The new way to configure authentication in chart version 0.11.0+ is printed
+ below for your convenience. The values are not shown by default to ensure no
+-secrets are exposed, run helm upgrade with --set global.safeToShowValues=true
++secrets are exposed, run helm upgrade with --set global.safeToSho.Values.apps.jupyterhub.true
+ to show them.
+ 
+ {{ $result | toYaml }}
+diff --git a/applications/jupyterhub/deploy/templates/_helpers-names.tpl b/applications/jupyterhub/deploy/templates/_helpers-names.tpl
+index e9cf7bb..401d601 100644
+--- a/applications/jupyterhub/deploy/templates/_helpers-names.tpl
++++ b/applications/jupyterhub/deploy/templates/_helpers-names.tpl
+@@ -3,8 +3,8 @@
+     parent charts to reference these dynamic resource names.
+ 
+     To avoid duplicating documentation, for more information, please see the the
+-    fullnameOverride entry in schema.yaml or the configuration reference that
+-    schema.yaml renders to.
++    fullnameOverride entry in values.schema.yaml or the configuration reference
++    that values.schema.yaml renders to.
+ 
+     https://z2jh.jupyter.org/en/latest/resources/reference.html#fullnameOverride
+ */}}
+@@ -38,8 +38,8 @@
+     {{- $name_override := .Values.apps.jupyterhub.nameOverride }}
+     {{- if ne .Chart.Name "jupyterhub" }}
+         {{- if .Values.apps.jupyterhub.jupyterhub }}
+-            {{- $fullname_override = .Values.apps.jupyterhub.fullnameOverride }}
+-            {{- $name_override = .Values.apps.jupyterhub.nameOverride }}
++            {{- $fullname_override = .Values.apps.jupyterhub.jupyterhub.fullnameOverride }}
++            {{- $name_override = .Values.apps.jupyterhub.jupyterhub.nameOverride }}
+         {{- end }}
+     {{- end }}
+ 
+@@ -76,12 +76,23 @@
+     {{- include "jupyterhub.fullname.dash" . }}hub
+ {{- end }}
+ 
++{{- /* hub-serviceaccount ServiceAccount */}}
++{{- define "jupyterhub.hub-serviceaccount.fullname" -}}
++    {{- if .Values.apps.jupyterhub.hub.serviceAccount.create }}
++        {{- .Values.apps.jupyterhub.hub.serviceAccount.name | default (include "jupyterhub.hub.fullname" .) }}
++    {{- else }}
++        {{- .Values.apps.jupyterhub.hub.serviceAccount.name | default "default" }}
++    {{- end }}
++{{- end }}
++
+ {{- /* hub-existing-secret Secret */}}
+ {{- define "jupyterhub.hub-existing-secret.fullname" -}}
+     {{- /* A hack to avoid issues from invoking this from a parent Helm chart. */}}
+     {{- $existing_secret := .Values.apps.jupyterhub.hub.existingSecret }}
+     {{- if ne .Chart.Name "jupyterhub" }}
+-        {{- $existing_secret = .Values.apps.jupyterhub.hub.existingSecret }}
++        {{- if .Values.apps.jupyterhub.jupyterhub }}
++            {{- $existing_secret = .Values.apps.jupyterhub.jupyterhub.hub.existingSecret }}
++        {{- end }}
+     {{- end }}
+     {{- if $existing_secret }}
+         {{- $existing_secret }}
+@@ -133,11 +144,29 @@
+     {{- include "jupyterhub.fullname.dash" . }}autohttps
+ {{- end }}
+ 
++{{- /* autohttps-serviceaccount ServiceAccount */}}
++{{- define "jupyterhub.autohttps-serviceaccount.fullname" -}}
++    {{- if .Values.apps.jupyterhub.proxy.traefik.serviceAccount.create }}
++        {{- .Values.apps.jupyterhub.proxy.traefik.serviceAccount.name | default (include "jupyterhub.autohttps.fullname" .) }}
++    {{- else }}
++        {{- .Values.apps.jupyterhub.proxy.traefik.serviceAccount.name | default "default" }}
++    {{- end }}
++{{- end }}
++
+ {{- /* user-scheduler Deployment */}}
+ {{- define "jupyterhub.user-scheduler-deploy.fullname" -}}
+     {{- include "jupyterhub.fullname.dash" . }}user-scheduler
+ {{- end }}
+ 
++{{- /* user-scheduler-serviceaccount ServiceAccount */}}
++{{- define "jupyterhub.user-scheduler-serviceaccount.fullname" -}}
++    {{- if .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.create }}
++        {{- .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.name | default (include "jupyterhub.user-scheduler-deploy.fullname" .) }}
++    {{- else }}
++        {{- .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.name | default "default" }}
++    {{- end }}
++{{- end }}
++
+ {{- /* user-scheduler leader election lock resource */}}
+ {{- define "jupyterhub.user-scheduler-lock.fullname" -}}
+     {{- include "jupyterhub.user-scheduler-deploy.fullname" . }}-lock
+@@ -153,6 +182,15 @@
+     {{- include "jupyterhub.fullname.dash" . }}hook-image-awaiter
+ {{- end }}
+ 
++{{- /* image-awaiter-serviceaccount ServiceAccount */}}
++{{- define "jupyterhub.hook-image-awaiter-serviceaccount.fullname" -}}
++    {{- if .Values.apps.jupyterhub.prePuller.hook.serviceAccount.create }}
++        {{- .Values.apps.jupyterhub.prePuller.hook.serviceAccount.name | default (include "jupyterhub.hook-image-awaiter.fullname" .) }}
++    {{- else }}
++        {{- .Values.apps.jupyterhub.prePuller.hook.serviceAccount.name | default "default" }}
++    {{- end }}
++{{- end }}
++
+ {{- /* hook-image-puller DaemonSet */}}
+ {{- define "jupyterhub.hook-image-puller.fullname" -}}
+     {{- include "jupyterhub.fullname.dash" . }}hook-image-puller
+@@ -210,6 +248,15 @@
+     {{- end }}
+ {{- end }}
+ 
++{{- /* image-puller Priority */}}
++{{- define "jupyterhub.image-puller-priority.fullname" -}}
++    {{- if (include "jupyterhub.fullname" .) }}
++        {{- include "jupyterhub.fullname.dash" . }}image-puller
++    {{- else }}
++        {{- .Release.Name }}-image-puller-priority
++    {{- end }}
++{{- end }}
++
+ {{- /* user-scheduler's registered name */}}
+ {{- define "jupyterhub.user-scheduler.fullname" -}}
+     {{- if (include "jupyterhub.fullname" .) }}
+@@ -231,6 +278,7 @@
+ fullname: {{ include "jupyterhub.fullname" . | quote }}
+ fullname-dash: {{ include "jupyterhub.fullname.dash" . | quote }}
+ hub: {{ include "jupyterhub.hub.fullname" . | quote }}
++hub-serviceaccount: {{ include "jupyterhub.hub-serviceaccount.fullname" . | quote }}
+ hub-existing-secret: {{ include "jupyterhub.hub-existing-secret.fullname" . | quote }}
+ hub-existing-secret-or-default: {{ include "jupyterhub.hub-existing-secret-or-default.fullname" . | quote }}
+ hub-pvc: {{ include "jupyterhub.hub-pvc.fullname" . | quote }}
+@@ -241,10 +289,14 @@ proxy-public: {{ include "jupyterhub.proxy-public.fullname" . | quote }}
+ proxy-public-tls: {{ include "jupyterhub.proxy-public-tls.fullname" . | quote }}
+ proxy-public-manual-tls: {{ include "jupyterhub.proxy-public-manual-tls.fullname" . | quote }}
+ autohttps: {{ include "jupyterhub.autohttps.fullname" . | quote }}
++autohttps-serviceaccount: {{ include "jupyterhub.autohttps-serviceaccount.fullname" . | quote }}
+ user-scheduler-deploy: {{ include "jupyterhub.user-scheduler-deploy.fullname" . | quote }}
++user-scheduler-serviceaccount: {{ include "jupyterhub.user-scheduler-serviceaccount.fullname" . | quote }}
+ user-scheduler-lock: {{ include "jupyterhub.user-scheduler-lock.fullname" . | quote }}
+ user-placeholder: {{ include "jupyterhub.user-placeholder.fullname" . | quote }}
++image-puller-priority: {{ include "jupyterhub.image-puller-priority.fullname" . | quote }}
+ hook-image-awaiter: {{ include "jupyterhub.hook-image-awaiter.fullname" . | quote }}
++hook-image-awaiter-serviceaccount: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . | quote }}
+ hook-image-puller: {{ include "jupyterhub.hook-image-puller.fullname" . | quote }}
+ continuous-image-puller: {{ include "jupyterhub.continuous-image-puller.fullname" . | quote }}
+ singleuser: {{ include "jupyterhub.singleuser.fullname" . | quote }}
+diff --git a/applications/jupyterhub/deploy/templates/_helpers-netpol.tpl b/applications/jupyterhub/deploy/templates/_helpers-netpol.tpl
+new file mode 100644
+index 0000000..4075569
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/_helpers-netpol.tpl
+@@ -0,0 +1,101 @@
++{{- /*
++  This named template renders egress rules for NetworkPolicy resources based on
++  common configuration.
++
++  It is rendering based on the `egressAllowRules` and `egress` keys of the
++  passed networkPolicy config object. Each flag set to true under
++  `egressAllowRules` is rendered to a egress rule that next to any custom user
++  defined rules from the `egress` config.
++
++  This named template needs to render based on a specific networkPolicy
++  resource, but also needs access to the root context. Due to that, it
++  accepts a list as its scope, where the first element is supposed to be the
++  root context and the second element is supposed to be the networkPolicy
++  configuration object.
++
++  As an example, this is how you would render this named template from a
++  NetworkPolicy resource under its egress:
++
++    egress:
++      # other rules here...
++
++      {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.hub.networkPolicy)) }}
++      {{- . | nindent 4 }}
++      {{- end }}
++
++  Note that the reference to privateIPs and nonPrivateIPs relate to
++  https://en.wikipedia.org/wiki/Private_network#Private_IPv4_addresses.
++*/}}
++
++{{- define "jupyterhub.networkPolicy.renderEgressRules" -}}
++{{- $root := index . 0 }}
++{{- $netpol := index . 1 }}
++{{- if or (or $netpol.egressAllowRules.dnsPortsCloudMetadataServer $netpol.egressAllowRules.dnsPortsKubeSystemNamespace) $netpol.egressAllowRules.dnsPortsPrivateIPs }}
++- ports:
++    - port: 53
++      protocol: UDP
++    - port: 53
++      protocol: TCP
++  to:
++  {{- if $netpol.egressAllowRules.dnsPortsCloudMetadataServer }}
++    # Allow outbound connections to DNS ports on the cloud metadata server
++    - ipBlock:
++        cidr: {{ $root.Values.apps.jupyterhub.singleuser.cloudMetadata.ip }}/32
++  {{- end }}
++  {{- if $netpol.egressAllowRules.dnsPortsKubeSystemNamespace }}
++    # Allow outbound connections to DNS ports on pods in the kube-system
++    # namespace
++    - namespaceSelector:
++        matchLabels:
++          kubernetes.io/metadata.name: kube-system
++  {{- end }}
++  {{- if $netpol.egressAllowRules.dnsPortsPrivateIPs }}
++    # Allow outbound connections to DNS ports on destinations in the private IP
++    # ranges
++    - ipBlock:
++        cidr: 10.0.0.0/8
++    - ipBlock:
++        cidr: 172.16.0.0/12
++    - ipBlock:
++        cidr: 192.168.0.0/16
++  {{- end }}
++{{- end }}
++
++{{- if $netpol.egressAllowRules.nonPrivateIPs }}
++# Allow outbound connections to non-private IP ranges
++- to:
++    - ipBlock:
++        cidr: 0.0.0.0/0
++        except:
++          # As part of this rule:
++          # - don't allow outbound connections to private IPs
++          - 10.0.0.0/8
++          - 172.16.0.0/12
++          - 192.168.0.0/16
++          # - don't allow outbound connections to the cloud metadata server
++          - {{ $root.Values.apps.jupyterhub.singleuser.cloudMetadata.ip }}/32
++{{- end }}
++
++{{- if $netpol.egressAllowRules.privateIPs }}
++# Allow outbound connections to private IP ranges
++- to:
++    - ipBlock:
++        cidr: 10.0.0.0/8
++    - ipBlock:
++        cidr: 172.16.0.0/12
++    - ipBlock:
++        cidr: 192.168.0.0/16
++{{- end }}
++
++{{- if $netpol.egressAllowRules.cloudMetadataServer }}
++# Allow outbound connections to the cloud metadata server
++- to:
++    - ipBlock:
++        cidr: {{ $root.Values.apps.jupyterhub.singleuser.cloudMetadata.ip }}/32
++{{- end }}
++
++{{- with $netpol.egress }}
++# Allow outbound connections based on user specified rules
++{{ . | toYaml }}
++{{- end }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/_helpers.tpl b/applications/jupyterhub/deploy/templates/_helpers.tpl
+index efea86d..a202363 100755
+--- a/applications/jupyterhub/deploy/templates/_helpers.tpl
++++ b/applications/jupyterhub/deploy/templates/_helpers.tpl
+@@ -12,7 +12,7 @@
+ 
+   When you ask a helper to render its content, one often forward the current
+   scope to the helper in order to allow it to access .Release.Name,
+-  .Values.apps.jupyterhub.rbac.enabled and similar values.
++  .Values.apps.jupyterhub.rbac.create and similar values.
+ 
+   #### Example - Passing the current scope
+   {{ include "jupyterhub.commonLabels" . }}
+@@ -180,8 +180,51 @@ component: {{ include "jupyterhub.componentLabel" . }}
+     Augments passed .pullSecrets with $.Values.apps.jupyterhub.imagePullSecrets
+ */}}
+ {{- define "jupyterhub.imagePullSecrets" -}}
++    {{- /*
++        We have implemented a trick to allow a parent chart depending on this
++        chart to call this named templates.
++
++        Caveats and notes:
++
++            1. While parent charts can reference these, grandparent charts can't.
++            2. Parent charts must not use an alias for this chart.
++            3. There is no failsafe workaround to above due to
++                https://github.com/helm/helm/issues/9214.
++            4. .Chart is of its own type (*chart.Metadata) and needs to be casted
++                using "toYaml | fromYaml" in order to be able to use normal helm
++                template functions on it.
++    */}}
++    {{- $jupyterhub_values := .root.Values.apps.jupyterhub.}}
++    {{- if ne .root.Chart.Name "jupyterhub" }}
++        {{- if .root.Values.apps.jupyterhub.jupyterhub }}
++            {{- $jupyterhub_values = .root.Values.apps.jupyterhub.jupyterhub }}
++        {{- end }}
++    {{- end }}
+ 
++    {{- /* Populate $_.list with all relevant entries */}}
++    {{- $_ := dict "list" (concat .image.pullSecrets $jupyterhub_values.imagePullSecrets | uniq) }}
++    {{- if and $jupyterhub_values.imagePullSecret.create $jupyterhub_values.imagePullSecret.automaticReferenceInjection }}
++        {{- $__ := set $_ "list" (append $_.list (include "jupyterhub.image-pull-secret.fullname" .root) | uniq) }}
++    {{- end }}
+ 
++    {{- /* Decide if something should be written */}}
++    {{- if not (eq ($_.list | toJson) "[]") }}
++
++        {{- /* Process the $_.list where strings become dicts with a name key and the
++        strings become the name keys' values into $_.res */}}
++        {{- $_ := set $_ "res" list }}
++        {{- range $_.list }}
++            {{- if eq (typeOf .) "string" }}
++                {{- $__ := set $_ "res" (append $_.res (dict "name" .)) }}
++            {{- else }}
++                {{- $__ := set $_ "res" (append $_.res .) }}
++            {{- end }}
++        {{- end }}
++
++        {{- /* Write the results */}}
++        {{- $_.res | toJson }}
++
++    {{- end }}
+ {{- end }}
+ 
+ {{- /*
+@@ -339,3 +382,21 @@ limits:
+         {{- print "\n\nextraFiles entries (" $file_key ") must only contain one of the fields: 'data', 'stringData', and 'binaryData'." | fail }}
+     {{- end }}
+ {{- end }}
++
++{{- /*
++  jupyterhub.chart-version-to-git-ref:
++    Renders a valid git reference from a chartpress generated version string.
++    In practice, either a git tag or a git commit hash will be returned.
++
++    - The version string will follow a chartpress pattern, see
++      https://github.com/jupyterhub/chartpress#examples-chart-versions-and-image-tags.
++
++    - The regexReplaceAll function is a sprig library function, see
++      https://masterminds.github.io/sprig/strings.html.
++
++    - The regular expression is in golang syntax, but \d had to become \\d for
++      example.
++*/}}
++{{- define "jupyterhub.chart-version-to-git-ref" -}}
++{{- regexReplaceAll ".*[.-]n\\d+[.]h(.*)" . "${1}" }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/hub/configmap.yaml b/applications/jupyterhub/deploy/templates/hub/configmap.yaml
+index c913f67..f52feb6 100755
+--- a/applications/jupyterhub/deploy/templates/hub/configmap.yaml
++++ b/applications/jupyterhub/deploy/templates/hub/configmap.yaml
+@@ -29,5 +29,6 @@ data:
+   */}}
+   checksum_hook-image-puller: {{ include "jupyterhub.imagePuller.daemonset.hook.checksum" . | quote }}
+ 
++  # EDIT: CLOUDHARNESS
+   allvalues.yaml: |
+     {{- .Values | toYaml | nindent 4 }}
+\ No newline at end of file
+diff --git a/applications/jupyterhub/deploy/templates/hub/deployment.yaml b/applications/jupyterhub/deploy/templates/hub/deployment.yaml
+index 82132c6..d105ecc 100755
+--- a/applications/jupyterhub/deploy/templates/hub/deployment.yaml
++++ b/applications/jupyterhub/deploy/templates/hub/deployment.yaml
+@@ -5,6 +5,9 @@ metadata:
+   labels:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ spec:
++  {{- if typeIs "int" .Values.apps.jupyterhub.hub.revisionHistoryLimit }}
++  revisionHistoryLimit: {{ .Values.apps.jupyterhub.hub.revisionHistoryLimit }}
++  {{- end }}
+   replicas: 1
+   selector:
+     matchLabels:
+@@ -30,11 +33,14 @@ spec:
+         {{- . | toYaml | nindent 8 }}
+         {{- end }}
+     spec:
+-{{ include "deploy_utils.etcHosts" . | indent 6 }}
++{{ include "deploy_utils.etcHosts" . | indent 6 }}  # EDIT: CLOUDHARNESS
+       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+       priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
+       {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.hub.nodeSelector }}
++      {{- with .Values.apps.jupyterhub.hub.nodeSelector }}
++      nodeSelector:
++        {{- . | toYaml | nindent 8 }}
++      {{- end }}
+       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.hub.tolerations }}
+       tolerations:
+         {{- . | toYaml | nindent 8 }}
+@@ -44,7 +50,7 @@ spec:
+         - name: config
+           configMap:
+             name: {{ include "jupyterhub.hub.fullname" . }}
+-        {{- /* This is needed by cloudharness libraries */}}
++        {{- /*  EDIT: CLOUDHARNESS This is needed by cloudharness libraries */}}
+         - name: cloudharness-allvalues
+           configMap:
+             name: cloudharness-allvalues
+@@ -82,11 +88,13 @@ spec:
+           persistentVolumeClaim:
+             claimName: {{ include "jupyterhub.hub-pvc.fullname" . }}
+         {{- end }}
+-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
+-      serviceAccountName: {{ include "jupyterhub.hub.fullname" . }}
++      {{- with include "jupyterhub.hub-serviceaccount.fullname" . }}
++      serviceAccountName: {{ . }}
+       {{- end }}
++      {{- with .Values.apps.jupyterhub.hub.podSecurityContext }}
+       securityContext:
+-        fsGroup: {{ .Values.apps.jupyterhub.hub.fsGid }}
++        {{- . | toYaml | nindent 8 }}
++      {{- end }}
+       {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.apps.jupyterhub.hub.image) }}
+       imagePullSecrets: {{ . }}
+       {{- end }}
+@@ -153,14 +161,14 @@ spec:
+               name: config
+             - mountPath: /usr/local/etc/jupyterhub/secret/
+               name: secret
+-            - name: cloudharness-allvalues
++            - name: cloudharness-allvalues  # EDIT: CLOUDHARNESS START
+               mountPath: /opt/cloudharness/resources/allvalues.yaml
+               subPath: allvalues.yaml
+             {{- if .Values.apps.accounts }}
+             - name: cloudharness-kc-accounts
+               mountPath: /opt/cloudharness/resources/auth
+               readOnly: true
+-            {{- end }}
++            {{- end }}  # EDIT: CLOUDHARNESS END
+             {{- if (include "jupyterhub.hub-existing-secret.fullname" .) }}
+             - mountPath: /usr/local/etc/jupyterhub/existing-secret/
+               name: existing-secret
+diff --git a/applications/jupyterhub/deploy/templates/hub/netpol.yaml b/applications/jupyterhub/deploy/templates/hub/netpol.yaml
+index 9a7a6bc..d9508e2 100755
+--- a/applications/jupyterhub/deploy/templates/hub/netpol.yaml
++++ b/applications/jupyterhub/deploy/templates/hub/netpol.yaml
+@@ -61,31 +61,24 @@ spec:
+ 
+   egress:
+     # hub --> proxy
+-    - ports:
+-        - port: 8001
+-      to:
++    - to:
+         - podSelector:
+             matchLabels:
+               {{- $_ := merge (dict "componentLabel" "proxy") . }}
+               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8001
++
+     # hub --> singleuser-server
+-    - ports:
+-        - port: 8888
+-      to:
++    - to:
+         - podSelector:
+             matchLabels:
+               {{- $_ := merge (dict "componentLabel" "singleuser-server") . }}
+               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8888
+ 
+-    # hub --> Kubernetes internal DNS
+-    - ports:
+-        - protocol: UDP
+-          port: 53
+-        - protocol: TCP
+-          port: 53
+-
+-    {{- with .Values.apps.jupyterhub.hub.networkPolicy.egress }}
+-    # hub --> depends, but the default is everything
+-    {{- . | toYaml | nindent 4 }}
++    {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.hub.networkPolicy)) }}
++    {{- . | nindent 4 }}
+     {{- end }}
+ {{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/hub/pdb.yaml b/applications/jupyterhub/deploy/templates/hub/pdb.yaml
+index 855609d..bb6c7b1 100755
+--- a/applications/jupyterhub/deploy/templates/hub/pdb.yaml
++++ b/applications/jupyterhub/deploy/templates/hub/pdb.yaml
+@@ -1,9 +1,5 @@
+ {{- if .Values.apps.jupyterhub.hub.pdb.enabled -}}
+-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+ apiVersion: policy/v1
+-{{- else }}
+-apiVersion: policy/v1beta1
+-{{- end }}
+ kind: PodDisruptionBudget
+ metadata:
+   name: {{ include "jupyterhub.hub.fullname" . }}
+diff --git a/applications/jupyterhub/deploy/templates/hub/rbac.yaml b/applications/jupyterhub/deploy/templates/hub/rbac.yaml
+index 738daab..1b689af 100755
+--- a/applications/jupyterhub/deploy/templates/hub/rbac.yaml
++++ b/applications/jupyterhub/deploy/templates/hub/rbac.yaml
+@@ -1,15 +1,4 @@
+-{{- if .Values.apps.jupyterhub.rbac.enabled -}}
+-apiVersion: v1
+-kind: ServiceAccount
+-metadata:
+-  name: {{ include "jupyterhub.hub.fullname" . }}
+-  {{- with .Values.apps.jupyterhub.hub.serviceAccount.annotations }}
+-  annotations:
+-    {{- . | toYaml | nindent 4 }}
+-  {{- end }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+----
++{{- if .Values.apps.jupyterhub.rbac.create -}}
+ kind: Role
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+@@ -32,7 +21,7 @@ metadata:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ subjects:
+   - kind: ServiceAccount
+-    name: {{ include "jupyterhub.hub.fullname" . }}
++    name: {{ include "jupyterhub.hub-serviceaccount.fullname" . }}
+     namespace: "{{ .Release.Namespace }}"
+ roleRef:
+   kind: Role
+diff --git a/applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml b/applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml
+new file mode 100644
+index 0000000..817ed66
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/hub/serviceaccount.yaml
+@@ -0,0 +1,12 @@
++{{- if .Values.apps.jupyterhub.hub.serviceAccount.create -}}
++apiVersion: v1
++kind: ServiceAccount
++metadata:
++  name: {{ include "jupyterhub.hub-serviceaccount.fullname" . }}
++  {{- with .Values.apps.jupyterhub.hub.serviceAccount.annotations }}
++  annotations:
++    {{- . | toYaml | nindent 4 }}
++  {{- end }}
++  labels:
++    {{- include "jupyterhub.labels" . | nindent 4 }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/image-pull-secret.yaml b/applications/jupyterhub/deploy/templates/image-pull-secret.yaml
+new file mode 100644
+index 0000000..b7544db
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/image-pull-secret.yaml
+@@ -0,0 +1,15 @@
++{{- if .Values.apps.jupyterhub.imagePullSecret.create }}
++kind: Secret
++apiVersion: v1
++metadata:
++  name: {{ include "jupyterhub.image-pull-secret.fullname" . }}
++  labels:
++    {{- include "jupyterhub.labels" . | nindent 4 }}
++  annotations:
++    "helm.sh/hook": pre-install,pre-upgrade
++    "helm.sh/hook-delete-policy": before-hook-creation
++    "helm.sh/hook-weight": "-20"
++type: kubernetes.io/dockerconfigjson
++data:
++  .dockerconfigjson: {{ include "jupyterhub.dockerconfigjson" . }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
+index e16fd1a..528345c 100644
+--- a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
++++ b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
+@@ -34,6 +34,9 @@ spec:
+     type: RollingUpdate
+     rollingUpdate:
+       maxUnavailable: 100%
++  {{- if typeIs "int" .Values.apps.jupyterhub.prePuller.revisionHistoryLimit }}
++  revisionHistoryLimit: {{ .Values.apps.jupyterhub.prePuller.revisionHistoryLimit }}
++  {{- end }}
+   template:
+     metadata:
+       labels:
+@@ -44,13 +47,17 @@ spec:
+       {{- end }}
+     spec:
+       {{- /*
+-        continuous-image-puller pods are made evictable to save on the k8s pods
+-        per node limit all k8s clusters have.
++        image-puller pods are made evictable to save on the k8s pods
++        per node limit all k8s clusters have and have a higher priority
++        than user-placeholder pods that could block an entire node.
+       */}}
+-      {{- if and (not .hook) .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+-      priorityClassName: {{ include "jupyterhub.user-placeholder-priority.fullname" . }}
++      {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
++      priorityClassName: {{ include "jupyterhub.image-puller-priority.fullname" . }}
++      {{- end }}
++      {{- with .Values.apps.jupyterhub.singleuser.nodeSelector }}
++      nodeSelector:
++        {{- . | toYaml | nindent 8 }}
+       {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.singleuser.nodeSelector }}
+       {{- with concat .Values.apps.jupyterhub.scheduling.userPods.tolerations .Values.apps.jupyterhub.singleuser.extraTolerations .Values.apps.jupyterhub.prePuller.extraTolerations }}
+       tolerations:
+         {{- . | toYaml | nindent 8 }}
+@@ -127,6 +134,7 @@ spec:
+         {{- /* --- Conditionally pull profileList images --- */}}
+         {{- if .Values.apps.jupyterhub.prePuller.pullProfileListImages }}
+         {{- range $k, $container := .Values.apps.jupyterhub.singleuser.profileList }}
++        {{- /* profile's kubespawner_override */}}
+         {{- if $container.kubespawner_override }}
+         {{- if $container.kubespawner_override.image }}
+         - name: image-pull-singleuser-profilelist-{{ $k }}
+@@ -145,13 +153,15 @@ spec:
+           {{- end }}
+         {{- end }}
+         {{- end }}
+-        {{- end }}
+-        {{- end }}
+-
+-        {{- /* --- Pull extra images --- */}}
+-        {{- range $k, $v := .Values.apps.jupyterhub.prePuller.extraImages }}
+-        - name: image-pull-{{ $k }}
+-          image: {{ $v.name }}:{{ $v.tag }}
++        {{- /* kubespawner_override in profile's profile_options */}}
++        {{- if $container.profile_options }}
++        {{- range $option, $option_spec := $container.profile_options }}
++        {{- if $option_spec.choices }}
++        {{- range $choice, $choice_spec := $option_spec.choices }}
++        {{- if $choice_spec.kubespawner_override }}
++        {{- if $choice_spec.kubespawner_override.image }}
++        - name: image-pull-profile-{{ $k }}-option-{{ $option }}-{{ $choice }}
++          image: {{ $choice_spec.kubespawner_override.image }}
+           command:
+             - /bin/sh
+             - -c
+@@ -163,13 +173,20 @@ spec:
+           {{- with $.Values.apps.jupyterhub.prePuller.containerSecurityContext }}
+           securityContext:
+             {{- . | toYaml | nindent 12 }}
+-          {{- end }}
++        {{- end }}
++        {{- end }}
++        {{- end }}
++        {{- end }}
++        {{- end }}
++        {{- end }}
++        {{- end }}
++        {{- end }}
+         {{- end }}
+ 
+-        {{- /* --- Pull CloudHarness tasks images --- */}}
+-        {{- range $k, $v := ( index .Values "task-images" )  }}
+-        - name: image-pull-{{ $k | replace "-" "" }}
+-          image: {{ $v }}
++        {{- /* --- Pull extra images --- */}}
++        {{- range $k, $v := .Values.apps.jupyterhub.prePuller.extraImages }}
++        - name: image-pull-{{ $k }}
++          image: {{ $v.name }}:{{ $v.tag }}
+           command:
+             - /bin/sh
+             - -c
+diff --git a/applications/jupyterhub/deploy/templates/image-puller/job.yaml b/applications/jupyterhub/deploy/templates/image-puller/job.yaml
+index bdd9f63..cc6db3e 100755
+--- a/applications/jupyterhub/deploy/templates/image-puller/job.yaml
++++ b/applications/jupyterhub/deploy/templates/image-puller/job.yaml
+@@ -28,16 +28,22 @@ spec:
+       labels:
+         {{- /* Changes here will cause the Job to restart the pods. */}}
+         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
++        {{- with .Values.apps.jupyterhub.prePuller.labels }}
++        {{- . | toYaml | nindent 8 }}
++        {{- end }}
+       {{- with .Values.apps.jupyterhub.prePuller.annotations }}
+       annotations:
+         {{- . | toYaml | nindent 8 }}
+       {{- end }}
+     spec:
+       restartPolicy: Never
+-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
+-      serviceAccountName: {{ include "jupyterhub.hook-image-awaiter.fullname" . }}
++      {{- with include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
++      serviceAccountName: {{ . }}
++      {{- end }}
++      {{- with .Values.apps.jupyterhub.prePuller.hook.nodeSelector }}
++      nodeSelector:
++        {{- . | toYaml | nindent 8 }}
+       {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.prePuller.hook.nodeSelector }}
+       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.prePuller.hook.tolerations }}
+       tolerations:
+         {{- . | toYaml | nindent 8 }}
+@@ -58,6 +64,7 @@ spec:
+             - -api-server-address=https://kubernetes.default.svc:$(KUBERNETES_SERVICE_PORT)
+             - -namespace={{ .Release.Namespace }}
+             - -daemonset={{ include "jupyterhub.hook-image-puller.fullname" . }}
++            - -pod-scheduling-wait-duration={{ .Values.apps.jupyterhub.prePuller.hook.podSchedulingWaitDuration }}
+           {{- with .Values.apps.jupyterhub.prePuller.hook.containerSecurityContext }}
+           securityContext:
+             {{- . | toYaml | nindent 12 }}
+diff --git a/applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml b/applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml
+new file mode 100644
+index 0000000..1a3fca3
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/image-puller/priorityclass.yaml
+@@ -0,0 +1,18 @@
++{{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
++{{- if or .Values.apps.jupyterhub.prePuller.hook.enabled .Values.apps.jupyterhub.prePuller.continuous.enabled -}}
++apiVersion: scheduling.k8s.io/v1
++kind: PriorityClass
++metadata:
++  name: {{ include "jupyterhub.image-puller-priority.fullname" . }}
++  annotations:
++    meta.helm.sh/release-name: "{{ .Release.Name }}"
++    meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
++  labels:
++    {{- include "jupyterhub.labels" . | nindent 4 }}
++value: {{ .Values.apps.jupyterhub.scheduling.podPriority.imagePullerPriority }}
++globalDefault: false
++description: >-
++  Enables [hook|continuous]-image-puller pods to fit on nodes even though they
++  are clogged by user-placeholder pods, while not evicting normal user pods.
++{{- end }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml b/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
+index 95c86dd..5946896 100755
+--- a/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
++++ b/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
+@@ -1,29 +1,8 @@
+ {{- /*
+ Permissions to be used by the hook-image-awaiter job
+ */}}
+-{{- if .Values.apps.jupyterhub.rbac.enabled }}
+-{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) }}
+-{{- /*
+-This service account...
+-*/ -}}
+-apiVersion: v1
+-kind: ServiceAccount
+-metadata:
+-  name: {{ include "jupyterhub.hook-image-awaiter.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-    hub.jupyter.org/deletable: "true"
+-  annotations:
+-    "helm.sh/hook": pre-install,pre-upgrade
+-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+-    "helm.sh/hook-weight": "0"
+-    {{- with .Values.apps.jupyterhub.prePuller.hook.serviceAccount.annotations }}
+-    {{- . | toYaml | nindent 4 }}
+-    {{- end }}
+----
+-{{- /*
+-... will be used by this role...
+-*/}}
++{{- if .Values.apps.jupyterhub.rbac.create -}}
++{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
+ kind: Role
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+@@ -56,7 +35,7 @@ metadata:
+     "helm.sh/hook-weight": "0"
+ subjects:
+   - kind: ServiceAccount
+-    name: {{ include "jupyterhub.hook-image-awaiter.fullname" . }}
++    name: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
+     namespace: "{{ .Release.Namespace }}"
+ roleRef:
+   kind: Role
+diff --git a/applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml b/applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml
+new file mode 100644
+index 0000000..2e5fa72
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/image-puller/serviceaccount.yaml
+@@ -0,0 +1,21 @@
++{{- /*
++ServiceAccount for the pre-puller hook's image-awaiter-job
++*/}}
++{{- if .Values.apps.jupyterhub.prePuller.hook.serviceAccount.create -}}
++{{- if (include "jupyterhub.imagePuller.daemonset.hook.install" .) -}}
++apiVersion: v1
++kind: ServiceAccount
++metadata:
++  name: {{ include "jupyterhub.hook-image-awaiter-serviceaccount.fullname" . }}
++  labels:
++    {{- include "jupyterhub.labels" . | nindent 4 }}
++    hub.jupyter.org/deletable: "true"
++  annotations:
++    "helm.sh/hook": pre-install,pre-upgrade
++    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
++    "helm.sh/hook-weight": "0"
++    {{- with .Values.apps.jupyterhub.prePuller.hook.serviceAccount.annotations }}
++    {{- . | toYaml | nindent 4 }}
++    {{- end }}
++{{- end }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt b/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
+deleted file mode 100755
+index 08bd7bb..0000000
+--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
++++ /dev/null
+@@ -1,9 +0,0 @@
+-# Automatic HTTPS Terminator
+-
+-This directory has Kubernetes objects for automatic Let's Encrypt Support.
+-When enabled, we create a new deployment object that has an nginx-ingress
+-and kube-lego container in it. This is responsible for requesting,
+-storing and renewing certificates as needed from Let's Encrypt.
+-
+-The only change required outside of this directory is in the `proxy-public`
+-service, which targets different hubs based on automatic HTTPS status.
+\ No newline at end of file
+diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
+deleted file mode 100755
+index 8d71a97..0000000
+--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
++++ /dev/null
+@@ -1,28 +0,0 @@
+-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
+-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
+-{{- if $autoHTTPS -}}
+-{{- $_ := .Values.apps.jupyterhub.proxy.https.letsencrypt.contactEmail | required "proxy.https.letsencrypt.contactEmail is a required field" -}}
+-
+-# This configmap contains Traefik configuration files to be mounted.
+-# - traefik.yaml will only be read during startup (static configuration)
+-# - dynamic.yaml will be read on change (dynamic configuration)
+-#
+-# ref: https://docs.traefik.io/getting-started/configuration-overview/
+-#
+-# The configuration files are first rendered with Helm templating to large YAML
+-# strings. Then we use the fromYAML function on these strings to get an object,
+-# that we in turn merge with user provided extra configuration.
+-#
+-kind: ConfigMap
+-apiVersion: v1
+-metadata:
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-data:
+-  traefik.yaml: |
+-    {{- include "jupyterhub.traefik.yaml" . | fromYaml | merge .Values.apps.jupyterhub.proxy.traefik.extraStaticConfig | toYaml | nindent 4 }}
+-  dynamic.yaml: |
+-    {{- include "jupyterhub.dynamic.yaml" . | fromYaml | merge .Values.apps.jupyterhub.proxy.traefik.extraDynamicConfig | toYaml | nindent 4 }}
+-
+-{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
+deleted file mode 100755
+index fcb062f..0000000
+--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
++++ /dev/null
+@@ -1,141 +0,0 @@
+-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
+-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
+-{{- if $autoHTTPS -}}
+-apiVersion: apps/v1
+-kind: Deployment
+-metadata:
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-spec:
+-  replicas: 1
+-  selector:
+-    matchLabels:
+-      {{- include "jupyterhub.matchLabels" . | nindent 6 }}
+-  template:
+-    metadata:
+-      labels:
+-        {{- include "jupyterhub.matchLabels" . | nindent 8 }}
+-        hub.jupyter.org/network-access-proxy-http: "true"
+-        {{- with .Values.apps.jupyterhub.proxy.traefik.labels }}
+-        {{- . | toYaml | nindent 8 }}
+-        {{- end }}
+-      annotations:
+-        # Only force a restart through a change to this checksum when the static
+-        # configuration is changed, as the dynamic can be updated after start.
+-        # Any disruptions to this deployment impacts everything, it is the
+-        # entrypoint of all network traffic.
+-        checksum/static-config: {{ include "jupyterhub.traefik.yaml" . | fromYaml | merge .Values.apps.jupyterhub.proxy.traefik.extraStaticConfig | toYaml | sha256sum }}
+-    spec:
+-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
+-      serviceAccountName: {{ include "jupyterhub.autohttps.fullname" . }}
+-      {{- end }}
+-      {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+-      priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
+-      {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.proxy.traefik.nodeSelector }}
+-      {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.proxy.traefik.tolerations }}
+-      tolerations:
+-        {{- . | toYaml | nindent 8 }}
+-      {{- end }}
+-      {{- include "jupyterhub.coreAffinity" . | nindent 6 }}
+-      volumes:
+-        - name: certificates
+-          emptyDir: {}
+-        - name: traefik-config
+-          configMap:
+-            name: {{ include "jupyterhub.autohttps.fullname" . }}
+-        {{- with .Values.apps.jupyterhub.proxy.traefik.extraVolumes }}
+-        {{- . | toYaml | nindent 8 }}
+-        {{- end }}
+-      {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.apps.jupyterhub.proxy.traefik.image) }}
+-      imagePullSecrets: {{ . }}
+-      {{- end }}
+-      initContainers:
+-        - name: load-acme
+-          image: "{{ .Values.apps.jupyterhub.proxy.secretSync.image.name }}:{{ .Values.apps.jupyterhub.proxy.secretSync.image.tag }}"
+-          {{- with .Values.apps.jupyterhub.proxy.secretSync.image.pullPolicy }}
+-          imagePullPolicy: {{ . }}
+-          {{- end }}
+-          args:
+-            - load
+-            - {{ include "jupyterhub.proxy-public-tls.fullname" . }}
+-            - acme.json
+-            - /etc/acme/acme.json
+-          env:
+-            # We need this to get logs immediately
+-            - name: PYTHONUNBUFFERED
+-              value: "True"
+-            {{- with .Values.apps.jupyterhub.proxy.traefik.extraEnv }}
+-            {{- include "jupyterhub.extraEnv" . | nindent 12 }}
+-            {{- end }}
+-          volumeMounts:
+-            - name: certificates
+-              mountPath: /etc/acme
+-          {{- with .Values.apps.jupyterhub.proxy.secretSync.containerSecurityContext }}
+-          securityContext:
+-            {{- . | toYaml | nindent 12 }}
+-          {{- end }}
+-      containers:
+-        - name: traefik
+-          image: "{{ .Values.apps.jupyterhub.proxy.traefik.image.name }}:{{ .Values.apps.jupyterhub.proxy.traefik.image.tag }}"
+-          {{- with .Values.apps.jupyterhub.proxy.traefik.image.pullPolicy }}
+-          imagePullPolicy: {{ . }}
+-          {{- end }}
+-          {{- with .Values.apps.jupyterhub.proxy.traefik.resources }}
+-          resources:
+-            {{- . | toYaml | nindent 12 }}
+-          {{- end }}
+-          ports:
+-            - name: http
+-              containerPort: 8080
+-            - name: https
+-              containerPort: 8443
+-            {{- with .Values.apps.jupyterhub.proxy.traefik.extraPorts }}
+-            {{- . | toYaml | nindent 12 }}
+-            {{- end }}
+-          volumeMounts:
+-            - name: traefik-config
+-              mountPath: /etc/traefik
+-            - name: certificates
+-              mountPath: /etc/acme
+-            {{- with .Values.apps.jupyterhub.proxy.traefik.extraVolumeMounts }}
+-            {{- . | toYaml | nindent 12 }}
+-            {{- end }}
+-          {{- with .Values.apps.jupyterhub.proxy.traefik.extraEnv }}
+-          env:
+-            {{- include "jupyterhub.extraEnv" . | nindent 12 }}
+-          {{- end }}
+-          {{- with .Values.apps.jupyterhub.proxy.traefik.containerSecurityContext }}
+-          securityContext:
+-            {{- . | toYaml | nindent 12 }}
+-          {{- end }}
+-        - name: secret-sync
+-          image: "{{ .Values.apps.jupyterhub.proxy.secretSync.image.name }}:{{ .Values.apps.jupyterhub.proxy.secretSync.image.tag }}"
+-          {{- with .Values.apps.jupyterhub.proxy.secretSync.image.pullPolicy }}
+-          imagePullPolicy: {{ . }}
+-          {{- end }}
+-          args:
+-            - watch-save
+-            - --label=app={{ include "jupyterhub.appLabel" . }}
+-            - --label=release={{ .Release.Name }}
+-            - --label=chart={{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+-            - --label=heritage=secret-sync
+-            - {{ include "jupyterhub.proxy-public-tls.fullname" . }}
+-            - acme.json
+-            - /etc/acme/acme.json
+-          env:
+-          # We need this to get logs immediately
+-          - name: PYTHONUNBUFFERED
+-            value: "True"
+-          volumeMounts:
+-            - name: certificates
+-              mountPath: /etc/acme
+-          {{- with .Values.apps.jupyterhub.proxy.secretSync.containerSecurityContext }}
+-          securityContext:
+-            {{- . | toYaml | nindent 12 }}
+-          {{- end }}
+-      {{- with .Values.apps.jupyterhub.proxy.traefik.extraPodSpec }}
+-      {{- . | toYaml | nindent 6 }}
+-      {{- end }}
+-{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
+deleted file mode 100755
+index ea43b67..0000000
+--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
++++ /dev/null
+@@ -1,40 +0,0 @@
+-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
+-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
+-{{- if (and $autoHTTPS .Values.apps.jupyterhub.rbac.enabled) -}}
+-apiVersion: rbac.authorization.k8s.io/v1
+-kind: Role
+-metadata:
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-  {{- with .Values.apps.jupyterhub.proxy.traefik.serviceAccount.annotations }}
+-  annotations:
+-    {{- . | toYaml | nindent 4 }}
+-  {{- end }}
+-rules:
+-- apiGroups: [""]
+-  resources: ["secrets"]
+-  verbs: ["get", "patch", "list", "create"]
+----
+-apiVersion: rbac.authorization.k8s.io/v1
+-kind: RoleBinding
+-metadata:
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-subjects:
+-- kind: ServiceAccount
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  apiGroup:
+-roleRef:
+-  kind: Role
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  apiGroup: rbac.authorization.k8s.io
+----
+-apiVersion: v1
+-kind: ServiceAccount
+-metadata:
+-  name: {{ include "jupyterhub.autohttps.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
+deleted file mode 100755
+index d57c135..0000000
+--- a/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
++++ /dev/null
+@@ -1,25 +0,0 @@
+-{{- $HTTPS := (and .Values.apps.jupyterhub.proxy.https.hosts .Values.apps.jupyterhub.proxy.https.enabled) }}
+-{{- $autoHTTPS := (and $HTTPS (eq .Values.apps.jupyterhub.proxy.https.type "letsencrypt")) }}
+-{{- if $autoHTTPS -}}
+-apiVersion: v1
+-kind: Service
+-metadata:
+-  name: {{ include "jupyterhub.proxy-http.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-    {{- with .Values.apps.jupyterhub.proxy.service.labels }}
+-    {{- . | toYaml | nindent 4 }}
+-    {{- end }}
+-  {{- with .Values.apps.jupyterhub.proxy.service.annotations }}
+-  annotations:
+-    {{- . | toYaml | nindent 4 }}
+-  {{- end }}
+-spec:
+-  type: ClusterIP
+-  selector:
+-    {{- $_ := merge (dict "componentLabel" "proxy") . }}
+-    {{- include "jupyterhub.matchLabels" $_ | nindent 4 }}
+-  ports:
+-    - port: 8000
+-      targetPort: http
+-{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/deployment.yaml b/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
+index 6d63ba8..bb37b8f 100755
+--- a/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
++++ b/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
+@@ -7,6 +7,9 @@ metadata:
+   labels:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ spec:
++  {{- if typeIs "int" .Values.apps.jupyterhub.proxy.chp.revisionHistoryLimit }}
++  revisionHistoryLimit: {{ .Values.apps.jupyterhub.proxy.chp.revisionHistoryLimit }}
++  {{- end }}
+   replicas: 1
+   selector:
+     matchLabels:
+@@ -35,7 +38,7 @@ spec:
+         # match the k8s Secret during the first upgrade following an auth_token
+         # was generated.
+         checksum/auth-token: {{ include "jupyterhub.hub.config.ConfigurableHTTPProxy.auth_token" . | sha256sum | trunc 4 | quote }}
+-        checksum/proxy-secret: {{ include (print $.Template.BasePath "/jupyterhub/hub/secret.yaml") . | sha256sum }}
++        checksum/proxy-secret: {{ include (print $.Template.BasePath "/jupyterhub/proxy/secret.yaml") . | sha256sum | quote }}
+         {{- with .Values.apps.jupyterhub.proxy.annotations }}
+         {{- . | toYaml | nindent 8 }}
+         {{- end }}
+@@ -44,7 +47,10 @@ spec:
+       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+       priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
+       {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.proxy.chp.nodeSelector }}
++      {{- with .Values.apps.jupyterhub.proxy.chp.nodeSelector }}
++      nodeSelector:
++        {{- . | toYaml | nindent 8 }}
++      {{- end }}
+       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.proxy.chp.tolerations }}
+       tolerations:
+         {{- . | toYaml | nindent 8 }}
+@@ -135,6 +141,8 @@ spec:
+           livenessProbe:
+             initialDelaySeconds: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.initialDelaySeconds }}
+             periodSeconds: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.periodSeconds }}
++            timeoutSeconds: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.timeoutSeconds }}
++            failureThreshold: {{ .Values.apps.jupyterhub.proxy.chp.livenessProbe.failureThreshold }}
+             httpGet:
+               path: /_chp_healthz
+               {{- if or $manualHTTPS $manualHTTPSwithsecret }}
+@@ -149,6 +157,8 @@ spec:
+           readinessProbe:
+             initialDelaySeconds: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.initialDelaySeconds }}
+             periodSeconds: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.periodSeconds }}
++            timeoutSeconds: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.timeoutSeconds }}
++            failureThreshold: {{ .Values.apps.jupyterhub.proxy.chp.readinessProbe.failureThreshold }}
+             httpGet:
+               path: /_chp_healthz
+               {{- if or $manualHTTPS $manualHTTPSwithsecret }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/netpol.yaml b/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
+index adc8277..88a00be 100755
+--- a/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
++++ b/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
+@@ -85,32 +85,24 @@ spec:
+ 
+   egress:
+     # proxy --> hub
+-    - ports:
+-        - port: 8081
+-      to:
++    - to:
+         - podSelector:
+             matchLabels:
+               {{- $_ := merge (dict "componentLabel" "hub") . }}
+               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8081
+ 
+     # proxy --> singleuser-server
+-    - ports:
+-        - port: 8888
+-      to:
++    - to:
+         - podSelector:
+             matchLabels:
+               {{- $_ := merge (dict "componentLabel" "singleuser-server") . }}
+               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8888
+ 
+-    # proxy --> Kubernetes internal DNS
+-    - ports:
+-      - protocol: UDP
+-        port: 53
+-      - protocol: TCP
+-        port: 53
+-
+-    {{- with .Values.apps.jupyterhub.proxy.chp.networkPolicy.egress }}
+-    # proxy --> depends, but the default is everything
+-    {{- . | toYaml | nindent 4 }}
++    {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.proxy.chp.networkPolicy)) }}
++    {{- . | nindent 4 }}
+     {{- end }}
+ {{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/pdb.yaml b/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
+index 1846a3b..155895b 100755
+--- a/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
++++ b/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
+@@ -1,9 +1,5 @@
+ {{- if .Values.apps.jupyterhub.proxy.chp.pdb.enabled -}}
+-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+ apiVersion: policy/v1
+-{{- else }}
+-apiVersion: policy/v1beta1
+-{{- end }}
+ kind: PodDisruptionBudget
+ metadata:
+   name: {{ include "jupyterhub.proxy.fullname" . }}
+diff --git a/applications/jupyterhub/deploy/templates/proxy/service.yaml b/applications/jupyterhub/deploy/templates/proxy/service.yaml
+index 0d9ca5b..f634ba9 100755
+--- a/applications/jupyterhub/deploy/templates/proxy/service.yaml
++++ b/applications/jupyterhub/deploy/templates/proxy/service.yaml
+@@ -35,12 +35,15 @@ metadata:
+   {{- end }}
+ spec:
+   selector:
++    # This service will target the autohttps pod if autohttps is configured, and
++    # the proxy pod if not. When autohttps is configured, the service proxy-http
++    # will be around to target the proxy pod directly.
+     {{- if $autoHTTPS }}
+-    component: autohttps
++    {{- $_ := merge (dict "componentLabel" "autohttps") . -}}
++    {{- include "jupyterhub.matchLabels" $_ | nindent 4 }}
+     {{- else }}
+-    component: proxy
++    {{- include "jupyterhub.matchLabels" . | nindent 4 }}
+     {{- end }}
+-    release: {{ .Release.Name }}
+   ports:
+     {{- if $HTTPS }}
+     - name: https
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml b/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
+index 588cf19..1bed905 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
+@@ -4,22 +4,9 @@ kind: PriorityClass
+ metadata:
+   name: {{ include "jupyterhub.priority.fullname" . }}
+   annotations:
+-    # FIXME: PriorityClasses must be added before the other resources reference
+-    #        them, and in the past a workaround was needed to accomplish this:
+-    #        to make the resource a Helm hook.
+-    #
+-    #        To transition this resource to no longer be a Helm hook resource,
+-    #        we explicitly add ownership annotations/labels (in 1.0.0) which
+-    #        will allow a future upgrade (in 2.0.0) to remove all hook and
+-    #        ownership annotations/labels.
+-    #
+-    helm.sh/hook: pre-install,pre-upgrade
+-    helm.sh/hook-delete-policy: before-hook-creation
+-    helm.sh/hook-weight: "-100"
+     meta.helm.sh/release-name: "{{ .Release.Name }}"
+     meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
+   labels:
+-    app.kubernetes.io/managed-by: Helm
+     {{- $_ := merge (dict "componentLabel" "default-priority") . }}
+     {{- include "jupyterhub.labels" $_ | nindent 4 }}
+ value: {{ .Values.apps.jupyterhub.scheduling.podPriority.defaultPriority }}
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
+index b1dc6c5..800ac20 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
+@@ -3,11 +3,7 @@ The cluster autoscaler should be allowed to evict and reschedule these pods if
+ it would help in order to scale down a node.
+ */}}
+ {{- if .Values.apps.jupyterhub.scheduling.userPlaceholder.enabled -}}
+-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+ apiVersion: policy/v1
+-{{- else }}
+-apiVersion: policy/v1beta1
+-{{- end }}
+ kind: PodDisruptionBudget
+ metadata:
+   name: {{ include "jupyterhub.user-placeholder.fullname" . }}
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
+index e03497d..688e217 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
+@@ -5,22 +5,9 @@ kind: PriorityClass
+ metadata:
+   name: {{ include "jupyterhub.user-placeholder-priority.fullname" . }}
+   annotations:
+-    # FIXME: PriorityClasses must be added before the other resources reference
+-    #        them, and in the past a workaround was needed to accomplish this:
+-    #        to make the resource a Helm hook.
+-    #
+-    #        To transition this resource to no longer be a Helm hook resource,
+-    #        we explicitly add ownership annotations/labels (in 1.0.0) which
+-    #        will allow a future upgrade (in 2.0.0) to remove all hook and
+-    #        ownership annotations/labels.
+-    #
+-    helm.sh/hook: pre-install,pre-upgrade
+-    helm.sh/hook-delete-policy: before-hook-creation
+-    helm.sh/hook-weight: "-100"
+     meta.helm.sh/release-name: "{{ .Release.Name }}"
+     meta.helm.sh/release-namespace: "{{ .Release.Namespace }}"
+   labels:
+-    app.kubernetes.io/managed-by: Helm
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ value: {{ .Values.apps.jupyterhub.scheduling.podPriority.userPlaceholderPriority }}
+ globalDefault: false
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
+index 114f626..c243bee 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
+@@ -16,6 +16,9 @@ metadata:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ spec:
+   podManagementPolicy: Parallel
++  {{- if typeIs "int" .Values.apps.jupyterhub.scheduling.userPlaceholder.revisionHistoryLimit }}
++  revisionHistoryLimit: {{ .Values.apps.jupyterhub.scheduling.userPlaceholder.revisionHistoryLimit }}
++  {{- end }}
+   replicas: {{ .Values.apps.jupyterhub.scheduling.userPlaceholder.replicas }}
+   selector:
+     matchLabels:
+@@ -23,9 +26,16 @@ spec:
+   serviceName: {{ include "jupyterhub.user-placeholder.fullname" . }}
+   template:
+     metadata:
++      {{- with .Values.apps.jupyterhub.scheduling.userPlaceholder.annotations }}
++      annotations:
++        {{- . | toYaml | nindent 8 }}
++      {{- end }}
+       labels:
+         {{- /* Changes here will cause the Deployment to restart the pods. */}}
+         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
++        {{- with .Values.apps.jupyterhub.scheduling.userPlaceholder.labels }}
++        {{- . | toYaml | nindent 8 }}
++        {{- end }}
+     spec:
+       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+       priorityClassName: {{ include "jupyterhub.user-placeholder-priority.fullname" . }}
+@@ -33,7 +43,10 @@ spec:
+       {{- if .Values.apps.jupyterhub.scheduling.userScheduler.enabled }}
+       schedulerName: {{ include "jupyterhub.user-scheduler.fullname" . }}
+       {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.singleuser.nodeSelector }}
++      {{- with .Values.apps.jupyterhub.singleuser.nodeSelector }}
++      nodeSelector:
++        {{- . | toYaml | nindent 8 }}
++      {{- end }}
+       {{- with concat .Values.apps.jupyterhub.scheduling.userPods.tolerations .Values.apps.jupyterhub.singleuser.extraTolerations }}
+       tolerations:
+         {{- . | toYaml | nindent 8 }}
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
+index ef8a37f..3e83b44 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
+@@ -6,16 +6,28 @@ metadata:
+   labels:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ data:
+-  # ref: https://kubernetes.io/docs/reference/scheduling/config/
++  {{- /*
++    This is configuration of a k8s official kube-scheduler binary running in the
++    user-scheduler.
++
++    ref: https://kubernetes.io/docs/reference/scheduling/config/
++    ref: https://kubernetes.io/docs/reference/config-api/kube-scheduler-config.v1/
++  */}}
+   config.yaml: |
+-    apiVersion: kubescheduler.config.k8s.io/v1beta1
++    apiVersion: kubescheduler.config.k8s.io/v1
+     kind: KubeSchedulerConfiguration
+     leaderElection:
+-      resourceLock: endpoints
++      resourceLock: leases
+       resourceName: {{ include "jupyterhub.user-scheduler-lock.fullname" . }}
+       resourceNamespace: "{{ .Release.Namespace }}"
+     profiles:
+       - schedulerName: {{ include "jupyterhub.user-scheduler.fullname" . }}
++        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.plugins }}
+         plugins:
+-          {{- .Values.apps.jupyterhub.scheduling.userScheduler.plugins | toYaml | nindent 10 }}
++          {{- . | toYaml | nindent 10 }}
++        {{- end }}
++        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.pluginConfig }}
++        pluginConfig:
++          {{- . | toYaml | nindent 10 }}
++        {{- end }}
+ {{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
+index 1bcaf31..f22d0de 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
+@@ -6,6 +6,9 @@ metadata:
+   labels:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ spec:
++  {{- if typeIs "int" .Values.apps.jupyterhub.scheduling.userScheduler.revisionHistoryLimit }}
++  revisionHistoryLimit: {{ .Values.apps.jupyterhub.scheduling.userScheduler.revisionHistoryLimit }}
++  {{- end }}
+   replicas: {{ .Values.apps.jupyterhub.scheduling.userScheduler.replicas }}
+   selector:
+     matchLabels:
+@@ -14,16 +17,25 @@ spec:
+     metadata:
+       labels:
+         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
++        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.labels }}
++        {{- . | toYaml | nindent 8 }}
++        {{- end }}
+       annotations:
+         checksum/config-map: {{ include (print $.Template.BasePath "/jupyterhub/scheduling/user-scheduler/configmap.yaml") . | sha256sum }}
++        {{- with .Values.apps.jupyterhub.scheduling.userScheduler.annotations }}
++        {{- . | toYaml | nindent 8 }}
++        {{- end }}
+     spec:
+-      {{- if .Values.apps.jupyterhub.rbac.enabled }}
+-      serviceAccountName: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
++      {{ with include "jupyterhub.user-scheduler-serviceaccount.fullname" . }}
++      serviceAccountName: {{ . }}
+       {{- end }}
+       {{- if .Values.apps.jupyterhub.scheduling.podPriority.enabled }}
+       priorityClassName: {{ include "jupyterhub.priority.fullname" . }}
+       {{- end }}
+-      nodeSelector: {{ toJson .Values.apps.jupyterhub.scheduling.userScheduler.nodeSelector }}
++      {{- with .Values.apps.jupyterhub.scheduling.userScheduler.nodeSelector }}
++      nodeSelector:
++        {{- . | toYaml | nindent 8 }}
++      {{- end }}
+       {{- with concat .Values.apps.jupyterhub.scheduling.corePods.tolerations .Values.apps.jupyterhub.scheduling.userScheduler.tolerations }}
+       tolerations:
+         {{- . | toYaml | nindent 8 }}
+@@ -44,13 +56,6 @@ spec:
+           {{- end }}
+           command:
+             - /usr/local/bin/kube-scheduler
+-            # NOTE: --leader-elect-... (new) and --lock-object-... (deprecated)
+-            #       flags are silently ignored in favor of whats defined in the
+-            #       passed KubeSchedulerConfiguration whenever --config is
+-            #       passed.
+-            #
+-            # ref: https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler/
+-            #
+             # NOTE: --authentication-skip-lookup=true is used to avoid a
+             #       seemingly harmless error, if we need to not skip
+             #       "authentication lookup" in the future, see the linked issue.
+@@ -65,12 +70,14 @@ spec:
+           livenessProbe:
+             httpGet:
+               path: /healthz
+-              port: 10251
++              scheme: HTTPS
++              port: 10259
+             initialDelaySeconds: 15
+           readinessProbe:
+             httpGet:
+               path: /healthz
+-              port: 10251
++              scheme: HTTPS
++              port: 10259
+           {{- with .Values.apps.jupyterhub.scheduling.userScheduler.resources }}
+           resources:
+             {{- . | toYaml | nindent 12 }}
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
+index 04f2af8..2c9c6de 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
+@@ -1,9 +1,5 @@
+ {{- if and .Values.apps.jupyterhub.scheduling.userScheduler.enabled .Values.apps.jupyterhub.scheduling.userScheduler.pdb.enabled -}}
+-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+ apiVersion: policy/v1
+-{{- else }}
+-apiVersion: policy/v1beta1
+-{{- end }}
+ kind: PodDisruptionBudget
+ metadata:
+   name: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
+index 083e065..9c7fab7 100755
+--- a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
+@@ -1,16 +1,5 @@
+ {{- if .Values.apps.jupyterhub.scheduling.userScheduler.enabled -}}
+-{{- if .Values.apps.jupyterhub.rbac.enabled }}
+-apiVersion: v1
+-kind: ServiceAccount
+-metadata:
+-  name: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
+-  labels:
+-    {{- include "jupyterhub.labels" . | nindent 4 }}
+-  {{- with .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.annotations }}
+-  annotations:
+-    {{- . | toYaml | nindent 4 }}
+-  {{- end }}
+----
++{{- if .Values.apps.jupyterhub.rbac.create -}}
+ kind: ClusterRole
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+@@ -19,13 +8,23 @@ metadata:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ rules:
+   # Copied from the system:kube-scheduler ClusterRole of the k8s version
+-  # matching the kube-scheduler binary we use. A modification of two resource
+-  # name references from kube-scheduler to user-scheduler-lock was made.
++  # matching the kube-scheduler binary we use. A modification has been made to
++  # resourceName fields to remain relevant for how we have named our resources
++  # in this Helm chart.
+   #
+-  # NOTE: These rules have been unchanged between 1.12 and 1.15, then changed in
+-  #       1.16 and in 1.17, but unchanged in 1.18 and 1.19.
++  # NOTE: These rules have been:
++  #       - unchanged between 1.12 and 1.15
++  #       - changed in 1.16
++  #       - changed in 1.17
++  #       - unchanged between 1.18 and 1.20
++  #       - changed in 1.21: get/list/watch permission for namespace,
++  #                          csidrivers, csistoragecapacities was added.
++  #       - unchanged between 1.22 and 1.27
++  #       - changed in 1.28: permissions to get/update lock endpoint resource
++  #                          removed
++  #       - unchanged between 1.28 and 1.29
+   #
+-  # ref: https://github.com/kubernetes/kubernetes/blob/v1.19.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L696-L829
++  # ref: https://github.com/kubernetes/kubernetes/blob/v1.29.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L721-L862
+   - apiGroups:
+     - ""
+     - events.k8s.io
+@@ -50,21 +49,6 @@ rules:
+     verbs:
+     - get
+     - update
+-  - apiGroups:
+-    - ""
+-    resources:
+-    - endpoints
+-    verbs:
+-    - create
+-  - apiGroups:
+-    - ""
+-    resourceNames:
+-    - {{ include "jupyterhub.user-scheduler-lock.fullname" . }}
+-    resources:
+-    - endpoints
+-    verbs:
+-    - get
+-    - update
+   - apiGroups:
+     - ""
+     resources:
+@@ -159,13 +143,37 @@ rules:
+     - get
+     - list
+     - watch
++  - apiGroups:
++    - ""
++    resources:
++    - namespaces
++    verbs:
++    - get
++    - list
++    - watch
++  - apiGroups:
++    - storage.k8s.io
++    resources:
++    - csidrivers
++    verbs:
++    - get
++    - list
++    - watch
++  - apiGroups:
++    - storage.k8s.io
++    resources:
++    - csistoragecapacities
++    verbs:
++    - get
++    - list
++    - watch
+ 
+   # Copied from the system:volume-scheduler ClusterRole of the k8s version
+   # matching the kube-scheduler binary we use.
+   #
+-  # NOTE: These rules have not changed between 1.12 and 1.19.
++  # NOTE: These rules have not changed between 1.12 and 1.29.
+   #
+-  # ref: https://github.com/kubernetes/kubernetes/blob/v1.19.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L1213-L1240
++  # ref: https://github.com/kubernetes/kubernetes/blob/v1.29.0/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml#L1283-L1310
+   - apiGroups:
+     - ""
+     resources:
+@@ -203,7 +211,7 @@ metadata:
+     {{- include "jupyterhub.labels" . | nindent 4 }}
+ subjects:
+   - kind: ServiceAccount
+-    name: {{ include "jupyterhub.user-scheduler-deploy.fullname" . }}
++    name: {{ include "jupyterhub.user-scheduler-serviceaccount.fullname" . }}
+     namespace: "{{ .Release.Namespace }}"
+ roleRef:
+   kind: ClusterRole
+diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml
+new file mode 100644
+index 0000000..67618b0
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/serviceaccount.yaml
+@@ -0,0 +1,14 @@
++{{- if .Values.apps.jupyterhub.scheduling.userScheduler.enabled -}}
++{{- if .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.create -}}
++apiVersion: v1
++kind: ServiceAccount
++metadata:
++  name: {{ include "jupyterhub.user-scheduler-serviceaccount.fullname" . }}
++  labels:
++    {{- include "jupyterhub.labels" . | nindent 4 }}
++  {{- with .Values.apps.jupyterhub.scheduling.userScheduler.serviceAccount.annotations }}
++  annotations:
++    {{- . | toYaml | nindent 4 }}
++  {{- end }}
++{{- end }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml b/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
+index 3dfb137..931a150 100755
+--- a/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
++++ b/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
+@@ -62,23 +62,38 @@ spec:
+ 
+   egress:
+     # singleuser-server --> hub
+-    - ports:
+-        - port: 8081
+-      to:
++    - to:
+         - podSelector:
+             matchLabels:
+               {{- $_ := merge (dict "componentLabel" "hub") . }}
+               {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8081
+ 
+-    # singleuser-server --> Kubernetes internal DNS
+-    - ports:
+-        - protocol: UDP
+-          port: 53
+-        - protocol: TCP
+-          port: 53
++    # singleuser-server --> proxy
++    # singleuser-server --> autohttps
++    #
++    # While not critical for core functionality, a user or library code may rely
++    # on communicating with the proxy or autohttps pods via a k8s Service it can
++    # detected from well known environment variables.
++    #
++    - to:
++        - podSelector:
++            matchLabels:
++              {{- $_ := merge (dict "componentLabel" "proxy") . }}
++              {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8000
++    - to:
++        - podSelector:
++            matchLabels:
++              {{- $_ := merge (dict "componentLabel" "autohttps") . }}
++              {{- include "jupyterhub.matchLabels" $_ | nindent 14 }}
++      ports:
++        - port: 8080
++        - port: 8443
+ 
+-    {{- with .Values.apps.jupyterhub.singleuser.networkPolicy.egress }}
+-    # singleuser-server --> depends, but the default is everything
+-    {{- . | toYaml | nindent 4 }}
++    {{- with (include "jupyterhub.networkPolicy.renderEgressRules" (list . .Values.apps.jupyterhub.singleuser.networkPolicy)) }}
++    {{- . | nindent 4 }}
+     {{- end }}
+ {{- end }}
+diff --git a/applications/jupyterhub/deploy/templates/singleuser/secret.yaml b/applications/jupyterhub/deploy/templates/singleuser/secret.yaml
+new file mode 100644
+index 0000000..e6eab9b
+--- /dev/null
++++ b/applications/jupyterhub/deploy/templates/singleuser/secret.yaml
+@@ -0,0 +1,17 @@
++{{- if .Values.apps.jupyterhub.singleuser.extraFiles }}
++kind: Secret
++apiVersion: v1
++metadata:
++  name: {{ include "jupyterhub.singleuser.fullname" . }}
++  labels:
++    {{- include "jupyterhub.labels" . | nindent 4 }}
++type: Opaque
++{{- with include "jupyterhub.extraFiles.data" .Values.apps.jupyterhub.singleuser.extraFiles }}
++data:
++  {{- . | nindent 2 }}
++{{- end }}
++{{- with include "jupyterhub.extraFiles.stringData" .Values.apps.jupyterhub.singleuser.extraFiles }}
++stringData:
++  {{- . | nindent 2 }}
++{{- end }}
++{{- end }}
+diff --git a/applications/jupyterhub/deploy/values.schema.yaml b/applications/jupyterhub/deploy/values.schema.yaml
+new file mode 100644
+index 0000000..69c13a8
+--- /dev/null
++++ b/applications/jupyterhub/deploy/values.schema.yaml
+@@ -0,0 +1,3014 @@
++# This schema (a jsonschema in YAML format) is used to generate
++# values.schema.json which is packaged with the Helm chart for client side
++# validation by helm of values before template rendering.
++#
++# This schema is also used by our documentation system to build the
++# configuration reference section based on the description fields. See
++# docs/source/conf.py for that logic!
++#
++# We look to document everything we have default values for in values.yaml, but
++# we don't look to enforce the perfect validation logic within this file.
++#
++# ref: https://json-schema.org/learn/getting-started-step-by-step.html
++#
++$schema: http://json-schema.org/draft-07/schema#
++type: object
++additionalProperties: false
++required:
++  - imagePullSecrets
++  - hub
++  - proxy
++  - singleuser
++  - ingress
++  - prePuller
++  - custom
++  - cull
++  - debug
++  - rbac
++  - global
++properties:
++  enabled:
++    type: [boolean, "null"]
++    description: |
++      `enabled` is ignored by the jupyterhub chart itself, but a chart depending
++      on the jupyterhub chart conditionally can make use this config option as
++      the condition.
++  fullnameOverride:
++    type: [string, "null"]
++    description: |
++      fullnameOverride and nameOverride allow you to adjust how the resources
++      part of the Helm chart are named.
++
++      Name format               | Resource types | fullnameOverride | nameOverride | Note
++      ------------------------- | -------------- | ---------------- | ------------ | -
++      component                 | namespaced     | `""`             | *            | Default
++      release-component         | cluster wide   | `""`             | *            | Default
++      fullname-component        | *              | str              | *            | -
++      release-component         | *              | null             | `""`         | -
++      release-(name-)component  | *              | null             | str          | omitted if contained in release
++      release-(chart-)component | *              | null             | null         | omitted if contained in release
++
++      ```{admonition} Warning!
++      :class: warning
++      Changing fullnameOverride or nameOverride after the initial installation
++      of the chart isn't supported. Changing their values likely leads to a
++      reset of non-external JupyterHub databases, abandonment of users' storage,
++      and severed couplings to currently running user pods.
++      ```
++
++      If you are a developer of a chart depending on this chart, you should
++      avoid hardcoding names. If you want to reference the name of a resource in
++      this chart from a parent helm chart's template, you can make use of the
++      global named templates instead.
++
++      ```yaml
++      # some pod definition of a parent chart helm template
++      schedulerName: {{ include "jupyterhub.user-scheduler.fullname" . }}
++      ```
++
++      To access them from a container, you can also rely on the hub ConfigMap
++      that contains entries of all the resource names.
++
++      ```yaml
++      # some container definition in a parent chart helm template
++      env:
++        - name: SCHEDULER_NAME
++          valueFrom:
++            configMapKeyRef:
++              name: {{ include "jupyterhub.user-scheduler.fullname" . }}
++              key: user-scheduler
++      ```
++
++  nameOverride:
++    type: [string, "null"]
++    description: |
++      See the documentation under [`fullnameOverride`](schema_fullnameOverride).
++
++  imagePullSecret:
++    type: object
++    required: [create]
++    if:
++      properties:
++        create:
++          const: true
++    then:
++      additionalProperties: false
++      required: [registry, username, password]
++      description: |
++        This is configuration to create a k8s Secret resource of `type:
++        kubernetes.io/dockerconfigjson`, with credentials to pull images from a
++        private image registry. If you opt to do so, it will be available for use
++        by all pods in their respective `spec.imagePullSecrets` alongside other
++        k8s Secrets defined in `imagePullSecrets` or the pod respective
++        `...image.pullSecrets` configuration.
++
++        In other words, using this configuration option can automate both the
++        otherwise manual creation of a k8s Secret and the otherwise manual
++        configuration to reference this k8s Secret in all the pods of the Helm
++        chart.
++
++        ```sh
++        # you won't need to create a k8s Secret manually...
++        kubectl create secret docker-registry image-pull-secret \
++          --docker-server=<REGISTRY> \
++          --docker-username=<USERNAME> \
++          --docker-email=<EMAIL> \
++          --docker-password=<PASSWORD>
++        ```
++
++        If you just want to let all Pods reference an existing secret, use the
++        [`imagePullSecrets`](schema_imagePullSecrets) configuration instead.
++      properties:
++        create:
++          type: boolean
++          description: |
++            Toggle the creation of the k8s Secret with provided credentials to
++            access a private image registry.
++        automaticReferenceInjection:
++          type: boolean
++          description: |
++            Toggle the automatic reference injection of the created Secret to all
++            pods' `spec.imagePullSecrets` configuration.
++        registry:
++          type: string
++          description: |
++            Name of the private registry you want to create a credential set for.
++            It will default to Docker Hub's image registry.
++
++            Examples:
++              - https://index.docker.io/v1/
++              - quay.io
++              - eu.gcr.io
++              - alexmorreale.privatereg.net
++        username:
++          type: string
++          description: |
++            Name of the user you want to use to connect to your private registry.
++
++            For external gcr.io, you will use the `_json_key`.
++
++            Examples:
++              - alexmorreale
++              - alex@pfc.com
++              - _json_key
++        password:
++          type: string
++          description: |
++            Password for the private image registry's user.
++
++            Examples:
++              - plaintextpassword
++              - abc123SECRETzyx098
++
++            For gcr.io registries the password will be a big JSON blob for a
++            Google cloud service account, it should look something like below.
++
++            ```yaml
++            password: |-
++              {
++                "type": "service_account",
++                "project_id": "jupyter-se",
++                "private_key_id": "f2ba09118a8d3123b3321bd9a7d6d0d9dc6fdb85",
++                ...
++              }
++            ```
++        email:
++          type: [string, "null"]
++          description: |
++            Specification of an email is most often not required, but it is
++            supported.
++
++  imagePullSecrets:
++    type: array
++    description: |
++      Chart wide configuration to _append_ k8s Secret references to all its
++      pod's `spec.imagePullSecrets` configuration.
++
++      This will not override or get overridden by pod specific configuration,
++      but instead augment the pod specific configuration.
++
++      You can use both the k8s native syntax, where each list element is like
++      `{"name": "my-secret-name"}`, or you can let list elements be strings
++      naming the secrets directly.
++
++  hub:
++    type: object
++    additionalProperties: false
++    required: [baseUrl]
++    properties:
++      revisionHistoryLimit: &revisionHistoryLimit
++        type: [integer, "null"]
++        minimum: 0
++        description: |
++          Configures the resource's `spec.revisionHistoryLimit`. This is
++          available for Deployment, StatefulSet, and DaemonSet resources.
++
++          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#revision-history-limit)
++          for more info.
++      config:
++        type: object
++        additionalProperties: true
++        description: |
++          JupyterHub and its components (authenticators, spawners, etc), are
++          Python classes that expose its configuration through
++          [_traitlets_](https://traitlets.readthedocs.io/en/stable/). With this
++          Helm chart configuration (`hub.config`), you can directly configure
++          the Python classes through _static_ YAML values. To _dynamically_ set
++          values, you need to use [`hub.extraConfig`](schema_hub.extraConfig)
++          instead.
++
++          ```{admonition} Currently intended only for auth config
++          :class: warning
++          This config _currently_ (0.11.0) only influence the software in the
++          `hub` Pod, but some Helm chart config options such as
++          [`hub.baseUrl`](schema_hub.baseUrl) is used to set
++          `JupyterHub.base_url` in the `hub` Pod _and_ influence how other Helm
++          templates are rendered.
++
++          As we have not yet mapped out all the potential configuration
++          conflicts except for the authentication related configuration options,
++          please accept that using it for something else at this point can lead
++          to issues.
++          ```
++
++          __Example__
++
++          If you inspect documentation or some `jupyterhub_config.py` to contain
++          the following section:
++
++          ```python
++          c.JupyterHub.admin_access = true
++          c.JupyterHub.admin_users = ["jovyan1", "jovyan2"]
++          c.KubeSpawner.k8s_api_request_timeout = 10
++          c.GitHubOAuthenticator.allowed_organizations = ["jupyterhub"]
++          ```
++
++          Then, you would be able to represent it with this configuration like:
++
++          ```yaml
++          hub:
++            config:
++              JupyterHub:
++                admin_access: true
++                admin_users:
++                  - jovyan1
++                  - jovyan2
++              KubeSpawner:
++                k8s_api_request_timeout: 10
++              GitHubOAuthenticator:
++                allowed_organizations:
++                  - jupyterhub
++          ```
++
++          ```{admonition} YAML limitations
++          :class: tip
++          You can't represent Python `Bytes` or `Set` objects in YAML directly.
++          ```
++
++          ```{admonition} Helm value merging
++          :class: tip
++          `helm` merges a Helm chart's default values with values passed with
++          the `--values` or `-f` flag. During merging, lists are replaced while
++          dictionaries are updated.
++          ```
++      extraFiles: &extraFiles
++        type: object
++        additionalProperties: false
++        description: |
++          A dictionary with extra files to be injected into the pod's container
++          on startup. This can for example be used to inject: configuration
++          files, custom user interface templates, images, and more.
++
++          ```yaml
++          # NOTE: "hub" is used in this example, but the configuration is the
++          #       same for "singleuser".
++          hub:
++            extraFiles:
++              # The file key is just a reference that doesn't influence the
++              # actual file name.
++              <file key>:
++                # mountPath is required and must be the absolute file path.
++                mountPath: <full file path>
++
++                # Choose one out of the three ways to represent the actual file
++                # content: data, stringData, or binaryData.
++                #
++                # data should be set to a mapping (dictionary). It will in the
++                # end be rendered to either YAML, JSON, or TOML based on the
++                # filename extension that are required to be either .yaml, .yml,
++                # .json, or .toml.
++                #
++                # If your content is YAML, JSON, or TOML, it can make sense to
++                # use data to represent it over stringData as data can be merged
++                # instead of replaced if set partially from separate Helm
++                # configuration files.
++                #
++                # Both stringData and binaryData should be set to a string
++                # representing the content, where binaryData should be the
++                # base64 encoding of the actual file content.
++                #
++                data:
++                  myConfig:
++                    myMap:
++                      number: 123
++                      string: "hi"
++                    myList:
++                      - 1
++                      - 2
++                stringData: |
++                  hello world!
++                binaryData: aGVsbG8gd29ybGQhCg==
++
++                # mode is by default 0644 and you can optionally override it
++                # either by octal notation (example: 0400) or decimal notation
++                # (example: 256).
++                mode: <file system permissions>
++          ```
++
++          **Using --set-file**
++
++          To avoid embedding entire files in the Helm chart configuration, you
++          can use the `--set-file` flag during `helm upgrade` to set the
++          stringData or binaryData field.
++
++          ```yaml
++          hub:
++            extraFiles:
++              my_image:
++                mountPath: /usr/local/share/jupyterhub/static/my_image.png
++
++              # Files in /usr/local/etc/jupyterhub/jupyterhub_config.d are
++              # automatically loaded in alphabetical order of the final file
++              # name when JupyterHub starts.
++              my_config:
++                mountPath: /usr/local/etc/jupyterhub/jupyterhub_config.d/my_jupyterhub_config.py
++          ```
++
++          ```bash
++          # --set-file expects a text based file, so you need to base64 encode
++          # it manually first.
++          base64 my_image.png > my_image.png.b64
++
++          helm upgrade <...> \
++              --set-file hub.extraFiles.my_image.binaryData=./my_image.png.b64 \
++              --set-file hub.extraFiles.my_config.stringData=./my_jupyterhub_config.py
++          ```
++
++          **Common uses**
++
++          1. **JupyterHub template customization**
++
++             You can replace the default JupyterHub user interface templates in
++             the hub pod by injecting new ones to
++             `/usr/local/share/jupyterhub/templates`. These can in turn
++             reference custom images injected to
++             `/usr/local/share/jupyterhub/static`.
++
++          1. **JupyterHub standalone file config**
++
++             Instead of embedding JupyterHub python configuration as a string
++             within a YAML file through
++             [`hub.extraConfig`](schema_hub.extraConfig), you can inject a
++             standalone .py file into
++             `/usr/local/etc/jupyterhub/jupyterhub_config.d` that is
++             automatically loaded.
++
++          1. **Flexible configuration**
++
++             By injecting files, you don't have to embed them in a docker image
++             that you have to rebuild.
++
++             If your configuration file is a YAML/JSON/TOML file, you can also
++             use `data` instead of `stringData` which allow you to set various
++             configuration in separate Helm config files. This can be useful to
++             help dependent charts override only some configuration part of the
++             file, or to allow for the configuration be set through multiple
++             Helm configuration files.
++
++          **Limitations**
++
++          1. File size
++
++             The files in `hub.extraFiles` and `singleuser.extraFiles` are
++             respectively stored in their own k8s Secret resource. As k8s
++             Secret's are limited, typically to 1MB, you will be limited to a
++             total file size of less than 1MB as there is also base64 encoding
++             that takes place reducing available capacity to 75%.
++
++          2. File updates
++
++             The files that are mounted are only set during container startup.
++             This is [because we use
++             `subPath`](https://kubernetes.io/docs/concepts/storage/volumes/#secret)
++             as is required to avoid replacing the content of the entire
++             directory we mount in.
++        patternProperties:
++          ".*":
++            type: object
++            additionalProperties: false
++            required: [mountPath]
++            oneOf:
++              - required: [data]
++              - required: [stringData]
++              - required: [binaryData]
++            properties:
++              mountPath:
++                type: string
++              data:
++                type: object
++                additionalProperties: true
++              stringData:
++                type: string
++              binaryData:
++                type: string
++              mode:
++                type: number
++      baseUrl:
++        type: string
++        description: |
++          This is the equivalent of c.JupyterHub.base_url, but it is also needed
++          by the Helm chart in general. So, instead of setting
++          c.JupyterHub.base_url, use this configuration.
++      command:
++        type: array
++        description: |
++          A list of strings to be used to replace the JupyterHub image's
++          `ENTRYPOINT` entry. Note that in k8s lingo, the Dockerfile's
++          `ENTRYPOINT` is called `command`. The list of strings will be expanded
++          with Helm's template function `tpl` which can render Helm template
++          logic inside curly braces (`{{... }}`).
++
++          This could be useful to wrap the invocation of JupyterHub itself in
++          some custom way.
++
++          For more details, see the [Kubernetes
++          documentation](https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/).
++      args:
++        type: array
++        description: |
++          A list of strings to be used to replace the JupyterHub image's `CMD`
++          entry as well as the Helm chart's default way to start JupyterHub.
++          Note that in k8s lingo, the Dockerfile's `CMD` is called `args`. The
++          list of strings will be expanded with Helm's template function `tpl`
++          which can render Helm template logic inside curly braces (`{{... }}`).
++
++          ```{warning}
++          By replacing the entire configuration file, which is mounted to
++          `/usr/local/etc/jupyterhub/jupyterhub_config.py` by the Helm chart,
++          instead of appending to it with `hub.extraConfig`, you expose your
++          deployment for issues stemming from getting out of sync with the Helm
++          chart's config file.
++
++          These kind of issues will be significantly harder to debug and
++          diagnose, and can due to this could cause a lot of time expenditure
++          for both the community maintaining the Helm chart as well as yourself,
++          even if this wasn't the reason for the issue.
++
++          Due to this, we ask that you do your _absolute best to avoid replacing
++          the default provided `jupyterhub_config.py` file. It can often be
++          possible. For example, if your goal is to have a dedicated .py file
++          for more extensive additions that you can syntax highlight and such
++          and feel limited by passing code in `hub.extraConfig` which is part of
++          a YAML file, you can use [this
++          trick](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/issues/1580#issuecomment-707776237)
++          instead.
++          ```
++
++          ```yaml
++          hub:
++            args:
++              - "jupyterhub"
++              - "--config"
++              - "/usr/local/etc/jupyterhub/jupyterhub_config.py"
++              - "--debug"
++              - "--upgrade-db"
++          ```
++
++          For more details, see the [Kubernetes
++          documentation](https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/).
++      cookieSecret:
++        type: [string, "null"]
++        description: |
++          ```{note}
++          As of version 1.0.0 this will automatically be generated and there is
++          no need to set it manually.
++
++          If you wish to reset a generated key, you can use `kubectl edit` on
++          the k8s Secret typically named `hub` and remove the
++          `hub.config.JupyterHub.cookie_secret` entry in the k8s Secret, then
++          perform a new `helm upgrade`.
++          ```
++
++          A 32-byte cryptographically secure randomly generated string used to sign values of
++          secure cookies set by the hub. If unset, jupyterhub will generate one on startup and
++          save it in the file `jupyterhub_cookie_secret` in the `/srv/jupyterhub` directory of
++          the hub container. A value set here will make JupyterHub overwrite any previous file.
++
++          You do not need to set this at all if you are using the default configuration for
++          storing databases - sqlite on a persistent volume (with `hub.db.type` set to the
++          default `sqlite-pvc`). If you are using an external database, then you must set this
++          value explicitly - or your users will keep getting logged out each time the hub pod
++          restarts.
++
++          Changing this value will all user logins to be invalidated. If this secret leaks,
++          *immediately* change it to something else, or user data can be compromised
++
++          ```sh
++          # to generate a value, run
++          openssl rand -hex 32
++          ```
++      image: &image-spec
++        type: object
++        additionalProperties: false
++        required: [name, tag]
++        description: |
++          Set custom image name, tag, pullPolicy, or pullSecrets for the pod.
++        properties:
++          name:
++            type: string
++            description: |
++              The name of the image, without the tag.
++
++              ```
++              # example name
++              gcr.io/my-project/my-image
++              ```
++          tag:
++            type: string
++            description: |
++              The tag of the image to pull. This is the value following `:` in
++              complete image specifications.
++
++              ```
++              # example tags
++              v1.11.1
++              zhy270a
++              ```
++          pullPolicy:
++            enum: [null, "", IfNotPresent, Always, Never]
++            description: |
++              Configures the Pod's `spec.imagePullPolicy`.
++
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/containers/images/#updating-images)
++              for more info.
++          pullSecrets:
++            type: array
++            description: |
++              A list of references to existing Kubernetes Secrets with
++              credentials to pull the image.
++
++              This Pod's final `imagePullSecrets` k8s specification will be a
++              combination of:
++
++              1. This list of k8s Secrets, specific for this pod.
++              2. The list of k8s Secrets, for use by all pods in the Helm chart,
++                 declared in this Helm charts configuration called
++                 `imagePullSecrets`.
++              3. A k8s Secret, for use by all pods in the Helm chart, if
++                 conditionally created from image registry credentials provided
++                 under `imagePullSecret` if `imagePullSecret.create` is set to
++                 true.
++
++              ```yaml
++              # example - k8s native syntax
++              pullSecrets:
++                - name: my-k8s-secret-with-image-registry-credentials
++
++              # example - simplified syntax
++              pullSecrets:
++                - my-k8s-secret-with-image-registry-credentials
++              ```
++      networkPolicy: &networkPolicy-spec
++        type: object
++        additionalProperties: false
++        description: |
++          This configuration regards the creation and configuration of a k8s
++          _NetworkPolicy resource_.
++        properties:
++          enabled:
++            type: boolean
++            description: |
++              Toggle the creation of the NetworkPolicy resource targeting this
++              pod, and by doing so, restricting its communication to only what
++              is explicitly allowed in the NetworkPolicy.
++          ingress:
++            type: array
++            description: |
++              Additional ingress rules to add besides those that are required
++              for core functionality.
++          egress:
++            type: array
++            description: |
++              Additional egress rules to add besides those that are required for
++              core functionality and those added via
++              [`.egressAllowRules`](schema_hub.networkPolicy.egressAllowRules).
++
++              ```{versionchanged} 2.0.0
++              The default value changed from providing one very permissive rule
++              allowing all egress to providing no rule. The permissive rule is
++              still provided via
++              [`.egressAllowRules`](schema_hub.networkPolicy.egressAllowRules)
++              set to true though.
++              ```
++
++              As an example, below is a configuration that disables the more
++              broadly permissive `.privateIPs` egress allow rule for the hub
++              pod, and instead provides tightly scoped permissions to access a
++              specific k8s local service as identified by pod labels.
++
++              ```yaml
++              hub:
++                networkPolicy:
++                  egressAllowRules:
++                    privateIPs: false
++                  egress:
++                    - to:
++                        - podSelector:
++                            matchLabels:
++                              app: my-k8s-local-service
++                      ports:
++                        - protocol: TCP
++                          port: 5978
++              ```
++          egressAllowRules:
++            type: object
++            additionalProperties: false
++            description: |
++              This is a set of predefined rules that when enabled will be added
++              to the NetworkPolicy list of egress rules.
++
++              The resulting egress rules will be a composition of:
++              - rules specific for the respective pod(s) function within the
++                Helm chart
++              - rules based on enabled `egressAllowRules` flags
++              - rules explicitly specified by the user
++
++              ```{note}
++              Each flag under this configuration will not render into a
++              dedicated rule in the NetworkPolicy resource, but instead combine
++              with the other flags to a reduced set of rules to avoid a
++              performance penalty.
++              ```
++
++              ```{versionadded} 2.0.0
++              ```
++            properties:
++              cloudMetadataServer:
++                type: boolean
++                description: |
++                  Defaults to `false` for singleuser servers, but to `true` for
++                  all other network policies.
++
++                  When enabled this rule allows the respective pod(s) to
++                  establish outbound connections to the cloud metadata server.
++
++                  Note that the `nonPrivateIPs` rule is allowing all non Private
++                  IP ranges but makes an exception for the cloud metadata
++                  server, leaving this as the definitive configuration to allow
++                  access to the cloud metadata server.
++
++                  ```{versionchanged} 3.0.0
++                  This configuration is not allowed to be configured true at the
++                  same time as
++                  [`singleuser.cloudMetadata.blockWithIptables`](schema_singleuser.cloudMetadata.blockWithIptables)
++                  to avoid an ambiguous configuration.
++                  ```
++              dnsPortsCloudMetadataServer:
++                type: boolean
++                description: |
++                  Defaults to `true` for all network policies.
++
++                  When enabled this rule allows the respective pod(s) to
++                  establish outbound connections to the cloud metadata server
++                  via port 53.
++
++                  Relying on this rule for the singleuser config should go hand
++                  in hand with disabling
++                  [`singleuser.cloudMetadata.blockWithIptables`](schema_singleuser.cloudMetadata.blockWithIptables)
++                  to avoid an ambiguous configuration.
++
++                  Known situations when this rule can be relevant:
++
++                  - In GKE clusters with Cloud DNS that is reached at the
++                    cloud metadata server's non-private IP.
++
++                  ```{note}
++                  This chart doesn't know how to identify the DNS server that
++                  pods will rely on due to variations between how k8s clusters
++                  have been setup. Due to that, multiple rules are enabled by
++                  default to ensure DNS connectivity.
++                  ```
++
++                  ```{versionadded} 3.0.0
++                  ```
++              dnsPortsKubeSystemNamespace:
++                type: boolean
++                description: |
++                  Defaults to `true` for all network policies.
++
++                  When enabled this rule allows the respective pod(s) to
++                  establish outbound connections to pods in the kube-system
++                  namespace via port 53.
++
++                  Known situations when this rule can be relevant:
++
++                  - GKE, EKS, AKS, and other clusters relying directly on
++                    `kube-dns` or `coredns` pods in the `kube-system` namespace.
++
++                  ```{note}
++                  This chart doesn't know how to identify the DNS server that
++                  pods will rely on due to variations between how k8s clusters
++                  have been setup. Due to that, multiple rules are enabled by
++                  default to ensure DNS connectivity.
++                  ```
++
++                  ```{versionadded} 3.0.0
++                  ```
++              dnsPortsPrivateIPs:
++                type: boolean
++                description: |
++                  Defaults to `true` for all network policies.
++
++                  When enabled this rule allows the respective pod(s) to
++                  establish outbound connections to private IPs via port 53.
++
++                  Known situations when this rule can be relevant:
++
++                  - GKE clusters relying on a DNS server indirectly via a a node
++                    local DNS cache at an unknown private IP.
++
++                  ```{note}
++                  This chart doesn't know how to identify the DNS server that
++                  pods will rely on due to variations between how k8s clusters
++                  have been setup. Due to that, multiple rules are enabled by
++                  default to ensure DNS connectivity.
++
++                  ```{warning}
++                  This rule is not expected to work in clusters relying on
++                  Cilium to enforce the NetworkPolicy rules (includes GKE
++                  clusters with Dataplane v2), this is due to a [known
++                  limitation](https://github.com/cilium/cilium/issues/9209).
++                  ```
++              nonPrivateIPs:
++                type: boolean
++                description: |
++                  Defaults to `true` for all network policies.
++
++                  When enabled this rule allows the respective pod(s) to
++                  establish outbound connections to the non-private IP ranges
++                  with the exception of the cloud metadata server. This means
++                  respective pod(s) can establish connections to the internet
++                  but not (say) an unsecured prometheus server running in the
++                  same cluster.
++              privateIPs:
++                type: boolean
++                description: |
++                  Defaults to `false` for singleuser servers, but to `true` for
++                  all other network policies.
++
++                  Private IPs refer to the IP ranges `10.0.0.0/8`,
++                  `172.16.0.0/12`, `192.168.0.0/16`.
++
++                  When enabled this rule allows the respective pod(s) to
++                  establish outbound connections to the internal k8s cluster.
++                  This means users can access the internet but not (say) an
++                  unsecured prometheus server running in the same cluster.
++
++                  Since not all workloads in the k8s cluster may have
++                  NetworkPolicies setup to restrict their incoming connections,
++                  having this set to false can be a good defense against
++                  malicious intent from someone in control of software in these
++                  pods.
++
++                  If possible, try to avoid setting this to true as it gives
++                  broad permissions that could be specified more directly via
++                  the [`.egress`](schema_singleuser.networkPolicy.egress).
++
++                  ```{warning}
++                  This rule is not expected to work in clusters relying on
++                  Cilium to enforce the NetworkPolicy rules (includes GKE
++                  clusters with Dataplane v2), this is due to a [known
++                  limitation](https://github.com/cilium/cilium/issues/9209).
++                  ```
++          interNamespaceAccessLabels:
++            enum: [accept, ignore]
++            description: |
++              This configuration option determines if both namespaces and pods
++              in other namespaces, that have specific access labels, should be
++              accepted to allow ingress (set to `accept`), or, if the labels are
++              to be ignored when applied outside the local namespace (set to
++              `ignore`).
++
++              The available access labels for respective NetworkPolicy resources
++              are:
++
++              - `hub.jupyter.org/network-access-hub: "true"` (hub)
++              - `hub.jupyter.org/network-access-proxy-http: "true"` (proxy.chp, proxy.traefik)
++              - `hub.jupyter.org/network-access-proxy-api: "true"` (proxy.chp)
++              - `hub.jupyter.org/network-access-singleuser: "true"` (singleuser)
++          allowedIngressPorts:
++            type: array
++            description: |
++              A rule to allow ingress on these ports will be added no matter
++              what the origin of the request is. The default setting for
++              `proxy.chp` and `proxy.traefik`'s networkPolicy configuration is
++              `[http, https]`, while it is `[]` for other networkPolicies.
++
++              Note that these port names or numbers target a Pod's port name or
++              number, not a k8s Service's port name or number.
++      db:
++        type: object
++        additionalProperties: false
++        properties:
++          type:
++            enum: [sqlite-pvc, sqlite-memory, mysql, postgres, other]
++            description: |
++              Type of database backend to use for the hub database.
++
++              The Hub requires a persistent database to function, and this lets you specify
++              where it should be stored.
++
++              The various options are:
++
++              1. **sqlite-pvc**
++
++                 Use an `sqlite` database kept on a persistent volume attached to the hub.
++
++                 By default, this disk is created by the cloud provider using
++                 *dynamic provisioning* configured by a [storage
++                 class](https://kubernetes.io/docs/concepts/storage/storage-classes/).
++                 You can customize how this disk is created / attached by
++                 setting various properties under `hub.db.pvc`.
++
++                 This is the default setting, and should work well for most cloud provider
++                 deployments.
++
++              2. **sqlite-memory**
++
++                 Use an in-memory `sqlite` database. This should only be used for testing,
++                 since the database is erased whenever the hub pod restarts - causing the hub
++                 to lose all memory of users who had logged in before.
++
++                 When using this for testing, make sure you delete all other objects that the
++                 hub has created (such as user pods, user PVCs, etc) every time the hub restarts.
++                 Otherwise you might run into errors about duplicate resources.
++
++              3. **mysql**
++
++                 Use an externally hosted mysql database.
++
++                 You have to specify an sqlalchemy connection string for the mysql database you
++                 want to connect to in `hub.db.url` if using this option.
++
++                 The general format of the connection string is:
++                 ```
++                 mysql+pymysql://<db-username>:<db-password>@<db-hostname>:<db-port>/<db-name>
++                 ```
++
++                 The user specified in the connection string must have the rights to create
++                 tables in the database specified.
++
++              4. **postgres**
++
++                 Use an externally hosted postgres database.
++
++                 You have to specify an sqlalchemy connection string for the postgres database you
++                 want to connect to in `hub.db.url` if using this option.
++
++                 The general format of the connection string is:
++                 ```
++                 postgresql+psycopg2://<db-username>:<db-password>@<db-hostname>:<db-port>/<db-name>
++                 ```
++
++                 The user specified in the connection string must have the rights to create
++                 tables in the database specified.
++
++              5. **other**
++
++                 Use an externally hosted database of some kind other than mysql
++                 or postgres.
++
++                 When using _other_, the database password must be passed as
++                 part of [hub.db.url](schema_hub.db.url) as
++                 [hub.db.password](schema_hub.db.password) will be ignored.
++          pvc:
++            type: object
++            additionalProperties: false
++            required: [storage]
++            description: |
++              Customize the Persistent Volume Claim used when `hub.db.type` is `sqlite-pvc`.
++            properties:
++              annotations:
++                type: object
++                additionalProperties: false
++                patternProperties: &labels-and-annotations-patternProperties
++                  ".*":
++                    type: string
++                description: |
++                  Annotations to apply to the PVC containing the sqlite database.
++
++                  See [the Kubernetes
++                  documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
++                  for more details about annotations.
++              selector:
++                type: object
++                additionalProperties: true
++                description: |
++                  Label selectors to set for the PVC containing the sqlite database.
++
++                  Useful when you are using a specific PV, and want to bind to
++                  that and only that.
++
++                  See [the Kubernetes
++                  documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims)
++                  for more details about using a label selector for what PV to
++                  bind to.
++              storage:
++                type: string
++                description: |
++                  Size of disk to request for the database disk.
++              accessModes:
++                type: array
++                items:
++                  type: [string, "null"]
++                description: |
++                  AccessModes contains the desired access modes the volume
++                  should have. See [the k8s
++                  documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1)
++                  for more information.
++              storageClassName:
++                type: [string, "null"]
++                description: |
++                  Name of the StorageClass required by the claim.
++
++                  If this is a blank string it will be set to a blank string,
++                  while if it is null, it will not be set at all.
++              subPath:
++                type: [string, "null"]
++                description: |
++                  Path within the volume from which the container's volume
++                  should be mounted. Defaults to "" (volume's root).
++          upgrade:
++            type: [boolean, "null"]
++            description: |
++              Users with external databases need to opt-in for upgrades of the
++              JupyterHub specific database schema if needed as part of a
++              JupyterHub version upgrade.
++          url:
++            type: [string, "null"]
++            description: |
++              Connection string when `hub.db.type` is mysql or postgres.
++
++              See documentation for `hub.db.type` for more details on the format of this property.
++          password:
++            type: [string, "null"]
++            description: |
++              Password for the database when `hub.db.type` is mysql or postgres.
++      labels:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          Extra labels to add to the hub pod.
++
++          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
++          to learn more about labels.
++      initContainers:
++        type: array
++        description: |
++          list of initContainers to be run with hub pod. See [Kubernetes Docs](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
++
++          ```yaml
++          hub:
++            initContainers:
++              - name: init-myservice
++                image: busybox:1.28
++                command: ['sh', '-c', 'command1']
++              - name: init-mydb
++                image: busybox:1.28
++                command: ['sh', '-c', 'command2']
++          ```
++      extraEnv:
++        type: [object, array]
++        additionalProperties: true
++        description: |
++          Extra environment variables that should be set for the hub pod.
++
++          Environment variables are usually used to:
++            - Pass parameters to some custom code in `hub.extraConfig`.
++            - Configure code running in the hub pod, such as an authenticator or
++              spawner.
++
++          String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
++          is a part of Kubernetes.
++
++          ```yaml
++          hub:
++            extraEnv:
++              # basic notation (for literal values only)
++              MY_ENV_VARS_NAME1: "my env var value 1"
++
++              # explicit notation (the "name" field takes precedence)
++              HUB_NAMESPACE:
++                name: HUB_NAMESPACE
++                valueFrom:
++                  fieldRef:
++                    fieldPath: metadata.namespace
++
++              # implicit notation (the "name" field is implied)
++              PREFIXED_HUB_NAMESPACE:
++                value: "my-prefix-$(HUB_NAMESPACE)"
++              SECRET_VALUE:
++                valueFrom:
++                  secretKeyRef:
++                    name: my-k8s-secret
++                    key: password
++          ```
++
++          For more information, see the [Kubernetes EnvVar
++          specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
++      extraConfig:
++        type: object
++        additionalProperties: true
++        description: |
++          Arbitrary extra python based configuration that should be in `jupyterhub_config.py`.
++
++          This is the *escape hatch* - if you want to configure JupyterHub to do something specific
++          that is not present here as an option, you can write the raw Python to do it here.
++
++          extraConfig is a *dict*, so there can be multiple configuration
++          snippets under different names. The configuration sections are run in
++          alphabetical order based on the keys.
++
++          Non-exhaustive examples of things you can do here:
++            - Subclass authenticator / spawner to do a custom thing
++            - Dynamically launch different images for different sets of images
++            - Inject an auth token from GitHub authenticator into user pod
++            - Anything else you can think of!
++
++          Since this is usually a multi-line string, you want to format it using YAML's
++          [| operator](https://yaml.org/spec/1.2.2/#23-scalars).
++
++          For example:
++
++          ```yaml
++          hub:
++            extraConfig:
++              myConfig.py: |
++                c.JupyterHub.something = 'something'
++                c.Spawner.something_else = 'something else'
++          ```
++
++          ```{note}
++          No code validation is performed until JupyterHub loads it! If you make
++          a typo here, it will probably manifest itself as the hub pod failing
++          to start up and instead entering an `Error` state or the subsequent
++          `CrashLoopBackoff` state.
++
++          To make use of your own programs linters etc, it would be useful to
++          not embed Python code inside a YAML file. To do that, consider using
++          [`hub.extraFiles`](schema_hub.extraFiles) and mounting a file to
++          `/usr/local/etc/jupyterhub/jupyterhub_config.d` in order to load your
++          extra configuration logic.
++          ```
++
++      fsGid:
++        type: [integer, "null"]
++        minimum: 0
++        # This schema entry is needed to help us print a more helpful error
++        # message in NOTES.txt if hub.fsGid is set.
++        #
++        description: |
++          ```{note}
++          Removed in version 2.0.0. Use
++          [`hub.podSecurityContext`](schema_hub.podSecurityContext) and specify
++          `fsGroup` instead.
++          ```
++      service:
++        type: object
++        additionalProperties: false
++        description: |
++          Object to configure the service the JupyterHub will be exposed on by the Kubernetes server.
++        properties:
++          type:
++            enum: [ClusterIP, NodePort, LoadBalancer, ExternalName]
++            description: |
++              The Kubernetes ServiceType to be used.
++
++              The default type is `ClusterIP`.
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)
++              to learn more about service types.
++          ports:
++            type: object
++            additionalProperties: false
++            description: |
++              Object to configure the ports the hub service will be deployed on.
++            properties:
++              nodePort:
++                type: [integer, "null"]
++                minimum: 0
++                description: |
++                  The nodePort to deploy the hub service on.
++          annotations:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Kubernetes annotations to apply to the hub service.
++          extraPorts:
++            type: array
++            description: |
++              Extra ports to add to the Hub Service object besides `hub` / `8081`.
++              This should be an array that includes `name`, `port`, and `targetPort`.
++              See [Multi-port Services](https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services) for more details.
++          loadBalancerIP:
++            type: [string, "null"]
++            description: |
++              A public IP address the hub Kubernetes service should be exposed
++              on. To expose the hub directly is not recommended. Instead route
++              traffic through the proxy-public service towards the hub.
++
++      pdb: &pdb-spec
++        type: object
++        additionalProperties: false
++        description: |
++          Configure a PodDisruptionBudget for this Deployment.
++
++          These are disabled by default for our deployments that don't support
++          being run in parallel with multiple replicas. Only the user-scheduler
++          currently supports being run in parallel with multiple replicas. If
++          they are enabled for a Deployment with only one replica, they will
++          block `kubectl drain` of a node for example.
++
++          Note that if you aim to block scaling down a node with the
++          hub/proxy/autohttps pod that would cause disruptions of the
++          deployment, then you should instead annotate the pods of the
++          Deployment [as described
++          here](https://github.com/kubernetes/autoscaler/blob/HEAD/cluster-autoscaler/FAQ.md#what-types-of-pods-can-prevent-ca-from-removing-a-node).
++
++              "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
++
++          See [the Kubernetes
++          documentation](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/)
++          for more details about disruptions.
++        properties:
++          enabled:
++            type: boolean
++            description: |
++              Decides if a PodDisruptionBudget is created targeting the
++              Deployment's pods.
++          maxUnavailable:
++            type: [integer, "null"]
++            description: |
++              The maximum number of pods that can be unavailable during
++              voluntary disruptions.
++          minAvailable:
++            type: [integer, "null"]
++            description: |
++              The minimum number of pods required to be available during
++              voluntary disruptions.
++      existingSecret:
++        type: [string, "null"]
++        description: |
++          This option allow you to provide the name of an existing k8s Secret to
++          use alongside of the chart managed k8s Secret. The content of this k8s
++          Secret will be merged with the chart managed k8s Secret, giving
++          priority to the self-managed k8s Secret.
++
++          ```{warning}
++          1. The self managed k8s Secret must mirror the structure in the chart
++             managed secret.
++          2. [`proxy.secretToken`](schema_proxy.secretToken) (aka.
++             `hub.config.ConfigurableHTTPProxy.auth_token`) is only read from
++             the chart managed k8s Secret.
++          ```
++      nodeSelector: &nodeSelector-spec
++        type: object
++        additionalProperties: true
++        description: |
++          An object with key value pairs representing labels. K8s Nodes are
++          required to have match all these labels for this Pod to scheduled on
++          them.
++
++          ```yaml
++          disktype: ssd
++          nodetype: awesome
++          ```
++
++          See [the Kubernetes
++          documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector)
++          for more details.
++      tolerations: &tolerations-spec
++        type: array
++        description: |
++          Tolerations allow a pod to be scheduled on nodes with taints. These
++          tolerations are additional tolerations to the tolerations common to
++          all pods of a their respective kind
++          ([scheduling.corePods.tolerations](schema_scheduling.corePods.tolerations),
++          [scheduling.userPods.tolerations](schema_scheduling.userPods.tolerations)).
++
++          Pass this field an array of
++          [`Toleration`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#toleration-v1-core)
++          objects.
++
++          See the [Kubernetes
++          docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)
++          for more info.
++      activeServerLimit:
++        type: [integer, "null"]
++        description: &jupyterhub-native-config-description |
++          JupyterHub native configuration, see the [JupyterHub
++          documentation](https://jupyterhub.readthedocs.io/en/stable/reference/api/app.html)
++          for more information.
++      allowNamedServers:
++        type: [boolean, "null"]
++        description: *jupyterhub-native-config-description
++      annotations:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          K8s annotations for the hub pod.
++      authenticatePrometheus:
++        type: [boolean, "null"]
++        description: *jupyterhub-native-config-description
++      concurrentSpawnLimit:
++        type: [integer, "null"]
++        description: *jupyterhub-native-config-description
++      consecutiveFailureLimit:
++        type: [integer, "null"]
++        description: *jupyterhub-native-config-description
++      podSecurityContext: &podSecurityContext-spec
++        additionalProperties: true
++        description: |
++          A k8s native specification of the pod's security context, see [the
++          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core)
++          for details.
++      containerSecurityContext: &containerSecurityContext-spec
++        type: object
++        additionalProperties: true
++        description: |
++          A k8s native specification of the container's security context, see [the
++          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#securitycontext-v1-core)
++          for details.
++      deploymentStrategy:
++        type: object
++        additionalProperties: false
++        properties:
++          rollingUpdate:
++            type: [string, "null"]
++          type:
++            type: [string, "null"]
++            description: |
++              JupyterHub does not support running in parallel, due to this we
++              default to using a deployment strategy of Recreate.
++      extraContainers: &extraContainers-spec
++        type: array
++        description: |
++          Additional containers for the Pod. Use a k8s native syntax.
++      extraVolumeMounts: &extraVolumeMounts-spec
++        type: array
++        description: |
++          Additional volume mounts for the Container. Use a k8s native syntax.
++      extraVolumes: &extraVolumes-spec
++        type: array
++        description: |
++          Additional volumes for the Pod. Use a k8s native syntax.
++      livenessProbe: &probe-spec
++        type: object
++        additionalProperties: true
++        required: [enabled]
++        if:
++          properties:
++            enabled:
++              const: true
++        then:
++          description: |
++            This config option is like the k8s native specification of a
++            container probe, except that it also supports an `enabled` boolean
++            flag.
++
++            See [the k8s
++            documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#probe-v1-core)
++            for more details.
++      readinessProbe: *probe-spec
++      namedServerLimitPerUser:
++        type: [integer, "null"]
++        description: *jupyterhub-native-config-description
++      redirectToServer:
++        type: [boolean, "null"]
++        description: *jupyterhub-native-config-description
++      resources: &resources-spec
++        type: object
++        additionalProperties: true
++        description: |
++          A k8s native specification of resources, see [the
++          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#resourcerequirements-v1-core).
++      lifecycle: &lifecycle-spec
++        type: object
++        additionalProperties: false
++        description: |
++          A k8s native specification of lifecycle hooks on the container, see [the
++          documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#lifecycle-v1-core).
++        properties:
++          postStart:
++            type: object
++            additionalProperties: true
++          preStop:
++            type: object
++            additionalProperties: true
++      services:
++        type: object
++        additionalProperties: true
++        description: |
++          This is where you register JupyterHub services. For details on how to
++          configure these services in this Helm chart just keep reading but for
++          details on services themselves instead read [JupyterHub's
++          documentation](https://jupyterhub.readthedocs.io/en/stable/reference/api/service.html).
++
++          ```{note}
++          Only a selection of JupyterHub's configuration options that can be
++          configured for a service are documented below. All configuration set
++          here will be applied even if this Helm chart doesn't recognize it.
++          ```
++
++          JupyterHub's native configuration accepts a list of service objects,
++          this Helm chart only accept a dictionary where each key represents the
++          name of a service and the value is the actual service objects.
++
++          When configuring JupyterHub services via this Helm chart, the `name`
++          field can be omitted as it can be implied by the dictionary key.
++          Further, the `api_token` field can be omitted as it will be
++          automatically generated as of version 1.1.0 of this Helm chart.
++
++          If you have an external service that needs to access the automatically
++          generated api_token for the service, you can access it from the `hub`
++          k8s Secret part of this Helm chart under the key
++          `hub.services.my-service-config-key.apiToken`.
++
++          Here is an example configuration of two services where the first
++          explicitly sets a name and api_token, while the second omits those and
++          lets the name be implied from the key name and the api_token be
++          automatically generated.
++
++          ```yaml
++          hub:
++            services:
++              my-service-1:
++                admin: true
++                name: my-explicitly-set-service-name
++                api_token: my-explicitly-set-api_token
++
++              # the name of the following service will be my-service-2
++              # the api_token of the following service will be generated
++              my-service-2: {}
++          ```
++
++          If you develop a Helm chart depending on the JupyterHub Helm chart and
++          want to let some Pod's environment variable be populated with the
++          api_token of a service registered like above, then do something along
++          these lines.
++
++          ```yaml
++          # ... container specification of a pod ...
++          env:
++            - name: MY_SERVICE_1_API_TOKEN
++              valueFrom:
++                secretKeyRef:
++                  # Don't hardcode the name, use the globally accessible
++                  # named templates part of the JupyterHub Helm chart.
++                  name: {{ include "jupyterhub.hub.fullname" . }}
++                  # Note below the use of the configuration key my-service-1
++                  # rather than the explicitly set service name.
++                  key: hub.services.my-service-1.apiToken
++          ```
++        properties:
++          name:
++            type: string
++            description: |
++              The name can be implied via the key name under which this
++              service is configured, and is due to that allowed to be
++              omitted in this Helm chart configuration of JupyterHub.
++          admin:
++            type: boolean
++          command:
++            type: [string, array]
++          url:
++            type: string
++          api_token:
++            type: [string, "null"]
++            description: |
++              The api_token will be automatically generated if not
++              explicitly set. It will also be exposed in via a k8s Secret
++              part of this Helm chart under a specific key.
++
++              See the documentation under
++              [`hub.services`](schema_hub.services) for details about this.
++          apiToken:
++            type: [string, "null"]
++            description: |
++              An alias for api_token provided for backward compatibility by
++              the JupyterHub Helm chart that will be transformed to
++              api_token.
++      loadRoles:
++        type: object
++        additionalProperties: true
++        description: |
++          This is where you should define JupyterHub roles and apply them to
++          JupyterHub users, groups, and services to grant them additional
++          permissions as defined in JupyterHub's RBAC system.
++
++          Complement this documentation with [JupyterHub's
++          documentation](https://jupyterhub.readthedocs.io/en/stable/rbac/roles.html#defining-roles)
++          about `load_roles`.
++
++          Note that while JupyterHub's native configuration `load_roles` accepts
++          a list of role objects, this Helm chart only accepts a dictionary where
++          each key represents the name of a role and the value is the actual
++          role object.
++
++          ```yaml
++          hub:
++            loadRoles:
++              teacher:
++                description: Access to users' information and group membership
++
++                # this role provides permissions to...
++                scopes: [users, groups]
++
++                # this role will be assigned to...
++                users: [erik]
++                services: [grading-service]
++                groups: [teachers]
++          ```
++
++          When configuring JupyterHub roles via this Helm chart, the `name`
++          field can be omitted as it can be implied by the dictionary key.
++      shutdownOnLogout:
++        type: [boolean, "null"]
++        description: *jupyterhub-native-config-description
++      templatePaths:
++        type: array
++        description: *jupyterhub-native-config-description
++      templateVars:
++        type: object
++        additionalProperties: true
++        description: *jupyterhub-native-config-description
++      serviceAccount: &serviceAccount
++        type: object
++        required: [create]
++        additionalProperties: false
++        description: |
++          Configuration for a k8s ServiceAccount dedicated for use by the
++          specific pod which this configuration is nested under.
++        properties:
++          create:
++            type: boolean
++            description: |
++              Whether or not to create the `ServiceAccount` resource.
++          name:
++            type: ["string", "null"]
++            description: |
++              This configuration serves multiple purposes:
++
++              - It will be the `serviceAccountName` referenced by related Pods.
++              - If `create` is set, the created ServiceAccount resource will be named like this.
++              - If [`rbac.create`](schema_rbac.create) is set, the associated (Cluster)RoleBindings will bind to this name.
++
++              If not explicitly provided, a default name will be used.
++          annotations:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Kubernetes annotations to apply to the k8s ServiceAccount.
++      extraPodSpec: &extraPodSpec-spec
++        type: object
++        additionalProperties: true
++        description: |
++          Arbitrary extra k8s pod specification as a YAML object. The default
++          value of this setting is an empty object, i.e. no extra configuration.
++          The value of this property is augmented to the pod specification as-is.
++
++          This is a powerful tool for expert k8s administrators with advanced
++          configuration requirements. This setting should only be used for
++          configuration that cannot be accomplished through the other settings.
++          Misusing this setting can break your deployment and/or compromise
++          your system security.
++
++          This is one of four related settings for inserting arbitrary pod
++          specification:
++
++          1. hub.extraPodSpec
++          2. proxy.chp.extraPodSpec
++          3. proxy.traefik.extraPodSpec
++          4. scheduling.userScheduler.extraPodSpec
++
++          One real-world use of these settings is to enable host networking. For
++          example, to configure host networking for the hub pod, add the
++          following to your helm configuration values:
++
++          ```yaml
++          hub:
++            extraPodSpec:
++              hostNetwork: true
++              dnsPolicy: ClusterFirstWithHostNet
++          ```
++
++          Likewise, to configure host networking for the proxy pod, add the
++          following:
++
++          ```yaml
++          proxy:
++            chp:
++              extraPodSpec:
++                hostNetwork: true
++                dnsPolicy: ClusterFirstWithHostNet
++          ```
++
++          N.B. Host networking has special security implications and can easily
++          break your deployment. This is an example—not an endorsement.
++
++          See [PodSpec](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec)
++          for the latest pod resource specification.
++
++  proxy:
++    type: object
++    additionalProperties: false
++    properties:
++      chp:
++        type: object
++        additionalProperties: false
++        description: |
++          Configure the configurable-http-proxy (chp) pod managed by jupyterhub to route traffic
++          both to itself and to user pods.
++        properties:
++          revisionHistoryLimit: *revisionHistoryLimit
++          networkPolicy: *networkPolicy-spec
++          extraCommandLineFlags:
++            type: array
++            description: |
++              A list of strings to be added as command line options when
++              starting
++              [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy#command-line-options)
++              that will be expanded with Helm's template function `tpl` which
++              can render Helm template logic inside curly braces (`{{ ... }}`).
++
++              ```yaml
++              proxy:
++                chp:
++                  extraCommandLineFlags:
++                    - "--auto-rewrite"
++                    - "--custom-header {{ .Values.myCustomStuff }}"
++              ```
++
++              Note that these will be appended last, and if you provide the same
++              flag twice, the last flag will be used, which mean you can
++              override the default flag values as well.
++          extraEnv:
++            type: [object, array]
++            additionalProperties: true
++            description: |
++              Extra environment variables that should be set for the chp pod.
++
++              Environment variables are usually used here to:
++                - override HUB_SERVICE_PORT or HUB_SERVICE_HOST default values
++                - set CONFIGPROXY_SSL_KEY_PASSPHRASE for setting passphrase of SSL keys
++
++              String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
++              is a part of Kubernetes.
++
++              ```yaml
++              proxy:
++                chp:
++                  extraEnv:
++                    # basic notation (for literal values only)
++                    MY_ENV_VARS_NAME1: "my env var value 1"
++
++                    # explicit notation (the "name" field takes precedence)
++                    CHP_NAMESPACE:
++                      name: CHP_NAMESPACE
++                      valueFrom:
++                        fieldRef:
++                          fieldPath: metadata.namespace
++
++                    # implicit notation (the "name" field is implied)
++                    PREFIXED_CHP_NAMESPACE:
++                      value: "my-prefix-$(CHP_NAMESPACE)"
++                    SECRET_VALUE:
++                      valueFrom:
++                        secretKeyRef:
++                          name: my-k8s-secret
++                          key: password
++              ```
++
++              For more information, see the [Kubernetes EnvVar
++              specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
++          pdb: *pdb-spec
++          nodeSelector: *nodeSelector-spec
++          tolerations: *tolerations-spec
++          containerSecurityContext: *containerSecurityContext-spec
++          image: *image-spec
++          livenessProbe: *probe-spec
++          readinessProbe: *probe-spec
++          resources: *resources-spec
++          defaultTarget:
++            type: [string, "null"]
++            description: |
++              Override the URL for the default routing target for the proxy.
++              Defaults to JupyterHub itself.
++              This will generally only have an effect while JupyterHub is not running,
++              as JupyterHub adds itself as the default target after it starts.
++          errorTarget:
++            type: [string, "null"]
++            description: |
++              Override the URL for the error target for the proxy.
++              Defaults to JupyterHub itself.
++              Useful to reduce load on the Hub
++              or produce more informative error messages than the Hub's default,
++              e.g. in highly customized deployments such as BinderHub.
++              See Configurable HTTP Proxy for details on implementing an error target.
++          extraPodSpec: *extraPodSpec-spec
++      secretToken:
++        type: [string, "null"]
++        description: |
++          ```{note}
++          As of version 1.0.0 this will automatically be generated and there is
++          no need to set it manually.
++
++          If you wish to reset a generated key, you can use `kubectl edit` on
++          the k8s Secret typically named `hub` and remove the
++          `hub.config.ConfigurableHTTPProxy.auth_token` entry in the k8s Secret,
++          then perform a new `helm upgrade`.
++          ```
++
++          A 32-byte cryptographically secure randomly generated string used to
++          secure communications between the hub pod and the proxy pod running a
++          [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)
++          instance.
++
++          ```sh
++          # to generate a value, run
++          openssl rand -hex 32
++          ```
++
++          Changing this value will cause the proxy and hub pods to restart. It is good security
++          practice to rotate these values over time. If this secret leaks, *immediately* change
++          it to something else, or user data can be compromised.
++      service:
++        type: object
++        additionalProperties: false
++        description: |
++          Configuration of the k8s Service `proxy-public` which either will
++          point to the `autohttps` pod running Traefik for TLS termination, or
++          the `proxy` pod running ConfigurableHTTPProxy. Incoming traffic from
++          users on the internet should always go through this k8s Service.
++
++          When this service targets the `autohttps` pod which then routes to the
++          `proxy` pod, a k8s Service named `proxy-http` will be added targeting
++          the `proxy` pod and only accepting HTTP traffic on port 80.
++        properties:
++          type:
++            enum: [ClusterIP, NodePort, LoadBalancer, ExternalName]
++            description: |
++              Default `LoadBalancer`.
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types)
++              to learn more about service types.
++          labels:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Extra labels to add to the proxy service.
++
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
++              to learn more about labels.
++          annotations:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Annotations to apply to the service that is exposing the proxy.
++
++              See [the Kubernetes
++              documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
++              for more details about annotations.
++          nodePorts:
++            type: object
++            additionalProperties: false
++            description: |
++              Object to set NodePorts to expose the service on for http and https.
++
++              See [the Kubernetes
++              documentation](https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport)
++              for more details about NodePorts.
++            properties:
++              http:
++                type: [integer, "null"]
++                description: |
++                  The HTTP port the proxy-public service should be exposed on.
++              https:
++                type: [integer, "null"]
++                description: |
++                  The HTTPS port the proxy-public service should be exposed on.
++          disableHttpPort:
++            type: boolean
++            description: |
++              Default `false`.
++
++              If `true`, port 80 for incoming HTTP traffic will no longer be exposed. This should not be used with `proxy.https.type=letsencrypt` or `proxy.https.enabled=false` as it would remove the only exposed port.
++          extraPorts:
++            type: array
++            description: |
++              Extra ports the k8s Service should accept incoming traffic on,
++              which will be redirected to either the `autohttps` pod (treafik)
++              or the `proxy` pod (chp).
++
++              See [the Kubernetes
++              documentation](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#serviceport-v1-core)
++              for the structure of the items in this list.
++          loadBalancerIP:
++            type: [string, "null"]
++            description: |
++              The public IP address the proxy-public Kubernetes service should
++              be exposed on. This entry will end up at the configurable proxy
++              server that JupyterHub manages, which will direct traffic to user
++              pods at the `/user` path and the hub pod at the `/hub` path.
++
++              Set this if you want to use a fixed external IP address instead of
++              a dynamically acquired one. This is relevant if you have a domain
++              name that you want to point to a specific IP and want to ensure it
++              doesn't change.
++          loadBalancerSourceRanges:
++            type: array
++            description: |
++              A list of IP CIDR ranges that are allowed to access the load balancer service.
++              Defaults to allowing everyone to access it.
++      https:
++        type: object
++        additionalProperties: false
++        description: |
++          Object for customizing the settings for HTTPS used by the JupyterHub's proxy.
++          For more information on configuring HTTPS for your JupyterHub, see the [HTTPS section in our security guide](https)
++        properties:
++          enabled:
++            type: [boolean, "null"]
++            description: |
++              Indicator to set whether HTTPS should be enabled or not on the proxy. Defaults to `true` if the https object is provided.
++          type:
++            enum: [null, "", letsencrypt, manual, offload, secret]
++            description: |
++              The type of HTTPS encryption that is used.
++              Decides on which ports and network policies are used for communication via HTTPS. Setting this to `secret` sets the type to manual HTTPS with a secret that has to be provided in the `https.secret` object.
++              Defaults to `letsencrypt`.
++          letsencrypt:
++            type: object
++            additionalProperties: false
++            properties:
++              contactEmail:
++                type: [string, "null"]
++                description: |
++                  The contact email to be used for automatically provisioned HTTPS certificates by Let's Encrypt. For more information see [Set up automatic HTTPS](setup-automatic-https).
++                  Required for automatic HTTPS.
++              acmeServer:
++                type: [string, "null"]
++                description: |
++                  Let's Encrypt is one of various ACME servers that can provide
++                  a certificate, and by default their production server is used.
++
++                  Let's Encrypt staging:    https://acme-staging-v02.api.letsencrypt.org/directory
++                  Let's Encrypt production: acmeServer: https://acme-v02.api.letsencrypt.org/directory
++          manual:
++            type: object
++            additionalProperties: false
++            description: |
++              Object for providing own certificates for manual HTTPS configuration. To be provided when setting `https.type` to `manual`.
++              See [Set up manual HTTPS](setup-manual-https)
++            properties:
++              key:
++                type: [string, "null"]
++                description: |
++                  The RSA private key to be used for HTTPS.
++                  To be provided in the form of
++
++                  ```
++                  key: |
++                    -----BEGIN RSA PRIVATE KEY-----
++                    ...
++                    -----END RSA PRIVATE KEY-----
++                  ```
++              cert:
++                type: [string, "null"]
++                description: |
++                  The certificate to be used for HTTPS.
++                  To be provided in the form of
++
++                  ```
++                  cert: |
++                    -----BEGIN CERTIFICATE-----
++                    ...
++                    -----END CERTIFICATE-----
++                  ```
++          secret:
++            type: object
++            additionalProperties: false
++            description: |
++              Secret to be provided when setting `https.type` to `secret`.
++            properties:
++              name:
++                type: [string, "null"]
++                description: |
++                  Name of the secret
++              key:
++                type: [string, "null"]
++                description: |
++                  Path to the private key to be used for HTTPS.
++                  Example: `'tls.key'`
++              crt:
++                type: [string, "null"]
++                description: |
++                  Path to the certificate to be used for HTTPS.
++                  Example: `'tls.crt'`
++          hosts:
++            type: array
++            description: |
++              You domain in list form.
++              Required for automatic HTTPS. See [Set up automatic HTTPS](setup-automatic-https).
++              To be provided like:
++              ```
++              hosts:
++                - <your-domain-name>
++              ```
++      traefik:
++        type: object
++        additionalProperties: false
++        description: |
++          Configure the traefik proxy used to terminate TLS when 'autohttps' is enabled
++        properties:
++          revisionHistoryLimit: *revisionHistoryLimit
++          labels:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Extra labels to add to the traefik pod.
++
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
++              to learn more about labels.
++          networkPolicy: *networkPolicy-spec
++          extraInitContainers:
++            type: array
++            description: |
++              list of extraInitContainers to be run with traefik pod, after the containers set in the chart. See [Kubernetes Docs](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
++
++              ```yaml
++              proxy:
++                traefik:
++                  extraInitContainers:
++                    - name: init-myservice
++                      image: busybox:1.28
++                      command: ['sh', '-c', 'command1']
++                    - name: init-mydb
++                      image: busybox:1.28
++                      command: ['sh', '-c', 'command2']
++              ```
++          extraEnv:
++            type: [object, array]
++            additionalProperties: true
++            description: |
++              Extra environment variables that should be set for the traefik pod.
++
++              Environment Variables here may be used to configure traefik.
++
++              String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
++              is a part of Kubernetes.
++
++              ```yaml
++              proxy:
++                traefik:
++                  extraEnv:
++                    # basic notation (for literal values only)
++                    MY_ENV_VARS_NAME1: "my env var value 1"
++
++                    # explicit notation (the "name" field takes precedence)
++                    TRAEFIK_NAMESPACE:
++                      name: TRAEFIK_NAMESPACE
++                      valueFrom:
++                        fieldRef:
++                          fieldPath: metadata.namespace
++
++                    # implicit notation (the "name" field is implied)
++                    PREFIXED_TRAEFIK_NAMESPACE:
++                      value: "my-prefix-$(TRAEFIK_NAMESPACE)"
++                    SECRET_VALUE:
++                      valueFrom:
++                        secretKeyRef:
++                          name: my-k8s-secret
++                          key: password
++              ```
++
++              For more information, see the [Kubernetes EnvVar
++              specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
++          pdb: *pdb-spec
++          nodeSelector: *nodeSelector-spec
++          tolerations: *tolerations-spec
++          containerSecurityContext: *containerSecurityContext-spec
++          extraDynamicConfig:
++            type: object
++            additionalProperties: true
++            description: |
++              This refers to traefik's post-startup configuration.
++
++              This Helm chart already provide such configuration, so this is a
++              place where you can merge in additional configuration. If you are
++              about to use this configuration, you may want to inspect the
++              default configuration declared
++              [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/jupyterhub/templates/proxy/autohttps/_configmap-dynamic.yaml).
++          extraPorts:
++            type: array
++            description: |
++              Extra ports for the traefik container within the autohttps pod
++              that you would like to expose, formatted in a k8s native way.
++          extraStaticConfig:
++            type: object
++            additionalProperties: true
++            description: |
++              This refers to traefik's startup configuration.
++
++              This Helm chart already provide such configuration, so this is a
++              place where you can merge in additional configuration. If you are
++              about to use this configuration, you may want to inspect the
++              default configuration declared
++              [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/HEAD/jupyterhub/templates/proxy/autohttps/_configmap-traefik.yaml).
++          extraVolumes: *extraVolumes-spec
++          extraVolumeMounts: *extraVolumeMounts-spec
++          hsts:
++            type: object
++            additionalProperties: false
++            required: [includeSubdomains, maxAge, preload]
++            description: |
++              This section regards a HTTP Strict-Transport-Security (HSTS)
++              response header. It can act as a request for a visiting web
++              browsers to enforce HTTPS on their end in for a given time into
++              the future, and optionally also for future requests to subdomains.
++
++              These settings relate to traefik configuration which we use as a
++              TLS termination proxy.
++
++              See [Mozilla's
++              documentation](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security)
++              for more information.
++            properties:
++              includeSubdomains:
++                type: boolean
++              maxAge:
++                type: integer
++              preload:
++                type: boolean
++          image: *image-spec
++          resources: *resources-spec
++          serviceAccount: *serviceAccount
++          extraPodSpec: *extraPodSpec-spec
++      labels:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          K8s labels for the proxy pod.
++
++          ```{note}
++          For consistency, this should really be located under
++          proxy.chp.labels but isn't for historical reasons.
++          ```
++      annotations:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          K8s annotations for the proxy pod.
++
++          ```{note}
++          For consistency, this should really be located under
++          proxy.chp.annotations but isn't for historical reasons.
++          ```
++      deploymentStrategy:
++        type: object
++        additionalProperties: false
++        properties:
++          rollingUpdate:
++            type: [string, "null"]
++          type:
++            type: [string, "null"]
++            description: |
++              While the proxy pod running
++              [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)
++              could run in parallel, two instances running in parallel wouldn't
++              both receive updates from JupyterHub regarding how it should route
++              traffic. Due to this we default to using a deployment strategy of
++              Recreate instead of RollingUpdate.
++      secretSync:
++        type: object
++        additionalProperties: false
++        description: |
++          This configuration section refers to configuration of the sidecar
++          container in the autohttps pod running next to its traefik container
++          responsible for TLS termination.
++
++          The purpose of this container is to store away and load TLS
++          certificates from a k8s Secret. The TLS certificates are acquired by
++          the ACME client (LEGO) that is running within the traefik container,
++          where traefik is using them for TLS termination.
++        properties:
++          containerSecurityContext: *containerSecurityContext-spec
++          image: *image-spec
++          resources: *resources-spec
++
++  singleuser:
++    type: object
++    additionalProperties: false
++    description: |
++      Options for customizing the environment that is provided to the users after they log in.
++    properties:
++      networkPolicy: *networkPolicy-spec
++      podNameTemplate:
++        type: [string, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.pod_name_template](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.pod_name_template).
++      cpu:
++        type: object
++        additionalProperties: false
++        description: |
++          Set CPU limits & guarantees that are enforced for each user.
++
++          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
++          for more info.
++        properties:
++          limit:
++            type: [number, "null"]
++          guarantee:
++            type: [number, "null"]
++      memory:
++        type: object
++        additionalProperties: false
++        description: |
++          Set Memory limits & guarantees that are enforced for each user.
++
++          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
++          for more info.
++        properties:
++          limit:
++            type: [number, string, "null"]
++          guarantee:
++            type: [number, string, "null"]
++            description: |
++              Note that this field is referred to as *requests* by the Kubernetes API.
++      image: *image-spec
++      initContainers:
++        type: array
++        description: |
++          list of initContainers to be run every singleuser pod. See [Kubernetes Docs](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
++
++          ```yaml
++          singleuser:
++            initContainers:
++              - name: init-myservice
++                image: busybox:1.28
++                command: ['sh', '-c', 'command1']
++              - name: init-mydb
++                image: busybox:1.28
++                command: ['sh', '-c', 'command2']
++          ```
++      profileList:
++        type: array
++        description: |
++          For more information about the profile list, see [KubeSpawner's
++          documentation](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner)
++          as this is simply a passthrough to that configuration.
++
++          ```{note}
++          The image-pullers are aware of the overrides of images in
++          `singleuser.profileList` but they won't be if you configure it in
++          JupyterHub's configuration of '`c.KubeSpawner.profile_list`.
++          ```
++
++          ```yaml
++          singleuser:
++            profileList:
++              - display_name: "Default: Shared, 8 CPU cores"
++                description: "Your code will run on a shared machine with CPU only."
++                default: True
++              - display_name: "Personal, 4 CPU cores & 26GB RAM, 1 NVIDIA Tesla K80 GPU"
++                description: "Your code will run a personal machine with a GPU."
++                kubespawner_override:
++                  extra_resource_limits:
++                    nvidia.com/gpu: "1"
++          ```
++      extraFiles: *extraFiles
++      extraEnv:
++        type: [object, array]
++        additionalProperties: true
++        description: |
++          Extra environment variables that should be set for the user pods.
++
++          String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
++          is a part of Kubernetes. Note that the user pods will already have
++          access to a set of environment variables that you can use, like
++          `JUPYTERHUB_USER` and `JUPYTERHUB_HOST`. For more information about these
++          inspect [this source
++          code](https://github.com/jupyterhub/jupyterhub/blob/cc8e7806530466dce8968567d1bbd2b39a7afa26/jupyterhub/spawner.py#L763).
++
++          ```yaml
++          singleuser:
++            extraEnv:
++              # basic notation (for literal values only)
++              MY_ENV_VARS_NAME1: "my env var value 1"
++
++              # explicit notation (the "name" field takes precedence)
++              USER_NAMESPACE:
++                name: USER_NAMESPACE
++                valueFrom:
++                  fieldRef:
++                    fieldPath: metadata.namespace
++
++              # implicit notation (the "name" field is implied)
++              PREFIXED_USER_NAMESPACE:
++                value: "my-prefix-$(USER_NAMESPACE)"
++              SECRET_VALUE:
++                valueFrom:
++                  secretKeyRef:
++                    name: my-k8s-secret
++                    key: password
++          ```
++
++          For more information, see the [Kubernetes EnvVar
++          specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envvar-v1-core).
++      nodeSelector: *nodeSelector-spec
++      extraTolerations: *tolerations-spec
++      extraNodeAffinity:
++        type: object
++        additionalProperties: false
++        description: |
++          Affinities describe where pods prefer or require to be scheduled, they
++          may prefer or require a node where they are to be scheduled to have a
++          certain label (node affinity). They may also require to be scheduled
++          in proximity or with a lack of proximity to another pod (pod affinity
++          and anti pod affinity).
++
++          See the [Kubernetes
++          docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)
++          for more info.
++        properties:
++          required:
++            type: array
++            description: |
++              Pass this field an array of
++              [`NodeSelectorTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#nodeselectorterm-v1-core)
++              objects.
++          preferred:
++            type: array
++            description: |
++              Pass this field an array of
++              [`PreferredSchedulingTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#preferredschedulingterm-v1-core)
++              objects.
++      extraPodAffinity:
++        type: object
++        additionalProperties: false
++        description: |
++          See the description of `singleuser.extraNodeAffinity`.
++        properties:
++          required:
++            type: array
++            description: |
++              Pass this field an array of
++              [`PodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podaffinityterm-v1-core)
++              objects.
++          preferred:
++            type: array
++            description: |
++              Pass this field an array of
++              [`WeightedPodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#weightedpodaffinityterm-v1-core)
++              objects.
++      extraPodAntiAffinity:
++        type: object
++        additionalProperties: false
++        description: |
++          See the description of `singleuser.extraNodeAffinity`.
++        properties:
++          required:
++            type: array
++            description: |
++              Pass this field an array of
++              [`PodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podaffinityterm-v1-core)
++              objects.
++          preferred:
++            type: array
++            description: |
++              Pass this field an array of
++              [`WeightedPodAffinityTerm`](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#weightedpodaffinityterm-v1-core)
++              objects.
++      cloudMetadata:
++        type: object
++        additionalProperties: false
++        required: [blockWithIptables, ip]
++        description: |
++          Please refer to dedicated section in [the Helm chart
++          documentation](block-metadata-iptables) for more information about
++          this.
++        properties:
++          blockWithIptables:
++            type: boolean
++          ip:
++            type: string
++
++      cmd:
++        type: [array, string, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.cmd](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.cmd).
++          The default is "jupyterhub-singleuser".
++          Use `cmd: null` to launch a custom CMD from the image,
++          which must launch jupyterhub-singleuser or an equivalent process eventually.
++          For example: Jupyter's docker-stacks images.
++      defaultUrl:
++        type: [string, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.default_url](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.default_url).
++      # FIXME: name mismatch, named events_enabled in kubespawner
++      events:
++        type: [boolean, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.events_enabled](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.events_enabled).
++      extraAnnotations:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.extra_annotations](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_annotations).
++      extraContainers:
++        type: array
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.extra_containers](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_containers).
++      extraLabels:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.extra_labels](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_labels).
++      extraPodConfig:
++        type: object
++        additionalProperties: true
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.extra_pod_config](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_pod_config).
++      extraResource:
++        type: object
++        additionalProperties: false
++        properties:
++          # FIXME: name mismatch, named extra_resource_guarantees in kubespawner
++          guarantees:
++            type: object
++            additionalProperties: true
++            description: |
++              Passthrough configuration for
++              [KubeSpawner.extra_resource_guarantees](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_resource_guarantees).
++          # FIXME: name mismatch, named extra_resource_limits in kubespawner
++          limits:
++            type: object
++            additionalProperties: true
++            description: |
++              Passthrough configuration for
++              [KubeSpawner.extra_resource_limits](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_resource_limits).
++      fsGid:
++        type: [integer, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.fs_gid](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.fs_gid).
++      lifecycleHooks:
++        type: object
++        additionalProperties: false
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.lifecycle_hooks](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.lifecycle_hooks).
++        properties:
++          postStart:
++            type: object
++            additionalProperties: true
++          preStop:
++            type: object
++            additionalProperties: true
++      networkTools:
++        type: object
++        additionalProperties: false
++        description: |
++          This configuration section refers to configuration of a conditionally
++          created initContainer for the user pods with a purpose to block a
++          specific IP address.
++
++          This initContainer will be created if
++          [`singleuser.cloudMetadata.blockWithIptables`](schema_singleuser.cloudMetadata.blockWithIptables)
++          is set to true.
++        properties:
++          image: *image-spec
++          resources: *resources-spec
++      # FIXME: name mismatch, named service_account in kubespawner
++      serviceAccountName:
++        type: [string, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.service_account](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.service_account).
++      startTimeout:
++        type: [integer, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.start_timeout](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.start_timeout).
++      storage:
++        type: object
++        additionalProperties: false
++        required: [type, homeMountPath]
++        description: |
++          This section configures KubeSpawner directly to some extent but also
++          indirectly through Helm chart specific configuration options such as
++          [`singleuser.storage.type`](schema_singleuser.storage.type).
++        properties:
++          capacity:
++            type: [string, "null"]
++            description: |
++              Configures `KubeSpawner.storage_capacity`.
++
++              See the [KubeSpawner
++              documentation](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html)
++              for more information.
++          dynamic:
++            type: object
++            additionalProperties: false
++            properties:
++              pvcNameTemplate:
++                type: [string, "null"]
++                description: |
++                  Configures `KubeSpawner.pvc_name_template` which will be the
++                  resource name of the PVC created by KubeSpawner for each user
++                  if needed.
++              storageAccessModes:
++                type: array
++                items:
++                  type: [string, "null"]
++                description: |
++                  Configures `KubeSpawner.storage_access_modes`.
++
++                  See KubeSpawners documentation and [the k8s
++                  documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes)
++                  for more information.
++              storageClass:
++                type: [string, "null"]
++                description: |
++                  Configures `KubeSpawner.storage_class`, which can be an
++                  explicit StorageClass to dynamically provision storage for the
++                  PVC that KubeSpawner will create.
++
++                  There is of a default StorageClass available in k8s clusters
++                  for use if this is unspecified.
++              volumeNameTemplate:
++                type: [string, "null"]
++                description: |
++                  Configures `KubeSpawner.volume_name_template`, which is the
++                  name to reference from the containers volumeMounts section.
++          extraLabels:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Configures `KubeSpawner.storage_extra_labels`. Note that these
++              labels are set on the PVC during creation only and won't be
++              updated after creation.
++          extraVolumeMounts: *extraVolumeMounts-spec
++          extraVolumes: *extraVolumes-spec
++          homeMountPath:
++            type: string
++            description: |
++              The location within the container where the home folder storage
++              should be mounted.
++          static:
++            type: object
++            additionalProperties: false
++            properties:
++              pvcName:
++                type: [string, "null"]
++                description: |
++                  Configures `KubeSpawner.pvc_claim_name` to reference
++                  pre-existing storage.
++              subPath:
++                type: [string, "null"]
++                description: |
++                  Configures the `subPath` field of a
++                  `KubeSpawner.volume_mounts` entry added by the Helm chart.
++
++                  Path within the volume from which the container's volume
++                  should be mounted.
++          type:
++            enum: [dynamic, static, none]
++            description: |
++              Decide if you want storage to be provisioned dynamically
++              (dynamic), or if you want to attach existing storage (static), or
++              don't want any storage to be attached (none).
++      allowPrivilegeEscalation:
++        type: [boolean, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.allow_privilege_escalation](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.allow_privilege_escalation).
++      uid:
++        type: [integer, "null"]
++        description: |
++          Passthrough configuration for
++          [KubeSpawner.uid](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.uid).
++
++          This dictates as what user the main container will start up as.
++
++          As an example of when this is needed, consider if you want to enable
++          sudo rights for some of your users. This can be done by starting up as
++          root, enabling it from the container in a startup script, and then
++          transitioning to the normal user.
++
++          Default is 1000, set to null to use the container's default.
++
++  scheduling:
++    type: object
++    additionalProperties: false
++    description: |
++      Objects for customizing the scheduling of various pods on the nodes and
++      related labels.
++    properties:
++      userScheduler:
++        type: object
++        additionalProperties: false
++        required: [enabled, plugins, pluginConfig, logLevel]
++        description: |
++          The user scheduler is making sure that user pods are scheduled
++          tight on nodes, this is useful for autoscaling of user node pools.
++        properties:
++          enabled:
++            type: boolean
++            description: |
++              Enables the user scheduler.
++          revisionHistoryLimit: *revisionHistoryLimit
++          replicas:
++            type: integer
++            description: |
++              You can have multiple schedulers to share the workload or improve
++              availability on node failure.
++          image: *image-spec
++          pdb: *pdb-spec
++          nodeSelector: *nodeSelector-spec
++          tolerations: *tolerations-spec
++          labels:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Extra labels to add to the userScheduler pods.
++
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
++              to learn more about labels.
++          annotations:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Extra annotations to add to the user-scheduler pods.
++          containerSecurityContext: *containerSecurityContext-spec
++          logLevel:
++            type: integer
++            description: |
++              Corresponds to the verbosity level of logging made by the
++              kube-scheduler binary running within the user-scheduler pod.
++          plugins:
++            type: object
++            additionalProperties: true
++            description: |
++              These plugins refers to kube-scheduler plugins as documented
++              [here](https://kubernetes.io/docs/reference/scheduling/config/).
++
++              The user-scheduler is really just a kube-scheduler configured in a
++              way to pack users tight on nodes using these plugins. See
++              values.yaml for information about the default plugins.
++          pluginConfig:
++            type: array
++            description: |
++              Individually activated plugins can be configured further.
++          resources: *resources-spec
++          serviceAccount: *serviceAccount
++          extraPodSpec: *extraPodSpec-spec
++      podPriority:
++        type: object
++        additionalProperties: false
++        description: |
++          Pod Priority is used to allow real users evict user placeholder pods
++          that in turn by entering a Pending state can trigger a scale up by a
++          cluster autoscaler.
++
++          Having this option enabled only make sense if the following conditions
++          are met:
++
++          1. A cluster autoscaler is installed.
++          2. user-placeholer pods are configured to have a priority equal or
++             higher than the cluster autoscaler's "priority cutoff" so that the
++             cluster autoscaler scales up a node in advance for a pending user
++             placeholder pod.
++          3. Normal user pods have a higher priority than the user-placeholder
++             pods.
++          4. Image puller pods have a priority between normal user pods and
++             user-placeholder pods.
++
++          Note that if the default priority cutoff if not configured on cluster
++          autoscaler, it will currently default to 0, and that in the future
++          this is meant to be lowered. If your cloud provider is installing the
++          cluster autoscaler for you, they may also configure this specifically.
++
++          Recommended settings for a cluster autoscaler...
++
++          ... with a priority cutoff of -10 (GKE):
++
++          ```yaml
++          podPriority:
++            enabled: true
++            globalDefault: false
++            defaultPriority: 0
++            imagePullerPriority: -5
++            userPlaceholderPriority: -10
++          ```
++
++          ... with a priority cutoff of 0:
++
++          ```yaml
++          podPriority:
++            enabled: true
++            globalDefault: true
++            defaultPriority: 10
++            imagePullerPriority: 5
++            userPlaceholderPriority: 0
++          ```
++        properties:
++          enabled:
++            type: boolean
++          globalDefault:
++            type: boolean
++            description: |
++              Warning! This will influence all pods in the cluster.
++
++              The priority a pod usually get is 0. But this can be overridden
++              with a PriorityClass resource if it is declared to be the global
++              default. This configuration option allows for the creation of such
++              global default.
++          defaultPriority:
++            type: integer
++            description: |
++              The actual value for the default pod priority.
++          imagePullerPriority:
++            type: integer
++            description: |
++              The actual value for the [hook|continuous]-image-puller pods' priority.
++          userPlaceholderPriority:
++            type: integer
++            description: |
++              The actual value for the user-placeholder pods' priority.
++      userPlaceholder:
++        type: object
++        additionalProperties: false
++        description: |
++          User placeholders simulate users but will thanks to PodPriority be
++          evicted by the cluster autoscaler if a real user shows up. In this way
++          placeholders allow you to create a headroom for the real users and
++          reduce the risk of a user having to wait for a node to be added. Be
++          sure to use the the continuous image puller as well along with
++          placeholders, so the images are also available when real users arrive.
++
++          To test your setup efficiently, you can adjust the amount of user
++          placeholders with the following command:
++          ```sh
++          # Configure to have 3 user placeholders
++          kubectl scale sts/user-placeholder --replicas=3
++          ```
++        properties:
++          enabled:
++            type: boolean
++          image: *image-spec
++          revisionHistoryLimit: *revisionHistoryLimit
++          replicas:
++            type: integer
++            description: |
++              How many placeholder pods would you like to have?
++          labels:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Extra labels to add to the userPlaceholder pods.
++
++              See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
++              to learn more about labels.
++          annotations:
++            type: object
++            additionalProperties: false
++            patternProperties: *labels-and-annotations-patternProperties
++            description: |
++              Extra annotations to add to the placeholder pods.
++          resources:
++            type: object
++            additionalProperties: true
++            description: |
++              Unless specified here, the placeholder pods will request the same
++              resources specified for the real singleuser pods.
++          containerSecurityContext: *containerSecurityContext-spec
++      corePods:
++        type: object
++        additionalProperties: false
++        description: |
++          These settings influence the core pods like the hub, proxy and
++          user-scheduler pods.
++          These settings influence all pods considered core pods, namely:
++
++          - hub
++          - proxy
++          - autohttps
++          - hook-image-awaiter
++          - user-scheduler
++
++          By defaults, the tolerations are:
++
++          - hub.jupyter.org/dedicated=core:NoSchedule
++          - hub.jupyter.org_dedicated=core:NoSchedule
++
++          Note that tolerations set here are combined with the respective
++          components dedicated tolerations, and that `_` is available in case
++          `/` isn't allowed in the clouds tolerations.
++        properties:
++          tolerations: *tolerations-spec
++          nodeAffinity:
++            type: object
++            additionalProperties: false
++            description: |
++              Where should pods be scheduled? Perhaps on nodes with a certain
++              label is preferred or even required?
++            properties:
++              matchNodePurpose:
++                enum: [ignore, prefer, require]
++                description: |
++                  Decide if core pods *ignore*, *prefer* or *require* to
++                  schedule on nodes with this label:
++                  ```
++                  hub.jupyter.org/node-purpose=core
++                  ```
++      userPods:
++        type: object
++        additionalProperties: false
++        description: |
++          These settings influence all pods considered user pods, namely:
++
++          - user-placeholder
++          - hook-image-puller
++          - continuous-image-puller
++          - jupyter-<username>
++
++          By defaults, the tolerations are:
++
++          - hub.jupyter.org/dedicated=core:NoSchedule
++          - hub.jupyter.org_dedicated=core:NoSchedule
++
++          Note that tolerations set here are combined with the respective
++          components dedicated tolerations, and that `_` is available in case
++          `/` isn't allowed in the clouds tolerations.
++        properties:
++          tolerations: *tolerations-spec
++          nodeAffinity:
++            type: object
++            additionalProperties: false
++            description: |
++              Where should pods be scheduled? Perhaps on nodes with a certain
++              label is preferred or even required?
++            properties:
++              matchNodePurpose:
++                enum: [ignore, prefer, require]
++                description: |
++                  Decide if user pods *ignore*, *prefer* or *require* to
++                  schedule on nodes with this label:
++                  ```
++                  hub.jupyter.org/node-purpose=user
++                  ```
++
++  ingress:
++    type: object
++    additionalProperties: false
++    required: [enabled]
++    properties:
++      enabled:
++        type: boolean
++        description: |
++          Enable the creation of a Kubernetes Ingress to proxy-public service.
++
++          See [Advanced Topics — Zero to JupyterHub with Kubernetes
++          0.7.0 documentation](ingress)
++          for more details.
++      annotations:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          Annotations to apply to the Ingress resource.
++
++          See [the Kubernetes
++          documentation](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
++          for more details about annotations.
++      ingressClassName:
++        type: [string, "null"]
++        description: |
++          Maps directly to the Ingress resource's `spec.ingressClassName``.
++
++          See [the Kubernetes
++          documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)
++          for more details.
++      hosts:
++        type: array
++        description: |
++          List of hosts to route requests to the proxy.
++      pathSuffix:
++        type: [string, "null"]
++        description: |
++          Suffix added to Ingress's routing path pattern.
++
++          Specify `*` if your ingress matches path by glob pattern.
++      pathType:
++        enum: [Prefix, Exact, ImplementationSpecific]
++        description: |
++          The path type to use. The default value is 'Prefix'.
++
++          See [the Kubernetes documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/#path-types)
++          for more details about path types.
++      tls:
++        type: array
++        description: |
++          TLS configurations for Ingress.
++
++          See [the Kubernetes
++          documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls)
++          for more details about annotations.
++
++  prePuller:
++    type: object
++    additionalProperties: false
++    required: [hook, continuous]
++    properties:
++      revisionHistoryLimit: *revisionHistoryLimit
++      labels:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          Extra labels to add to the pre puller job pods.
++
++          See the [Kubernetes docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
++          to learn more about labels.
++      annotations:
++        type: object
++        additionalProperties: false
++        patternProperties: *labels-and-annotations-patternProperties
++        description: |
++          Annotations to apply to the hook and continous image puller pods. One example use case is to
++          disable istio sidecars which could interfere with the image pulling.
++      resources:
++        type: object
++        additionalProperties: true
++        description: |
++          These are standard Kubernetes resources with requests and limits for
++          cpu and memory. They will be used on the containers in the pods
++          pulling images. These should be set extremely low as the containers
++          shut down directly or is a pause container that just idles.
++
++          They were made configurable as usage of ResourceQuota may require
++          containers in the namespace to have explicit resources set.
++      extraTolerations: *tolerations-spec
++      hook:
++        type: object
++        additionalProperties: false
++        required: [enabled]
++        description: |
++          See the [*optimization
++          section*](pulling-images-before-users-arrive)
++          for more details.
++        properties:
++          enabled:
++            type: boolean
++          pullOnlyOnChanges:
++            type: boolean
++            description: |
++              Pull only if changes have been made to the images to pull, or more
++              accurately if the hook-image-puller daemonset has changed in any
++              way.
++          podSchedulingWaitDuration:
++            description: |
++              The `hook-image-awaiter` has a criteria to await all the
++              `hook-image-puller` DaemonSet's pods to both schedule and finish
++              their image pulling. This flag can be used to relax this criteria
++              to instead only await the pods that _has already scheduled_ to
++              finish image pulling after a certain duration.
++
++              The value of this is that sometimes the newly created
++              `hook-image-puller` pods cannot be scheduled because nodes are
++              full, and then it probably won't make sense to block a `helm
++              upgrade`.
++
++              An infinite duration to wait for pods to schedule can be
++              represented by `-1`. This was the default behavior of version
++              0.9.0 and earlier.
++            type: integer
++          nodeSelector: *nodeSelector-spec
++          tolerations: *tolerations-spec
++          containerSecurityContext: *containerSecurityContext-spec
++          image: *image-spec
++          resources: *resources-spec
++          serviceAccount: *serviceAccount
++      continuous:
++        type: object
++        additionalProperties: false
++        required: [enabled]
++        description: |
++          See the [*optimization
++          section*](pulling-images-before-users-arrive)
++          for more details.
++
++          ```{note}
++          If used with a Cluster Autoscaler (an autoscaling node pool), also add
++          user-placeholders and enable pod priority.
++          ```
++        properties:
++          enabled:
++            type: boolean
++      pullProfileListImages:
++        type: boolean
++        description: |
++          The singleuser.profileList configuration can provide a selection of
++          images. This option determines if all images identified there should
++          be pulled, both by the hook and continuous pullers.
++
++          Images are looked for under `kubespawner_override`, and also
++          `profile_options.choices.kubespawner_override` since version 3.2.0.
++
++          The reason to disable this, is that if you have for example 10 images
++          which start pulling in order from 1 to 10, a user that arrives and
++          wants to start a pod with image number 10 will need to wait for all
++          images to be pulled, and then it may be preferable to just let the
++          user arriving wait for a single image to be pulled on arrival.
++      extraImages:
++        type: object
++        additionalProperties: false
++        description: |
++          See the [*optimization section*](images-that-will-be-pulled) for more
++          details.
++
++          ```yaml
++          prePuller:
++            extraImages:
++              my-extra-image-i-want-pulled:
++                name: jupyter/all-spark-notebook
++                tag: 2343e33dec46
++          ```
++        patternProperties:
++          ".*":
++            type: object
++            additionalProperties: false
++            required: [name, tag]
++            properties:
++              name:
++                type: string
++              tag:
++                type: string
++      containerSecurityContext: *containerSecurityContext-spec
++      pause:
++        type: object
++        additionalProperties: false
++        description: |
++          The image-puller pods rely on initContainer to pull all images, and
++          their actual container when they are done is just running a `pause`
++          container. These are settings for that pause container.
++        properties:
++          containerSecurityContext: *containerSecurityContext-spec
++          image: *image-spec
++
++  custom:
++    type: object
++    additionalProperties: true
++    description: |
++      Additional values to pass to the Hub.
++      JupyterHub will not itself look at these,
++      but you can read values in your own custom config via `hub.extraConfig`.
++      For example:
++
++      ```yaml
++      custom:
++        myHost: "https://example.horse"
++      hub:
++        extraConfig:
++          myConfig.py: |
++            c.MyAuthenticator.host = get_config("custom.myHost")
++      ```
++
++  cull:
++    type: object
++    additionalProperties: false
++    required: [enabled]
++    description: |
++      The
++      [jupyterhub-idle-culler](https://github.com/jupyterhub/jupyterhub-idle-culler)
++      can run as a JupyterHub managed service to _cull_ running servers.
++    properties:
++      enabled:
++        type: boolean
++        description: |
++          Enable/disable use of jupyter-idle-culler.
++      users:
++        type: [boolean, "null"]
++        description: See the `--cull-users` flag.
++      adminUsers:
++        type: [boolean, "null"]
++        description: See the `--cull-admin-users` flag.
++      removeNamedServers:
++        type: [boolean, "null"]
++        description: See the `--remove-named-servers` flag.
++      timeout:
++        type: [integer, "null"]
++        description: See the `--timeout` flag.
++      every:
++        type: [integer, "null"]
++        description: See the `--cull-every` flag.
++      concurrency:
++        type: [integer, "null"]
++        description: See the `--concurrency` flag.
++      maxAge:
++        type: [integer, "null"]
++        description: See the `--max-age` flag.
++
++  debug:
++    type: object
++    additionalProperties: false
++    required: [enabled]
++    properties:
++      enabled:
++        type: boolean
++        description: |
++          Increases the loglevel throughout the resources in the Helm chart.
++
++  rbac:
++    type: object
++    additionalProperties: false
++    required: [create]
++    properties:
++      enabled:
++        type: boolean
++        # This schema entry is needed to help us print a more helpful error
++        # message in NOTES.txt if hub.fsGid is set.
++        #
++        description: |
++          ````{note}
++          Removed in version 2.0.0. If you have been using `rbac.enable=false`
++          (strongly discouraged), then the equivalent configuration would be:
++
++          ```yaml
++          rbac:
++            create: false
++          hub:
++            serviceAccount:
++              create: false
++          proxy:
++            traefik:
++              serviceAccount:
++                create: false
++          scheduling:
++            userScheduler:
++              serviceAccount:
++                create: false
++          prePuller:
++            hook:
++              serviceAccount:
++                create: false
++          ```
++          ````
++      create:
++        type: boolean
++        description: |
++          Decides if (Cluster)Role and (Cluster)RoleBinding resources are
++          created and bound to the configured serviceAccounts.
++
++  global:
++    type: object
++    additionalProperties: true
++    properties:
++      safeToShowValues:
++        type: boolean
++        description: |
++          A flag that should only be set to true temporarily when experiencing a
++          deprecation message that contain censored content that you wish to
++          reveal.
+diff --git a/applications/jupyterhub/deploy/values.yaml b/applications/jupyterhub/deploy/values.yaml
+index 2f5cbca..41e108d 100755
+--- a/applications/jupyterhub/deploy/values.yaml
++++ b/applications/jupyterhub/deploy/values.yaml
+@@ -1,4 +1,4 @@
+-harness:
++harness: # EDIT: CLOUDHARNESS
+   subdomain: hub
+   service:
+     auto: false
+@@ -31,6 +31,11 @@ harness:
+ fullnameOverride: ""
+ nameOverride:
+ 
++# enabled is ignored by the jupyterhub chart itself, but a chart depending on
++# the jupyterhub chart conditionally can make use this config option as the
++# condition.
++enabled:
++
+ # custom can contain anything you want to pass to the hub pod, as all passed
+ # Helm template values will be made available there.
+ custom: {}
+@@ -54,10 +59,11 @@ imagePullSecrets: []
+ # ConfigurableHTTPProxy speaks with the actual ConfigurableHTTPProxy server in
+ # the proxy pod.
+ hub:
++  revisionHistoryLimit:
+   config:
+     JupyterHub:
+       admin_access: true
+-      authenticator_class: keycloak
++      authenticator_class: keycloak # EDIT: CLOUDHARNESS
+   service:
+     type: ClusterIP
+     annotations: {}
+@@ -68,7 +74,6 @@ hub:
+   baseUrl: /
+   cookieSecret:
+   initContainers: []
+-  fsGid: 1000
+   nodeSelector: {}
+   tolerations: []
+   concurrentSpawnLimit: 64
+@@ -106,37 +111,38 @@ hub:
+   extraVolumes: []
+   extraVolumeMounts: []
+   image:
+-    name: jupyterhub/k8s-hub
+-    tag: "1.1.3"
++    name: quay.io/jupyterhub/k8s-hub
++    tag: "3.2.1"
+     pullPolicy:
+     pullSecrets: []
+   resources: {}
++  podSecurityContext:
++    fsGroup: 1000
+   containerSecurityContext:
+     runAsUser: 1000
+     runAsGroup: 1000
+     allowPrivilegeEscalation: false
+   lifecycle: {}
++  loadRoles: {}
+   services: {}
+   pdb:
+     enabled: false
+     maxUnavailable:
+     minAvailable: 1
+   networkPolicy:
+-    enabled: false
++    enabled: true
+     ingress: []
+-    ## egress for JupyterHub already includes Kubernetes internal DNS and
+-    ## access to the proxy, but can be restricted further, but ensure to allow
+-    ## access to the Kubernetes API server that couldn't be pinned ahead of
+-    ## time.
+-    ##
+-    ## ref: https://stackoverflow.com/a/59016417/2220152
+-    egress:
+-      - to:
+-          - ipBlock:
+-              cidr: 0.0.0.0/0
++    egress: []
++    egressAllowRules:
++      cloudMetadataServer: true
++      dnsPortsCloudMetadataServer: true
++      dnsPortsKubeSystemNamespace: true
++      dnsPortsPrivateIPs: true
++      nonPrivateIPs: true
++      privateIPs: true
+     interNamespaceAccessLabels: ignore
+     allowedIngressPorts: []
+-  allowNamedServers: true
++  allowNamedServers: true # EDIT: CLOUDHARNESS
+   namedServerLimitPerUser:
+   authenticatePrometheus:
+   redirectToServer:
+@@ -163,11 +169,13 @@ hub:
+     timeoutSeconds: 1
+   existingSecret:
+   serviceAccount:
++    create: true
++    name:
+     annotations: {}
+   extraPodSpec: {}
+ 
+ rbac:
+-  enabled: true
++  create: true
+ 
+ # proxy relates to the proxy pod, the proxy-public service, and the autohttps
+ # pod and proxy-http service.
+@@ -202,7 +210,7 @@ proxy:
+     rollingUpdate:
+   # service relates to the proxy-public service
+   service:
+-    type: NodePort
++    type: NodePort # EDIT: CLOUDHARNESS
+     labels: {}
+     annotations: {}
+     nodePorts:
+@@ -215,13 +223,17 @@ proxy:
+   # chp relates to the proxy pod, which is responsible for routing traffic based
+   # on dynamic configuration sent from JupyterHub to CHP's REST API.
+   chp:
++    revisionHistoryLimit:
+     containerSecurityContext:
+       runAsUser: 65534 # nobody user
+       runAsGroup: 65534 # nobody group
+       allowPrivilegeEscalation: false
+     image:
+-      name: jupyterhub/configurable-http-proxy
+-      tag: 4.5.0 # https://github.com/jupyterhub/configurable-http-proxy/releases
++      name: quay.io/jupyterhub/configurable-http-proxy
++      # tag is automatically bumped to new patch versions by the
++      # watch-dependencies.yaml workflow.
++      #
++      tag: "4.6.1" # https://github.com/jupyterhub/configurable-http-proxy/tags
+       pullPolicy:
+       pullSecrets: []
+     extraCommandLineFlags: []
+@@ -229,11 +241,14 @@ proxy:
+       enabled: true
+       initialDelaySeconds: 60
+       periodSeconds: 10
++      failureThreshold: 30
++      timeoutSeconds: 3
+     readinessProbe:
+       enabled: true
+       initialDelaySeconds: 0
+       periodSeconds: 2
+       failureThreshold: 1000
++      timeoutSeconds: 1
+     resources: {}
+     defaultTarget:
+     errorTarget:
+@@ -241,12 +256,16 @@ proxy:
+     nodeSelector: {}
+     tolerations: []
+     networkPolicy:
+-      enabled: false
++      enabled: true
+       ingress: []
+-      egress:
+-        - to:
+-            - ipBlock:
+-                cidr: 0.0.0.0/0
++      egress: []
++      egressAllowRules:
++        cloudMetadataServer: true
++        dnsPortsCloudMetadataServer: true
++        dnsPortsKubeSystemNamespace: true
++        dnsPortsPrivateIPs: true
++        nonPrivateIPs: true
++        privateIPs: true
+       interNamespaceAccessLabels: ignore
+       allowedIngressPorts: [http, https]
+     pdb:
+@@ -257,13 +276,17 @@ proxy:
+   # traefik relates to the autohttps pod, which is responsible for TLS
+   # termination when proxy.https.type=letsencrypt.
+   traefik:
++    revisionHistoryLimit:
+     containerSecurityContext:
+       runAsUser: 65534 # nobody user
+       runAsGroup: 65534 # nobody group
+       allowPrivilegeEscalation: false
+     image:
+       name: traefik
+-      tag: v2.4.11 # ref: https://hub.docker.com/_/traefik?tab=tags
++      # tag is automatically bumped to new patch versions by the
++      # watch-dependencies.yaml workflow.
++      #
++      tag: "v2.10.7" # ref: https://hub.docker.com/_/traefik?tab=tags
+       pullPolicy:
+       pullSecrets: []
+     hsts:
+@@ -272,6 +295,7 @@ proxy:
+       maxAge: 15724800 # About 6 months
+     resources: {}
+     labels: {}
++    extraInitContainers: []
+     extraEnv: {}
+     extraVolumes: []
+     extraVolumeMounts: []
+@@ -283,10 +307,14 @@ proxy:
+     networkPolicy:
+       enabled: true
+       ingress: []
+-      egress:
+-        - to:
+-            - ipBlock:
+-                cidr: 0.0.0.0/0
++      egress: []
++      egressAllowRules:
++        cloudMetadataServer: true
++        dnsPortsCloudMetadataServer: true
++        dnsPortsKubeSystemNamespace: true
++        dnsPortsPrivateIPs: true
++        nonPrivateIPs: true
++        privateIPs: true
+       interNamespaceAccessLabels: ignore
+       allowedIngressPorts: [http, https]
+     pdb:
+@@ -294,6 +322,8 @@ proxy:
+       maxUnavailable:
+       minAvailable: 1
+     serviceAccount:
++      create: true
++      name:
+       annotations: {}
+     extraPodSpec: {}
+   secretSync:
+@@ -302,8 +332,8 @@ proxy:
+       runAsGroup: 65534 # nobody group
+       allowPrivilegeEscalation: false
+     image:
+-      name: jupyterhub/k8s-secret-sync
+-      tag: "1.1.3"
++      name: quay.io/jupyterhub/k8s-secret-sync
++      tag: "3.2.1"
+       pullPolicy:
+       pullSecrets: []
+     resources: {}
+@@ -342,29 +372,27 @@ singleuser:
+     preferred: []
+   networkTools:
+     image:
+-      name: jupyterhub/k8s-network-tools
+-      tag: "1.1.3"
++      name: quay.io/jupyterhub/k8s-network-tools
++      tag: "3.2.1"
+       pullPolicy:
+       pullSecrets: []
++    resources: {}
+   cloudMetadata:
+     # block set to true will append a privileged initContainer using the
+     # iptables to block the sensitive metadata server at the provided ip.
+-    blockWithIptables: false
++    blockWithIptables: true
++    ip: 169.254.169.254
+   networkPolicy:
+-    enabled: false
++    enabled: true
+     ingress: []
+-    egress:
+-      # Required egress to communicate with the hub and DNS servers will be
+-      # augmented to these egress rules.
+-      #
+-      # This default rule explicitly allows all outbound traffic from singleuser
+-      # pods, except to a typical IP used to return metadata that can be used by
+-      # someone with malicious intent.
+-      - to:
+-          - ipBlock:
+-              cidr: 0.0.0.0/0
+-              except:
+-                - 169.254.169.254/32
++    egress: []
++    egressAllowRules:
++      cloudMetadataServer: false
++      dnsPortsCloudMetadataServer: true
++      dnsPortsKubeSystemNamespace: true
++      dnsPortsPrivateIPs: true
++      nonPrivateIPs: true
++      privateIPs: false
+     interNamespaceAccessLabels: ignore
+     allowedIngressPorts: []
+   events: true
+@@ -376,6 +404,7 @@ singleuser:
+   lifecycleHooks: {}
+   initContainers: []
+   extraContainers: []
++  allowPrivilegeEscalation: false
+   uid: 1000
+   fsGid: 100
+   serviceAccountName:
+@@ -387,29 +416,29 @@ singleuser:
+     static:
+       pvcName:
+       subPath: "{username}"
+-    capacity: 10Mi
+-    homeMountPath: /home/workspace
++    capacity: 10Mi # EDIT: CLOUDHARNESS
++    homeMountPath: /home/workspace # EDIT: CLOUDHARNESS
+     dynamic:
+       storageClass:
+-      pvcNameTemplate: jupyter-{username}
+-      volumeNameTemplate: jupyter-{username}
++      pvcNameTemplate: jupyter-{username} # EDIT: CLOUDHARNESS
++      volumeNameTemplate: jupyter-{username} # EDIT: CLOUDHARNESS
+       storageAccessModes: [ReadWriteOnce]
+   image:
+-    name: jupyter/base-notebook
+-    tag: "hub-1.4.2"
++    name: quay.io/jupyterhub/k8s-singleuser-sample
++    tag: "3.2.1"
+     pullPolicy:
+     pullSecrets: []
+   startTimeout: 300
+   cpu:
+-    limit: 0.4
+-    guarantee: 0.05
++    limit: 0.4  # EDIT: CLOUDHARNESS
++    guarantee: 0.05  # EDIT: CLOUDHARNESS
+   memory:
+-    limit: 0.5G
+-    guarantee: 0.1G
++    limit: 0.5G # EDIT: CLOUDHARNESS 
++    guarantee: 0.1G # EDIT: CLOUDHARNESS
+   extraResource:
+     limits: {}
+     guarantees: {}
+-  cmd: /usr/local/bin/start-singleuser.sh
++  cmd: jupyterhub-singleuser
+   defaultUrl:
+   extraPodConfig: {}
+   profileList: []
+@@ -417,74 +446,146 @@ singleuser:
+ # scheduling relates to the user-scheduler pods and user-placeholder pods.
+ scheduling:
+   userScheduler:
+-    enabled: false
++    enabled: false # EDIT: CLOUDHARNESS
++    revisionHistoryLimit:
+     replicas: 2
+     logLevel: 4
++    # plugins are configured on the user-scheduler to make us score how we
++    # schedule user pods in a way to help us schedule on the most busy node. By
++    # doing this, we help scale down more effectively. It isn't obvious how to
++    # enable/disable scoring plugins, and configure them, to accomplish this.
++    #
+     # plugins ref: https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins-1
++    # migration ref: https://kubernetes.io/docs/reference/scheduling/config/#scheduler-configuration-migrations
++    #
+     plugins:
+       score:
++        # These scoring plugins are enabled by default according to
++        # https://kubernetes.io/docs/reference/scheduling/config/#scheduling-plugins
++        # 2022-02-22.
++        #
++        # Enabled with high priority:
++        # - NodeAffinity
++        # - InterPodAffinity
++        # - NodeResourcesFit
++        # - ImageLocality
++        # Remains enabled with low default priority:
++        # - TaintToleration
++        # - PodTopologySpread
++        # - VolumeBinding
++        # Disabled for scoring:
++        # - NodeResourcesBalancedAllocation
++        #
+         disabled:
+-          - name: SelectorSpread
+-          - name: TaintToleration
+-          - name: PodTopologySpread
++          # We disable these plugins (with regards to scoring) to not interfere
++          # or complicate our use of NodeResourcesFit.
+           - name: NodeResourcesBalancedAllocation
+-          - name: NodeResourcesLeastAllocated
+           # Disable plugins to be allowed to enable them again with a different
+           # weight and avoid an error.
+-          - name: NodePreferAvoidPods
+           - name: NodeAffinity
+           - name: InterPodAffinity
++          - name: NodeResourcesFit
+           - name: ImageLocality
+         enabled:
+-          - name: NodePreferAvoidPods
+-            weight: 161051
+           - name: NodeAffinity
+             weight: 14631
+           - name: InterPodAffinity
+             weight: 1331
+-          - name: NodeResourcesMostAllocated
++          - name: NodeResourcesFit
+             weight: 121
+           - name: ImageLocality
+             weight: 11
++    pluginConfig:
++      # Here we declare that we should optimize pods to fit based on a
++      # MostAllocated strategy instead of the default LeastAllocated.
++      - name: NodeResourcesFit
++        args:
++          scoringStrategy:
++            resources:
++              - name: cpu
++                weight: 1
++              - name: memory
++                weight: 1
++            type: MostAllocated
+     containerSecurityContext:
+       runAsUser: 65534 # nobody user
+       runAsGroup: 65534 # nobody group
+       allowPrivilegeEscalation: false
+     image:
+       # IMPORTANT: Bumping the minor version of this binary should go hand in
+-      #            hand with an inspection of the user-scheduelrs RBAC resources
+-      #            that we have forked.
+-      name: k8s.gcr.io/kube-scheduler
+-      tag: v1.19.13 # ref: https://github.com/kubernetes/website/blob/main/content/en/releases/patch-releases.md
++      #            hand with an inspection of the user-scheduelr's RBAC
++      #            resources that we have forked in
++      #            templates/scheduling/user-scheduler/rbac.yaml.
++      #
++      #            Debugging advice:
++      #
++      #            - Is configuration of kube-scheduler broken in
++      #              templates/scheduling/user-scheduler/configmap.yaml?
++      #
++      #            - Is the kube-scheduler binary's compatibility to work
++      #              against a k8s api-server that is too new or too old?
++      #
++      #            - You can update the GitHub workflow that runs tests to
++      #              include "deploy/user-scheduler" in the k8s namespace report
++      #              and reduce the user-scheduler deployments replicas to 1 in
++      #              dev-config.yaml to get relevant logs from the user-scheduler
++      #              pods. Inspect the "Kubernetes namespace report" action!
++      #
++      #            - Typical failures are that kube-scheduler fails to search for
++      #              resources via its "informers", and won't start trying to
++      #              schedule pods before they succeed which may require
++      #              additional RBAC permissions or that the k8s api-server is
++      #              aware of the resources.
++      #
++      #            - If "successfully acquired lease" can be seen in the logs, it
++      #              is a good sign kube-scheduler is ready to schedule pods.
++      #
++      name: registry.k8s.io/kube-scheduler
++      # tag is automatically bumped to new patch versions by the
++      # watch-dependencies.yaml workflow. The minor version is pinned in the
++      # workflow, and should be updated there if a minor version bump is done
++      # here. We aim to stay around 1 minor version behind the latest k8s
++      # version.
++      #
++      tag: "v1.28.6" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
+       pullPolicy:
+       pullSecrets: []
+     nodeSelector: {}
+     tolerations: []
++    labels: {}
++    annotations: {}
+     pdb:
+       enabled: true
+       maxUnavailable: 1
+       minAvailable:
+     resources: {}
+     serviceAccount:
++      create: true
++      name:
+       annotations: {}
+     extraPodSpec: {}
+   podPriority:
+     enabled: false
+     globalDefault: false
+     defaultPriority: 0
++    imagePullerPriority: -5
+     userPlaceholderPriority: -10
+   userPlaceholder:
+     enabled: true
+     image:
+-      name: k8s.gcr.io/pause
+-      # tag's can be updated by inspecting the output of the command:
+-      # gcloud container images list-tags k8s.gcr.io/pause --sort-by=~tags
++      name: registry.k8s.io/pause
++      # tag is automatically bumped to new patch versions by the
++      # watch-dependencies.yaml workflow.
+       #
+       # If you update this, also update prePuller.pause.image.tag
+-      tag: "3.5"
++      #
++      tag: "3.9"
+       pullPolicy:
+       pullSecrets: []
++    revisionHistoryLimit:
+     replicas: 0
++    labels: {}
++    annotations: {}
+     containerSecurityContext:
+       runAsUser: 65534 # nobody user
+       runAsGroup: 65534 # nobody group
+@@ -517,6 +618,8 @@ scheduling:
+ 
+ # prePuller relates to the hook|continuous-image-puller DaemonsSets
+ prePuller:
++  revisionHistoryLimit:
++  labels: {}
+   annotations: {}
+   resources: {}
+   containerSecurityContext:
+@@ -530,8 +633,8 @@ prePuller:
+     pullOnlyOnChanges: true
+     # image and the configuration below relates to the hook-image-awaiter Job
+     image:
+-      name: jupyterhub/k8s-image-awaiter
+-      tag: "1.1.3"
++      name: quay.io/jupyterhub/k8s-image-awaiter
++      tag: "3.2.1"
+       pullPolicy:
+       pullSecrets: []
+     containerSecurityContext:
+@@ -543,6 +646,8 @@ prePuller:
+     tolerations: []
+     resources: {}
+     serviceAccount:
++      create: true
++      name:
+       annotations: {}
+   continuous:
+     enabled: true
+@@ -554,18 +659,20 @@ prePuller:
+       runAsGroup: 65534 # nobody group
+       allowPrivilegeEscalation: false
+     image:
+-      name: k8s.gcr.io/pause
+-      # tag's can be updated by inspecting the output of the command:
+-      # gcloud container images list-tags k8s.gcr.io/pause --sort-by=~tags
++      name: registry.k8s.io/pause
++      # tag is automatically bumped to new patch versions by the
++      # watch-dependencies.yaml workflow.
+       #
+       # If you update this, also update scheduling.userPlaceholder.image.tag
+-      tag: "3.5"
++      #
++      tag: "3.9"
+       pullPolicy:
+       pullSecrets: []
+ 
+ ingress:
+   enabled: false
+   annotations: {}
++  ingressClassName:
+   hosts: []
+   pathSuffix:
+   pathType: Prefix
+@@ -581,7 +688,8 @@ ingress:
+ cull:
+   enabled: true
+   users: false # --cull-users
+-  removeNamedServers: true # --remove-named-servers
++  adminUsers: true # --cull-admin-users
++  removeNamedServers: true  # EDIT: CLOUDHARNESS
+   timeout: 3600 # --timeout
+   every: 600 # --cull-every
+   concurrency: 10 # --concurrency
+diff --git a/applications/jupyterhub/zero-to-jupyterhub-k8s b/applications/jupyterhub/zero-to-jupyterhub-k8s
+new file mode 160000
+index 0000000..c92c123
+--- /dev/null
++++ b/applications/jupyterhub/zero-to-jupyterhub-k8s
+@@ -0,0 +1 @@
++Subproject commit c92c12374795e84f36f5f16c4e8b8a448ad2f230-dirty
diff --git a/applications/jupyterhub/update.sh b/applications/jupyterhub/update.sh
new file mode 100644
index 00000000..cddf6899
--- /dev/null
+++ b/applications/jupyterhub/update.sh
@@ -0,0 +1,28 @@
+git clone -n git@github.com:jupyterhub/zero-to-jupyterhub-k8s.git
+git checkout jupyterhub
+git checkout chartpress.yaml
+pip install chartpress
+cd zero-to-jupyterhub-k8s
+chartpress -t $1 
+cd ..
+cp -R zero-to-jupyterhub-k8s/jupyterhub/templates/* deploy/templates
+cp zero-to-jupyterhub-k8s/jupyterhub/files/hub/* deploy/resources/hub
+cp zero-to-jupyterhub-k8s/jupyterhub/values* deploy
+cd deploy
+
+rm -Rf templates/proxy/autohttps # Proxy is not used as node balancer
+rm templates/ingress.yaml # Default cloudharness ingress is used
+# Command to replace everything like files/hub/ inside deploy/templates with resources/jupyterhub/hub/
+find templates -type f -exec sed -i 's/files\/hub/resources\/jupyterhub\/hub/g' {} \;
+
+# replace .Values.hub. with .Values.hub.config with .Values.apps.jupyterhub.hub
+find templates -type f -exec sed -i 's/.Values./.Values.apps.jupyterhub./g' {} \;
+
+# replace .Values.apps.jupyterhub.hub.image with .Values.apps.jupyterhub.harness.deployment.image
+find templates -type f -exec sed -i 's/{{ .Values.apps.jupyterhub.hub.image.name }}:{{ .Values.apps.jupyterhub.hub.image.tag }}/{{ .Values.apps.jupyterhub.harness.deployment.image }}/g' {} \;
+
+
+
+find templates -type f -exec sed -i 's$.Template.BasePath "/hub$.Template.BasePath "/jupyterhub/hub$g' {} \;
+find templates -type f -exec sed -i 's$.Template.BasePath "/proxy$.Template.BasePath "/jupyterhub/proxy$g' {} \;
+find templates -type f -exec sed -i 's$.Template.BasePath "/scheduling$.Template.BasePath "/jupyterhub/scheduling$g' {} \;
diff --git a/deployment/codefresh-test-local.yaml b/deployment/codefresh-test-local.yaml
index 612e214b..19a91c83 100644
--- a/deployment/codefresh-test-local.yaml
+++ b/deployment/codefresh-test-local.yaml
@@ -32,9 +32,8 @@ steps:
     working_directory: .
     commands:
     - bash cloud-harness/install.sh
-    - harness-deployment . -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
-      -d ${{CF_SHORT_REVISION}}.${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}}
-      -e test-local --write-env -N -i samples
+    - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
+      -rs ${{REGISTRY_SECRET}} -e test-local --write-env -N -i jupyterhub
     - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
     - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:
@@ -72,33 +71,11 @@ steps:
                 == true
               forceNoCache: includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
                 == false
-      cloudharness-frontend-build:
-        type: build
-        stage: build
-        dockerfile: infrastructure/base-images/cloudharness-frontend-build/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
-        buildkit: true
-        build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        image_name: cloudharness/cloudharness-frontend-build
-        title: Cloudharness frontend build
-        working_directory: ./.
-        tag: '${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}'
-        when:
-          condition:
-            any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
-                '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
-                '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}') == false
-  build_static_images:
-    title: Build static images
+  build_application_images:
     type: parallel
     stage: build
     steps:
-      cloudharness-flask:
+      accounts:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -108,23 +85,18 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/cloudharness-flask
-        title: Cloudharness flask
-        working_directory: ./infrastructure/common-images/cloudharness-flask
-        tag: '${{CLOUDHARNESS_FLASK_TAG}}'
+        image_name: cloudharness/accounts
+        title: Accounts
+        working_directory: ./applications/accounts
+        tag: '${{ACCOUNTS_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
                 == false
-  build_application_images:
-    type: parallel
-    stage: build
-    steps:
-      nfsserver:
+      jupyterhub:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -134,18 +106,19 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        image_name: cloudharness/nfsserver
-        title: Nfsserver
-        working_directory: ./applications/nfsserver
-        tag: '${{NFSSERVER_TAG}}'
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        image_name: cloudharness/jupyterhub
+        title: Jupyterhub
+        working_directory: ./applications/jupyterhub
+        tag: '${{JUPYTERHUB_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{NFSSERVER_TAG_EXISTS}}', '{{NFSSERVER_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_TAG_EXISTS}}', '{{JUPYTERHUB_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{NFSSERVER_TAG_FORCE_BUILD}}', '{{NFSSERVER_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{JUPYTERHUB_TAG_FORCE_BUILD}}', '{{JUPYTERHUB_TAG_FORCE_BUILD}}')
                 == false
-      accounts:
+      jupyterhub-zero-to-jupyterhub-k8s-images-secret-sync:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -155,18 +128,20 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        image_name: cloudharness/accounts
-        title: Accounts
-        working_directory: ./applications/accounts
-        tag: '${{ACCOUNTS_TAG}}'
+        image_name: cloudharness/jupyterhub-zero-to-jupyterhub-k8s-images-secret-sync
+        title: Jupyterhub zero to jupyterhub k8s images secret sync
+        working_directory: ./applications/jupyterhub/zero-to-jupyterhub-k8s/images/secret-sync
+        tag: '${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SECRET_SYNC_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SECRET_SYNC_TAG_EXISTS}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SECRET_SYNC_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SECRET_SYNC_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SECRET_SYNC_TAG_FORCE_BUILD}}')
                 == false
-      samples:
+      jupyterhub-zero-to-jupyterhub-k8s-images-image-awaiter:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -176,20 +151,20 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
-        image_name: cloudharness/samples
-        title: Samples
-        working_directory: ./applications/samples
-        tag: '${{SAMPLES_TAG}}'
+        image_name: cloudharness/jupyterhub-zero-to-jupyterhub-k8s-images-image-awaiter
+        title: Jupyterhub zero to jupyterhub k8s images image awaiter
+        working_directory: ./applications/jupyterhub/zero-to-jupyterhub-k8s/images/image-awaiter
+        tag: '${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_IMAGE_AWAITER_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_IMAGE_AWAITER_TAG_EXISTS}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_IMAGE_AWAITER_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_IMAGE_AWAITER_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_IMAGE_AWAITER_TAG_FORCE_BUILD}}')
                 == false
-      samples-print-file:
+      jupyterhub-zero-to-jupyterhub-k8s-images-singleuser-sample:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -199,19 +174,20 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/samples-print-file
-        title: Samples print file
-        working_directory: ./applications/samples/tasks/print-file
-        tag: '${{SAMPLES_PRINT_FILE_TAG}}'
+        image_name: cloudharness/jupyterhub-zero-to-jupyterhub-k8s-images-singleuser-sample
+        title: Jupyterhub zero to jupyterhub k8s images singleuser sample
+        working_directory: ./applications/jupyterhub/zero-to-jupyterhub-k8s/images/singleuser-sample
+        tag: '${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SINGLEUSER_SAMPLE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SINGLEUSER_SAMPLE_TAG_EXISTS}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SINGLEUSER_SAMPLE_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SINGLEUSER_SAMPLE_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_SINGLEUSER_SAMPLE_TAG_FORCE_BUILD}}')
                 == false
-      samples-secret:
+      jupyterhub-zero-to-jupyterhub-k8s-images-network-tools:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -221,19 +197,20 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/samples-secret
-        title: Samples secret
-        working_directory: ./applications/samples/tasks/secret
-        tag: '${{SAMPLES_SECRET_TAG}}'
+        image_name: cloudharness/jupyterhub-zero-to-jupyterhub-k8s-images-network-tools
+        title: Jupyterhub zero to jupyterhub k8s images network tools
+        working_directory: ./applications/jupyterhub/zero-to-jupyterhub-k8s/images/network-tools
+        tag: '${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_NETWORK_TOOLS_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_NETWORK_TOOLS_TAG_EXISTS}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_NETWORK_TOOLS_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_NETWORK_TOOLS_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_NETWORK_TOOLS_TAG_FORCE_BUILD}}')
                 == false
-      samples-sum:
+      jupyterhub-zero-to-jupyterhub-k8s-images-hub:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -243,19 +220,20 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/samples-sum
-        title: Samples sum
-        working_directory: ./applications/samples/tasks/sum
-        tag: '${{SAMPLES_SUM_TAG}}'
+        image_name: cloudharness/jupyterhub-zero-to-jupyterhub-k8s-images-hub
+        title: Jupyterhub zero to jupyterhub k8s images hub
+        working_directory: ./applications/jupyterhub/zero-to-jupyterhub-k8s/images/hub
+        tag: '${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_HUB_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
-                == true
-              forceNoCache: includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_HUB_TAG_EXISTS}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_HUB_TAG_EXISTS}}') ==
+                true
+              forceNoCache: includes('${{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_HUB_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_ZERO_TO_JUPYTERHUB_K8S_IMAGES_HUB_TAG_FORCE_BUILD}}')
                 == false
-      common:
+      jupyterhub-jupyterhub:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -265,19 +243,18 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
-        image_name: cloudharness/common
-        title: Common
-        working_directory: ./applications/common/server
-        tag: '${{COMMON_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub
+        title: Jupyterhub jupyterhub
+        working_directory: ./applications/jupyterhub/src/jupyterhub
+        tag: '${{JUPYTERHUB_JUPYTERHUB_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
-                == true
-              forceNoCache: includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
-                == false
-      workflows-send-result-event:
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_TAG_EXISTS}}') == true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_TAG_FORCE_BUILD}}') == false
+      jupyterhub-jupyterhub-singleuser:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -287,19 +264,18 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/workflows-send-result-event
-        title: Workflows send result event
-        working_directory: ./applications/workflows/tasks/send-result-event
-        tag: '${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub-singleuser
+        title: Jupyterhub jupyterhub singleuser
+        working_directory: ./applications/jupyterhub/src/jupyterhub/singleuser
+        tag: '${{JUPYTERHUB_JUPYTERHUB_SINGLEUSER_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
-                '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
-                '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}') == false
-      workflows-extract-download:
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_SINGLEUSER_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_SINGLEUSER_TAG_EXISTS}}') == true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_SINGLEUSER_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_SINGLEUSER_TAG_FORCE_BUILD}}') == false
+      jupyterhub-jupyterhub-examples-service-fastapi:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -309,18 +285,20 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        image_name: cloudharness/workflows-extract-download
-        title: Workflows extract download
-        working_directory: ./applications/workflows/tasks/extract-download
-        tag: '${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub-examples-service-fastapi
+        title: Jupyterhub jupyterhub examples service fastapi
+        working_directory: ./applications/jupyterhub/src/jupyterhub/examples/service-fastapi
+        tag: '${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_SERVICE_FASTAPI_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
-                '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
-                '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}') == false
-      workflows-notify-queue:
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_SERVICE_FASTAPI_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_EXAMPLES_SERVICE_FASTAPI_TAG_EXISTS}}') ==
+                true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_SERVICE_FASTAPI_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_EXAMPLES_SERVICE_FASTAPI_TAG_FORCE_BUILD}}')
+                == false
+      jupyterhub-jupyterhub-examples-postgres-db:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -330,19 +308,19 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/workflows-notify-queue
-        title: Workflows notify queue
-        working_directory: ./applications/workflows/tasks/notify-queue
-        tag: '${{WORKFLOWS_NOTIFY_QUEUE_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub-examples-postgres-db
+        title: Jupyterhub jupyterhub examples postgres db
+        working_directory: ./applications/jupyterhub/src/jupyterhub/examples/postgres/db
+        tag: '${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_DB_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
-                '{{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
-                '{{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}') == false
-      workflows:
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_DB_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_DB_TAG_EXISTS}}') == true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_DB_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_DB_TAG_FORCE_BUILD}}')
+                == false
+      jupyterhub-jupyterhub-examples-postgres-hub:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -352,50 +330,19 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
-        image_name: cloudharness/workflows
-        title: Workflows
-        working_directory: ./applications/workflows/server
-        tag: '${{WORKFLOWS_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub-examples-postgres-hub
+        title: Jupyterhub jupyterhub examples postgres hub
+        working_directory: ./applications/jupyterhub/src/jupyterhub/examples/postgres/hub
+        tag: '${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_HUB_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
-                == true
-              forceNoCache: includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_HUB_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_HUB_TAG_EXISTS}}') == true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_HUB_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_EXAMPLES_POSTGRES_HUB_TAG_FORCE_BUILD}}')
                 == false
-  tests_unit:
-    stage: unittest
-    type: parallel
-    steps:
-      samples_ut:
-        title: Unit tests for samples
-        commands:
-        - pytest /usr/src/app/samples/test
-        image: '${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}'
-  deployment:
-    stage: deploy
-    type: helm
-    working_directory: ./${{CF_REPO_NAME}}
-    title: Installing chart
-    arguments:
-      helm_version: 3.6.2
-      chart_name: deployment/helm
-      release_name: test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
-      kube_context: '${{CLUSTER_NAME}}'
-      namespace: test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
-      chart_version: '${{CF_BUILD_ID}}'
-      cmd_ps: --timeout 600s --create-namespace
-      custom_value_files:
-      - ./deployment/helm/values.yaml
-      custom_values:
-      - apps_samples_harness_secrets_asecret=${{ASECRET}}
-  build_test_images:
-    title: Build test images
-    type: parallel
-    stage: qa
-    steps:
-      test-e2e:
+      jupyterhub-jupyterhub-demo-image:
         type: build
         stage: build
         dockerfile: Dockerfile
@@ -405,128 +352,58 @@ steps:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        image_name: cloudharness/test-e2e
-        title: Test e2e
-        working_directory: ./test/test-e2e
-        tag: '${{TEST_E2E_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub-demo-image
+        title: Jupyterhub jupyterhub demo image
+        working_directory: ./applications/jupyterhub/src/jupyterhub/demo-image
+        tag: '${{JUPYTERHUB_JUPYTERHUB_DEMO_IMAGE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
-                == true
-              forceNoCache: includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
-                == false
-      test-api:
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_DEMO_IMAGE_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_DEMO_IMAGE_TAG_EXISTS}}') == true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_DEMO_IMAGE_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_DEMO_IMAGE_TAG_FORCE_BUILD}}') == false
+      jupyterhub-jupyterhub-onbuild:
         type: build
         stage: build
-        dockerfile: test/test-api/Dockerfile
+        dockerfile: Dockerfile
         registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
         - DOMAIN=${{DOMAIN}}
         - NOCACHE=${{CF_BUILD_ID}}
         - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
-        image_name: cloudharness/test-api
-        title: Test api
-        working_directory: ./.
-        tag: '${{TEST_API_TAG}}'
+        image_name: cloudharness/jupyterhub-jupyterhub-onbuild
+        title: Jupyterhub jupyterhub onbuild
+        working_directory: ./applications/jupyterhub/src/jupyterhub/onbuild
+        tag: '${{JUPYTERHUB_JUPYTERHUB_ONBUILD_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
-                == true
-              forceNoCache: includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
-                == false
-  wait_deployment:
-    stage: qa
-    title: Wait deployment to be ready
-    image: codefresh/kubectl
-    commands:
-    - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
-    - kubectl rollout status deployment/accounts
-    - kubectl rollout status deployment/samples
-    - kubectl rollout status deployment/common
-    - kubectl rollout status deployment/workflows
-    - sleep 60
-  tests_api:
-    stage: qa
-    title: Api tests
-    working_directory: /home/test
-    image: '${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}'
-    fail_fast: false
-    commands:
-    - echo $APP_NAME
-    scale:
-      samples_api_test:
-        title: samples api test
-        volumes:
-        - '${{CF_REPO_NAME}}/applications/samples:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
-        environment:
-        - APP_URL=https://samples.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
-        commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://samples.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api -c all --skip-deprecated-operations
-          --hypothesis-suppress-health-check=too_slow --hypothesis-deadline=180000
-          --request-timeout=180000 --hypothesis-max-examples=2 --show-errors-tracebacks
-        - pytest -v test/api
-      common_api_test:
-        title: common api test
-        volumes:
-        - '${{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
-        commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://common.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api -c all
-      workflows_api_test:
-        title: workflows api test
-        volumes:
-        - '${{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
-        commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://workflows.${{CF_SHORT_REVISION}}.${{DOMAIN}}/api -c all
-    hooks:
-      on_fail:
-        exec:
-          image: alpine
-          commands:
-          - cf_export  FAILED=failed
-  tests_e2e:
-    stage: qa
-    title: End to end tests
-    working_directory: /home/test
-    image: '${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}'
-    fail_fast: false
-    commands:
-    - yarn test
-    scale:
-      samples_e2e_test:
-        title: samples e2e test
-        volumes:
-        - '${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples'
-        environment:
-        - APP_URL=https://samples.${{CF_SHORT_REVISION}}.${{DOMAIN}}
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
-    hooks:
-      on_fail:
-        exec:
-          image: alpine
-          commands:
-          - cf_export  FAILED=failed
+              buildDoesNotExist: includes('${{JUPYTERHUB_JUPYTERHUB_ONBUILD_TAG_EXISTS}}',
+                '{{JUPYTERHUB_JUPYTERHUB_ONBUILD_TAG_EXISTS}}') == true
+              forceNoCache: includes('${{JUPYTERHUB_JUPYTERHUB_ONBUILD_TAG_FORCE_BUILD}}',
+                '{{JUPYTERHUB_JUPYTERHUB_ONBUILD_TAG_FORCE_BUILD}}') == false
+  deployment:
+    stage: deploy
+    type: helm
+    working_directory: ./${{CF_REPO_NAME}}
+    title: Installing chart
+    arguments:
+      helm_version: 3.6.2
+      chart_name: deployment/helm
+      release_name: test-${{NAMESPACE_BASENAME}}
+      kube_context: '${{CLUSTER_NAME}}'
+      namespace: test-${{NAMESPACE_BASENAME}}
+      chart_version: '${{CF_SHORT_REVISION}}'
+      cmd_ps: --timeout 600s --create-namespace
+      custom_value_files:
+      - ./deployment/helm/values.yaml
+      custom_values: []
   approval:
     type: pending-approval
     stage: qa
-    title: Approve with failed tests
+    title: Approve anyway and delete deployment
     description: The pipeline will fail after ${{WAIT_ON_FAIL}} minutes
     timeout:
       timeUnit: minutes
@@ -536,21 +413,11 @@ steps:
       condition:
         all:
           error: '"${{FAILED}}" == "failed"'
-          wait_on_fail: '${{WAIT_ON_FAIL}}'
-  dummy_end:
-    title: Dummy step
-    description: Without this, the on_finish hook is executed before the approval
-      step
-    image: python:3.9.10
-    stage: qa
-    when:
-      condition:
-        all:
-          error: '"${{FAILED}}" == "failed"'
-          wait_on_fail: '${{WAIT_ON_FAIL}}'
-hooks:
-  on_finish:
+  delete_deployment:
+    title: Delete deployment
+    description: The deployment is deleted at the end of the pipeline
     image: codefresh/kubectl
+    stage: qa
     commands:
     - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl delete ns test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
+    - kubectl delete ns test-${{NAMESPACE_BASENAME}}

From f87869b8462be4bebe18b3eb9adf2c63392eaf1f Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 22 Jan 2024 12:38:05 +0100
Subject: [PATCH 004/210] CH-110 jupyterhub update OK; add tests

---
 .../deploy/resources/hub/jupyterhub_config.py |  6 ++--
 .../jupyterhub/deploy/values-test.yaml        |  7 +++++
 applications/jupyterhub/deploy/values.yaml    |  6 ++++
 .../harness_jupyter/jupyterhub.py             |  2 +-
 applications/samples/deploy/values-test.yaml  |  8 +++++
 deployment/codefresh-test.yaml                | 30 +++++++++++++++++++
 6 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 applications/jupyterhub/deploy/values-test.yaml

diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
index 5ebe20b5..8fdfa8c1 100755
--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
@@ -12,8 +12,6 @@
 
 #CLOUDHARNESS: EDIT START
 import logging
-from kubernetes import client
-from jupyterhub.utils import url_path_join
 
 try:
     from harness_jupyter.jupyterhub import harness_hub
@@ -492,6 +490,7 @@ def camelCaseify(s):
         cfg.pop("keys", None)
     c[app].update(cfg)
 
+
 # load /usr/local/etc/jupyterhub/jupyterhub_config.d config files
 config_dir = "/usr/local/etc/jupyterhub/jupyterhub_config.d"
 if os.path.isdir(config_dir):
@@ -560,4 +559,5 @@ def camelCaseify(s):
 c.registry = get_config('registry')
 c.domain = get_config('root.domain')
 c.namespace = get_config('root.namespace')
-# CLOUDHARNESS: EDIT END
\ No newline at end of file
+# CLOUDHARNESS: EDIT END
+    
\ No newline at end of file
diff --git a/applications/jupyterhub/deploy/values-test.yaml b/applications/jupyterhub/deploy/values-test.yaml
new file mode 100644
index 00000000..3ca312d3
--- /dev/null
+++ b/applications/jupyterhub/deploy/values-test.yaml
@@ -0,0 +1,7 @@
+harness:
+  accounts:
+    users:
+    - username: samplehub@testuser.com
+      realmRoles:
+      - offline_access
+
diff --git a/applications/jupyterhub/deploy/values.yaml b/applications/jupyterhub/deploy/values.yaml
index 41e108d6..b871b33b 100755
--- a/applications/jupyterhub/deploy/values.yaml
+++ b/applications/jupyterhub/deploy/values.yaml
@@ -25,6 +25,12 @@ harness: # EDIT: CLOUDHARNESS
     quota-ws-maxmem: 0.5
     # sets the storage dedicated to the user data in Gb units (float)
     quota-storage-max: 1.25
+  test:
+    e2e:
+      enabled: true
+      smoketest: true
+      ignoreRequestErrors: false
+      ignoreConsoleErrors: false
 
 # fullnameOverride and nameOverride distinguishes blank strings, null values,
 # and non-blank strings. For more details, see the configuration reference.
diff --git a/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py b/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
index 220883a8..fc4d0dd0 100644
--- a/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
+++ b/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
@@ -139,7 +139,7 @@ def change_pod_manifest(self: KubeSpawner):
 
                 if 'subdomain' in harness and harness['subdomain'] == subdomain:
                     ws_image = getattr(self, "ws_image", None)
-                    logging.info("Subdomain is", subdomain)
+                    logging.info("Subdomain is %s", subdomain)
                     if ws_image:
                         # try getting the image + tag from values.yaml
                         ch_conf = conf.get_configuration()
diff --git a/applications/samples/deploy/values-test.yaml b/applications/samples/deploy/values-test.yaml
index 3555108f..14274fd6 100644
--- a/applications/samples/deploy/values-test.yaml
+++ b/applications/samples/deploy/values-test.yaml
@@ -1,4 +1,12 @@
 harness:
+  dependencies:
+    soft:
+      - workflows
+      - events
+      - accounts 
+      - common
+      - nfsserver
+      - jupyterhub
   accounts:
     roles:
     - role1
diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index ff7a88af..7280c8e6 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -165,6 +165,28 @@ steps:
                 == true
               forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
                 == false
+      jupyterhub:
+        type: build
+        stage: build
+        dockerfile: Dockerfile
+        registry: '${{CODEFRESH_REGISTRY}}'
+        buildkit: true
+        build_arguments:
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        image_name: cloudharness/jupyterhub
+        title: Jupyterhub
+        working_directory: ./applications/jupyterhub
+        tag: '${{JUPYTERHUB_TAG}}'
+        when:
+          condition:
+            any:
+              buildDoesNotExist: includes('${{JUPYTERHUB_TAG_EXISTS}}', '{{JUPYTERHUB_TAG_EXISTS}}')
+                == true
+              forceNoCache: includes('${{JUPYTERHUB_TAG_FORCE_BUILD}}', '{{JUPYTERHUB_TAG_FORCE_BUILD}}')
+                == false
       samples:
         type: build
         stage: build
@@ -510,6 +532,14 @@ steps:
     commands:
     - yarn test
     scale:
+      jupyterhub_e2e_test:
+        title: jupyterhub e2e test
+        volumes:
+        - '${{CF_REPO_NAME}}/applications/jupyterhub/test/e2e:/home/test/__tests__/jupyterhub'
+        environment:
+        - APP_URL=https://hub.${{DOMAIN}}
+        - USERNAME=samplehub@testuser.com
+        - PASSWORD=test
       samples_e2e_test:
         title: samples e2e test
         volumes:

From 9c905eb17cc78d39c5fc560bc5f250ab649ec7ba Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 22 Jan 2024 15:13:19 +0100
Subject: [PATCH 005/210] CH-110 fix test

---
 applications/jupyterhub/deploy/values-test.yaml | 6 ------
 deployment/codefresh-test.yaml                  | 4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/applications/jupyterhub/deploy/values-test.yaml b/applications/jupyterhub/deploy/values-test.yaml
index 3ca312d3..8b137891 100644
--- a/applications/jupyterhub/deploy/values-test.yaml
+++ b/applications/jupyterhub/deploy/values-test.yaml
@@ -1,7 +1 @@
-harness:
-  accounts:
-    users:
-    - username: samplehub@testuser.com
-      realmRoles:
-      - offline_access
 
diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index bbedd788..d15db5cd 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -467,7 +467,9 @@ steps:
     - kubectl config use-context ${{CLUSTER_NAME}}
     - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
     - kubectl rollout status deployment/accounts
+    - kubectl rollout status deployment/argo-server-gk
     - kubectl rollout status deployment/samples
+    - kubectl rollout status deployment/samples-gk
     - kubectl rollout status deployment/common
     - kubectl rollout status deployment/workflows
     - sleep 60
@@ -536,7 +538,7 @@ steps:
         - '${{CF_REPO_NAME}}/applications/jupyterhub/test/e2e:/home/test/__tests__/jupyterhub'
         environment:
         - APP_URL=https://hub.${{DOMAIN}}
-        - USERNAME=samplehub@testuser.com
+        - USERNAME=sample@testuser.com
         - PASSWORD=test
       samples_e2e_test:
         title: samples e2e test

From 313b9e47491c5c2c1a8795dab01147893245dc8d Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 22 Jan 2024 16:52:10 +0100
Subject: [PATCH 006/210] CH-110 Disable hub network policy

---
 applications/jupyterhub/deploy/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/jupyterhub/deploy/values.yaml b/applications/jupyterhub/deploy/values.yaml
index b871b33b..9be3ad5d 100755
--- a/applications/jupyterhub/deploy/values.yaml
+++ b/applications/jupyterhub/deploy/values.yaml
@@ -136,7 +136,7 @@ hub:
     maxUnavailable:
     minAvailable: 1
   networkPolicy:
-    enabled: true
+    enabled: false # EDIT: CLOUDHARNESS -- cannot connect to accounts otherwise
     ingress: []
     egress: []
     egressAllowRules:

From 24132a5d52e806d21cfabad02345f6140ecfebf6 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 23 Jan 2024 16:38:26 +0100
Subject: [PATCH 007/210] CH-94 add control on image prepull

---
 .../image-puller/_helpers-daemonset.tpl       | 20 ++++++++++++
 .../jupyterhub/deploy/values-test.yaml        |  6 +++-
 docs/jupyterhub.md                            | 31 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
index 528345c0..f872a336 100644
--- a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
+++ b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
@@ -199,7 +199,27 @@ spec:
           securityContext:
             {{- . | toYaml | nindent 12 }}
           {{- end }}
+      {{- end }}
+      {{- /* --- EDIT: CLOUDHARNESS pull images --- */}}
+      {{- if $.Values.apps.jupyterhub.harness.jupyterhub.prepull -}}
+        {{- range $k, $v := $.Values.apps.jupyterhub.harness.jupyterhub.prepull }}
+        - name: image-pull--{{ $v }}
+          image: {{ get ( get $.Values "task-images" ) $v }}
+          command:
+            - /bin/sh
+            - -c
+            - echo "Pulling complete"
+          {{- with $.Values.apps.jupyterhub.prePuller.resources }}
+          resources:
+            {{- . | toYaml | nindent 12 }}
+          {{- end }}
+          {{- with $.Values.apps.jupyterhub.prePuller.containerSecurityContext }}
+          securityContext:
+            {{- . | toYaml | nindent 12 }}
+          {{- end }}
         {{- end }}
+      {{- end }}
+      {{- /* --- END EDIT: CLOUDHARNESS pull images --- */}}
       containers:
         - name: pause
           image: {{ .Values.apps.jupyterhub.prePuller.pause.image.name }}:{{ .Values.apps.jupyterhub.prePuller.pause.image.tag }}
diff --git a/applications/jupyterhub/deploy/values-test.yaml b/applications/jupyterhub/deploy/values-test.yaml
index 8b137891..653cae1e 100644
--- a/applications/jupyterhub/deploy/values-test.yaml
+++ b/applications/jupyterhub/deploy/values-test.yaml
@@ -1 +1,5 @@
-
+harness:
+  jupyterhub:
+    prepull: 
+    - cloudharness-base
+ 
diff --git a/docs/jupyterhub.md b/docs/jupyterhub.md
index 709ede5f..3d7046bc 100644
--- a/docs/jupyterhub.md
+++ b/docs/jupyterhub.md
@@ -35,6 +35,7 @@ Edit the `deploy/values.yaml` file `harness.jupyterhub` section  to edit configu
 - `applicationHook`: change the hook function (advances, see below)
 - `extraConfig`: allows you to add Python snippets to the jupyterhub_config.py file
 - `spawnerExtraConfig`: allows you to add values to the spawner object without the need of creating a new hook
+- `prepull`: indicate images that will be prepulled from the current build
 
 Example:
 ```yaml
@@ -46,6 +47,8 @@ harness:
     name: proxy-public
   jupyterhub:
     args: ["--debug", "--NotebookApp.default_url=/lab"]
+    prepull:
+    - cloudharness-base
     extraConfig:
       timing: |
         c.Spawner.port = 8000
@@ -179,4 +182,30 @@ Cloudharness JupyterHub is integrated with the accounts service so enabling a sh
 
 The spawner is also adapted providing a hook to allow other applications to be based on the hub spawner to run with their own configurations.
 
-Available
\ No newline at end of file
+Available
+
+## Prepull configuration
+Image prepull can be configured in two ways.
+
+For static images (tag known), can set `prepuller.extraImages` on `applications/jupyterhub/deploy/values.yaml`, like:
+
+```yaml
+prePuller:
+  extraImages:
+    nginx-image:
+      name: nginx
+      tag: latest
+```
+
+For images which build is managed by CloudHarness the tag is unknown during the configuration;
+for this case, can rely on the dynamic configuration through `harness.jupyterhub.prepull` variable, like:
+
+```yaml
+harness:
+  jupyterhub:
+    prepull: 
+    - cloudharness-base
+```
+
+> Note that only built images defined as tasks, base or common can be used here. 
+> If an image is not included, it might be required to include it also as a build dependency or, better, define task images directly inside your jupyterhub application override.

From 99958b7dbd8ab21ab42addf16909653fc365ec46 Mon Sep 17 00:00:00 2001
From: Zoran Sinnema <zsinnema@gmail.com>
Date: Mon, 29 Jan 2024 10:57:13 +0100
Subject: [PATCH 008/210] chore(): save jupyterhub profile list in self:

---
 .../jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py b/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
index fc4d0dd0..ac7dafa6 100644
--- a/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
+++ b/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
@@ -18,6 +18,7 @@
 def custom_options_form(spawner, abc):
     # let's skip the profile selection form for now
     # ToDo: for future we can remove this hook
+    spawner._ch_profile_list = spawner.profile_list
     spawner.profile_list = []
     # ref: https://github.com/jupyterhub/kubespawner/blob/37a80abb0a6c826e5c118a068fa1cf2725738038/kubespawner/spawner.py#L1885-L1935
     return spawner._options_form_default()

From 7126e57da27642aa5db6148692212443e23ed5cf Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jan 2024 13:34:57 +0100
Subject: [PATCH 009/210] CH-110 fix custom prepull issue

---
 .../deploy/templates/image-puller/_helpers-daemonset.tpl      | 4 ++--
 applications/jupyterhub/deploy/values.yaml                    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
index f872a336..04fb18a3 100644
--- a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
+++ b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
@@ -201,8 +201,8 @@ spec:
           {{- end }}
       {{- end }}
       {{- /* --- EDIT: CLOUDHARNESS pull images --- */}}
-      {{- if $.Values.apps.jupyterhub.harness.jupyterhub.prepull -}}
-        {{- range $k, $v := $.Values.apps.jupyterhub.harness.jupyterhub.prepull }}
+      {{- if $.Values.apps.jupyterhub.harness.dependencies.prepull -}}
+        {{- range $k, $v := $.Values.apps.jupyterhub.harness.dependencies.prepull }}
         - name: image-pull--{{ $v }}
           image: {{ get ( get $.Values "task-images" ) $v }}
           command:
diff --git a/applications/jupyterhub/deploy/values.yaml b/applications/jupyterhub/deploy/values.yaml
index 9be3ad5d..5acc7928 100755
--- a/applications/jupyterhub/deploy/values.yaml
+++ b/applications/jupyterhub/deploy/values.yaml
@@ -12,6 +12,7 @@ harness: # EDIT: CLOUDHARNESS
     - accounts
     build:
     - cloudharness-base
+    prepull: [] # additional images to add to the prepuller
   quotas:
     # sets the maximum number of (included named) servers open concurrently (int)
     quota-ws-open: 3
@@ -31,6 +32,7 @@ harness: # EDIT: CLOUDHARNESS
       smoketest: true
       ignoreRequestErrors: false
       ignoreConsoleErrors: false
+  
 
 # fullnameOverride and nameOverride distinguishes blank strings, null values,
 # and non-blank strings. For more details, see the configuration reference.

From d25230ff5144cfead4bf98eb343ddd684dfa654a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 6 Feb 2024 13:23:28 -0600
Subject: [PATCH 010/210] CH-100 Add first code to call a dedicated
 docker-compose generation

---
 .../deploy/templates/{ => helm}/argo-sa.yaml  |   0
 .../templates/{ => helm}/broker-config.yml    |   0
 .../templates/{ => helm}/configmap.yaml       |   0
 .../templates/{ => helm}/deployments.yml      |   0
 .../deploy/templates/{ => helm}/roles.yml     |   0
 .../deploy/templates/{ => helm}/services.yml  |   0
 .../templates/{ => helm}/zoo-config.yml       |   0
 .../{ => helm}/_helpers-auth-rework.tpl       |   0
 .../templates/{ => helm}/_helpers-names.tpl   |   0
 .../deploy/templates/{ => helm}/_helpers.tpl  |   0
 .../{ => helm}/hub/_helpers-passwords.tpl     |   0
 .../templates/{ => helm}/hub/configmap.yaml   |   0
 .../templates/{ => helm}/hub/deployment.yaml  |   0
 .../templates/{ => helm}/hub/netpol.yaml      |   0
 .../deploy/templates/{ => helm}/hub/pdb.yaml  |   0
 .../deploy/templates/{ => helm}/hub/pvc.yaml  |   0
 .../deploy/templates/{ => helm}/hub/rbac.yaml |   0
 .../templates/{ => helm}/hub/secret.yaml      |   0
 .../templates/{ => helm}/hub/service.yaml     |   0
 .../image-puller/_helpers-daemonset.tpl       |   0
 .../image-puller/daemonset-continuous.yaml    |   0
 .../image-puller/daemonset-hook.yaml          |   0
 .../{ => helm}/image-puller/job.yaml          |   0
 .../{ => helm}/image-puller/rbac.yaml         |   0
 .../{ => helm}/proxy/autohttps/_README.txt    |   0
 .../{ => helm}/proxy/autohttps/configmap.yaml |   0
 .../proxy/autohttps/deployment.yaml           |   0
 .../{ => helm}/proxy/autohttps/rbac.yaml      |   0
 .../{ => helm}/proxy/autohttps/service.yaml   |   0
 .../{ => helm}/proxy/deployment.yaml          |   0
 .../templates/{ => helm}/proxy/netpol.yaml    |   0
 .../templates/{ => helm}/proxy/pdb.yaml       |   0
 .../templates/{ => helm}/proxy/secret.yaml    |   0
 .../templates/{ => helm}/proxy/service.yaml   |   0
 .../scheduling/_scheduling-helpers.tpl        |   0
 .../{ => helm}/scheduling/priorityclass.yaml  |   0
 .../scheduling/user-placeholder/pdb.yaml      |   0
 .../user-placeholder/priorityclass.yaml       |   0
 .../user-placeholder/statefulset.yaml         |   0
 .../scheduling/user-scheduler/configmap.yaml  |   0
 .../scheduling/user-scheduler/deployment.yaml |   0
 .../scheduling/user-scheduler/pdb.yaml        |   0
 .../scheduling/user-scheduler/rbac.yaml       |   0
 .../{ => helm}/singleuser/netpol.yaml         |   0
 .../deploy/templates/{ => helm}/_helpers.tpl  |   0
 .../templates/{ => helm}/clusterrole.yaml     |   0
 .../{ => helm}/clusterrolebinding.yaml        |   0
 .../templates/{ => helm}/nfs-server.yaml      |   0
 .../{ => helm}/podsecuritypolicy.yaml         |   0
 .../deploy/templates/{ => helm}/role.yaml     |   0
 .../templates/{ => helm}/rolebinding.yaml     |   0
 .../templates/{ => helm}/serviceaccount.yaml  |   0
 .../templates/{ => helm}/storageclass.yaml    |   0
 .../deploy/templates/{ => helm}/redis.yaml    |   0
 deployment-configuration/compose/.helmignore  |  22 +
 deployment-configuration/compose/Chart.yaml   |  10 +
 deployment-configuration/compose/README.md    |   4 +
 .../compose/templates/auto-compose.yaml       | 103 +++
 deployment-configuration/compose/values.yaml  |  79 ++
 .../ch_cli_tools/dockercompose.py             | 753 ++++++++++++++++++
 .../deployment-cli-tools/ch_cli_tools/helm.py |  10 +-
 tools/deployment-cli-tools/harness-deployment |  41 +-
 62 files changed, 1015 insertions(+), 7 deletions(-)
 rename applications/argo/deploy/templates/{ => helm}/argo-sa.yaml (100%)
 rename applications/events/deploy/templates/{ => helm}/broker-config.yml (100%)
 rename applications/events/deploy/templates/{ => helm}/configmap.yaml (100%)
 rename applications/events/deploy/templates/{ => helm}/deployments.yml (100%)
 rename applications/events/deploy/templates/{ => helm}/roles.yml (100%)
 rename applications/events/deploy/templates/{ => helm}/services.yml (100%)
 rename applications/events/deploy/templates/{ => helm}/zoo-config.yml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/_helpers-auth-rework.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/_helpers-names.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/_helpers.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/_helpers-passwords.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/configmap.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/netpol.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/pvc.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/secret.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/hub/service.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/image-puller/_helpers-daemonset.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/image-puller/daemonset-continuous.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/image-puller/daemonset-hook.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/image-puller/job.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/image-puller/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/autohttps/_README.txt (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/autohttps/configmap.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/autohttps/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/autohttps/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/autohttps/service.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/netpol.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/secret.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/proxy/service.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/_scheduling-helpers.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/priorityclass.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-placeholder/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-placeholder/priorityclass.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-placeholder/statefulset.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-scheduler/configmap.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-scheduler/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-scheduler/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/scheduling/user-scheduler/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{ => helm}/singleuser/netpol.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/_helpers.tpl (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/clusterrole.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/clusterrolebinding.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/nfs-server.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/podsecuritypolicy.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/role.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/rolebinding.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/serviceaccount.yaml (100%)
 rename applications/nfsserver/deploy/templates/{ => helm}/storageclass.yaml (100%)
 rename applications/sentry/deploy/templates/{ => helm}/redis.yaml (100%)
 create mode 100644 deployment-configuration/compose/.helmignore
 create mode 100644 deployment-configuration/compose/Chart.yaml
 create mode 100644 deployment-configuration/compose/README.md
 create mode 100644 deployment-configuration/compose/templates/auto-compose.yaml
 create mode 100644 deployment-configuration/compose/values.yaml
 create mode 100644 tools/deployment-cli-tools/ch_cli_tools/dockercompose.py

diff --git a/applications/argo/deploy/templates/argo-sa.yaml b/applications/argo/deploy/templates/helm/argo-sa.yaml
similarity index 100%
rename from applications/argo/deploy/templates/argo-sa.yaml
rename to applications/argo/deploy/templates/helm/argo-sa.yaml
diff --git a/applications/events/deploy/templates/broker-config.yml b/applications/events/deploy/templates/helm/broker-config.yml
similarity index 100%
rename from applications/events/deploy/templates/broker-config.yml
rename to applications/events/deploy/templates/helm/broker-config.yml
diff --git a/applications/events/deploy/templates/configmap.yaml b/applications/events/deploy/templates/helm/configmap.yaml
similarity index 100%
rename from applications/events/deploy/templates/configmap.yaml
rename to applications/events/deploy/templates/helm/configmap.yaml
diff --git a/applications/events/deploy/templates/deployments.yml b/applications/events/deploy/templates/helm/deployments.yml
similarity index 100%
rename from applications/events/deploy/templates/deployments.yml
rename to applications/events/deploy/templates/helm/deployments.yml
diff --git a/applications/events/deploy/templates/roles.yml b/applications/events/deploy/templates/helm/roles.yml
similarity index 100%
rename from applications/events/deploy/templates/roles.yml
rename to applications/events/deploy/templates/helm/roles.yml
diff --git a/applications/events/deploy/templates/services.yml b/applications/events/deploy/templates/helm/services.yml
similarity index 100%
rename from applications/events/deploy/templates/services.yml
rename to applications/events/deploy/templates/helm/services.yml
diff --git a/applications/events/deploy/templates/zoo-config.yml b/applications/events/deploy/templates/helm/zoo-config.yml
similarity index 100%
rename from applications/events/deploy/templates/zoo-config.yml
rename to applications/events/deploy/templates/helm/zoo-config.yml
diff --git a/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl b/applications/jupyterhub/deploy/templates/helm/_helpers-auth-rework.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
rename to applications/jupyterhub/deploy/templates/helm/_helpers-auth-rework.tpl
diff --git a/applications/jupyterhub/deploy/templates/_helpers-names.tpl b/applications/jupyterhub/deploy/templates/helm/_helpers-names.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/_helpers-names.tpl
rename to applications/jupyterhub/deploy/templates/helm/_helpers-names.tpl
diff --git a/applications/jupyterhub/deploy/templates/_helpers.tpl b/applications/jupyterhub/deploy/templates/helm/_helpers.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/_helpers.tpl
rename to applications/jupyterhub/deploy/templates/helm/_helpers.tpl
diff --git a/applications/jupyterhub/deploy/templates/hub/_helpers-passwords.tpl b/applications/jupyterhub/deploy/templates/helm/hub/_helpers-passwords.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/_helpers-passwords.tpl
rename to applications/jupyterhub/deploy/templates/helm/hub/_helpers-passwords.tpl
diff --git a/applications/jupyterhub/deploy/templates/hub/configmap.yaml b/applications/jupyterhub/deploy/templates/helm/hub/configmap.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/configmap.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/configmap.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/deployment.yaml b/applications/jupyterhub/deploy/templates/helm/hub/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/deployment.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/netpol.yaml b/applications/jupyterhub/deploy/templates/helm/hub/netpol.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/netpol.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/netpol.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/pdb.yaml b/applications/jupyterhub/deploy/templates/helm/hub/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/pdb.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/pvc.yaml b/applications/jupyterhub/deploy/templates/helm/hub/pvc.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/pvc.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/pvc.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/rbac.yaml b/applications/jupyterhub/deploy/templates/helm/hub/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/rbac.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/secret.yaml b/applications/jupyterhub/deploy/templates/helm/hub/secret.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/secret.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/secret.yaml
diff --git a/applications/jupyterhub/deploy/templates/hub/service.yaml b/applications/jupyterhub/deploy/templates/helm/hub/service.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/hub/service.yaml
rename to applications/jupyterhub/deploy/templates/helm/hub/service.yaml
diff --git a/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl b/applications/jupyterhub/deploy/templates/helm/image-puller/_helpers-daemonset.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
rename to applications/jupyterhub/deploy/templates/helm/image-puller/_helpers-daemonset.tpl
diff --git a/applications/jupyterhub/deploy/templates/image-puller/daemonset-continuous.yaml b/applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-continuous.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/image-puller/daemonset-continuous.yaml
rename to applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-continuous.yaml
diff --git a/applications/jupyterhub/deploy/templates/image-puller/daemonset-hook.yaml b/applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-hook.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/image-puller/daemonset-hook.yaml
rename to applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-hook.yaml
diff --git a/applications/jupyterhub/deploy/templates/image-puller/job.yaml b/applications/jupyterhub/deploy/templates/helm/image-puller/job.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/image-puller/job.yaml
rename to applications/jupyterhub/deploy/templates/helm/image-puller/job.yaml
diff --git a/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml b/applications/jupyterhub/deploy/templates/helm/image-puller/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
rename to applications/jupyterhub/deploy/templates/helm/image-puller/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt b/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/_README.txt
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
rename to applications/jupyterhub/deploy/templates/helm/proxy/autohttps/_README.txt
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/configmap.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/autohttps/configmap.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/autohttps/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/autohttps/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/service.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/autohttps/service.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/deployment.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/deployment.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/netpol.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/netpol.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/netpol.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/netpol.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/pdb.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/pdb.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/secret.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/secret.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/secret.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/secret.yaml
diff --git a/applications/jupyterhub/deploy/templates/proxy/service.yaml b/applications/jupyterhub/deploy/templates/helm/proxy/service.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/proxy/service.yaml
rename to applications/jupyterhub/deploy/templates/helm/proxy/service.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/_scheduling-helpers.tpl b/applications/jupyterhub/deploy/templates/helm/scheduling/_scheduling-helpers.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/_scheduling-helpers.tpl
rename to applications/jupyterhub/deploy/templates/helm/scheduling/_scheduling-helpers.tpl
diff --git a/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/priorityclass.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/priorityclass.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/priorityclass.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/priorityclass.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/statefulset.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/statefulset.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/configmap.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/configmap.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml b/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
rename to applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml b/applications/jupyterhub/deploy/templates/helm/singleuser/netpol.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
rename to applications/jupyterhub/deploy/templates/helm/singleuser/netpol.yaml
diff --git a/applications/nfsserver/deploy/templates/_helpers.tpl b/applications/nfsserver/deploy/templates/helm/_helpers.tpl
similarity index 100%
rename from applications/nfsserver/deploy/templates/_helpers.tpl
rename to applications/nfsserver/deploy/templates/helm/_helpers.tpl
diff --git a/applications/nfsserver/deploy/templates/clusterrole.yaml b/applications/nfsserver/deploy/templates/helm/clusterrole.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/clusterrole.yaml
rename to applications/nfsserver/deploy/templates/helm/clusterrole.yaml
diff --git a/applications/nfsserver/deploy/templates/clusterrolebinding.yaml b/applications/nfsserver/deploy/templates/helm/clusterrolebinding.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/clusterrolebinding.yaml
rename to applications/nfsserver/deploy/templates/helm/clusterrolebinding.yaml
diff --git a/applications/nfsserver/deploy/templates/nfs-server.yaml b/applications/nfsserver/deploy/templates/helm/nfs-server.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/nfs-server.yaml
rename to applications/nfsserver/deploy/templates/helm/nfs-server.yaml
diff --git a/applications/nfsserver/deploy/templates/podsecuritypolicy.yaml b/applications/nfsserver/deploy/templates/helm/podsecuritypolicy.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/podsecuritypolicy.yaml
rename to applications/nfsserver/deploy/templates/helm/podsecuritypolicy.yaml
diff --git a/applications/nfsserver/deploy/templates/role.yaml b/applications/nfsserver/deploy/templates/helm/role.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/role.yaml
rename to applications/nfsserver/deploy/templates/helm/role.yaml
diff --git a/applications/nfsserver/deploy/templates/rolebinding.yaml b/applications/nfsserver/deploy/templates/helm/rolebinding.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/rolebinding.yaml
rename to applications/nfsserver/deploy/templates/helm/rolebinding.yaml
diff --git a/applications/nfsserver/deploy/templates/serviceaccount.yaml b/applications/nfsserver/deploy/templates/helm/serviceaccount.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/serviceaccount.yaml
rename to applications/nfsserver/deploy/templates/helm/serviceaccount.yaml
diff --git a/applications/nfsserver/deploy/templates/storageclass.yaml b/applications/nfsserver/deploy/templates/helm/storageclass.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/storageclass.yaml
rename to applications/nfsserver/deploy/templates/helm/storageclass.yaml
diff --git a/applications/sentry/deploy/templates/redis.yaml b/applications/sentry/deploy/templates/helm/redis.yaml
similarity index 100%
rename from applications/sentry/deploy/templates/redis.yaml
rename to applications/sentry/deploy/templates/helm/redis.yaml
diff --git a/deployment-configuration/compose/.helmignore b/deployment-configuration/compose/.helmignore
new file mode 100644
index 00000000..50af0317
--- /dev/null
+++ b/deployment-configuration/compose/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/deployment-configuration/compose/Chart.yaml b/deployment-configuration/compose/Chart.yaml
new file mode 100644
index 00000000..f294c3e7
--- /dev/null
+++ b/deployment-configuration/compose/Chart.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+appVersion: "0.0.1"
+description: CloudHarness Helm Chart
+name: cloudharness
+version: 0.0.1
+maintainers:
+  - name: Filippo Ledda
+    email: filippo@metacell.us
+  - name: Zoran Sinnema
+    email: zoran@metacell.us
diff --git a/deployment-configuration/compose/README.md b/deployment-configuration/compose/README.md
new file mode 100644
index 00000000..abeab69d
--- /dev/null
+++ b/deployment-configuration/compose/README.md
@@ -0,0 +1,4 @@
+# CloudHarness Helm chart: deploy CloudHarness to k8s
+
+Helm is used to define the CloudHarness deployment on Kubernetes. For further information about Helm, see https://helm.sh.
+
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
new file mode 100644
index 00000000..5b4893ba
--- /dev/null
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -0,0 +1,103 @@
+version: '3.7'
+
+services:
+{{- range $app_name, $app_config := .Values.apps }}
+  {{- if has $app_name (list "argo" "nfsserver" "workflows" "events" ) }} {{- /* We deactivate generation for some services */}}
+  {{- continue }}
+  {{- end}}
+  {{ $deployment :=  $app_config.harness.deployment }}
+  {{ $app_name }}:
+    {{- with $app_config.domain }}
+    domainname: {{ . }}
+    {{- end }}
+    networks:
+    - ch
+    {{- with $app_config.image }}
+    image: {{ . }}
+    {{- end }}
+    {{- with $app_config.harness.service.port }}
+    ports:
+      - "{{ . }}:{{ $app_config.harness.deployment.port }}"
+    {{- end}}
+    deploy:
+      mode: "replicated"
+      replicas: {{ $deployment.replicas | default 1 }}
+      resources:
+        limits:
+          cpus: {{ $deployment.resources.limits.cpu | default "50m" }}
+          memory: {{ trimSuffix "i" $deployment.resources.limits.memory | default "64M" }}
+        reservations:
+          cpus: {{ $deployment.resources.requests.cpu | default "25m" }}
+          memory: {{ trimSuffix "i" $deployment.resources.requests.memory | default "32M" }}
+    environment:
+      - CH_CURRENT_APP_NAME={{ $app_name | quote }}
+
+      {{- range $.Values.env }}
+      - {{ .name }}={{ .value | quote }}
+      {{- end }}
+      {{- /*{{- range $.Values.env }}
+      - {{ .name }}={{ .value | quote }}
+      {{- end }} */}}
+      {{- range $app_config.harness.env }}
+      - {{ .name }}={{ .value | quote }}
+      {{- end }}
+    {{- with $app_config.harness.dependencies.soft }}
+    # links:
+    #   {{- range . }}
+    #   - {{ . }}
+    #   {{- end }}
+    {{- end }}
+    {{- with $app_config.harness.dependencies.hard }}
+    depends_on:
+      {{- range . }}
+      - {{ . }}
+      {{- end }}
+    {{- end }}
+    {{- if or $deployment.volume $app_config.harness.resources }}
+    volumes:
+    {{- with $deployment.volume }}
+      - type: volume
+        source: {{ .name }}
+        target: {{ .mountpath }}
+    {{- end}}
+    {{- with $app_config.harness.resources }}
+    {{- range .}}
+      - type: bind
+        source: compose/resources/{{ $app_name }}/{{.src }}
+        target: {{ .dst }}
+    {{- end }}
+    {{- end}}
+    {{- end }}
+{{- end }}
+
+  traefik:
+    image: "traefik:v2.2"
+    container_name: "traefik"
+    networks:
+    - ch
+    command:
+      - "--log.level=INFO"
+      - "--api.insecure=true"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.web.address=:80"
+      - "--entrypoints.websecure.address=:443"
+      - "--providers.file.directory=/etc/traefik/dynamic_conf"
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "./certs/:/certs/:ro"
+      - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
+
+networks:
+  ch:
+    name: ch_network
+
+volumes:  # this inclusion needs to be conditional
+{{- range $app_name, $app_config := .Values.apps }}
+  {{- with $app_config.harness.deployment.volume }}
+  {{ .name }}:
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/deployment-configuration/compose/values.yaml b/deployment-configuration/compose/values.yaml
new file mode 100644
index 00000000..434dcac7
--- /dev/null
+++ b/deployment-configuration/compose/values.yaml
@@ -0,0 +1,79 @@
+# -- If set to true, local DNS mapping is added to pods.
+local: false
+# -- Enables/disables Gatekeeper.
+secured_gatekeepers: true
+# -- The root domain.
+domain: ${{DOMAIN}}
+# -- The K8s namespace.
+namespace: ch
+# -- Name of mainapp, routes incoming traffic of root `domaim` to this app.
+mainapp: accounts
+registry:
+  # -- The docker registry.
+  name: "localhost:5000"
+  # -- Optional secret used for pulling from docker registry.
+  secret:
+# -- Docker tag used to pull images.
+tag: latest
+# -- List of applications.
+# @default -- Will be filled automatically.
+apps: {}
+env:
+  # -- Cloud Harness version
+  - name: CH_VERSION
+    value: 0.0.1
+  # -- Cloud harness chart version
+  - name: CH_CHART_VERSION
+    value: 0.0.1
+privenv:
+  # -- Defines a secret as private environment variable that is injected in containers.
+  - name: CH_SECRET
+    value: In God we trust; all others must bring data. ― W. Edwards Deming
+ingress:
+  # -- Flag to enable/disalbe ingress controller.
+  enabled: true
+  # -- K8s Name of ingress.
+  name: cloudharness-ingress
+  # -- Enables/disables SSL redirect.
+  ssl_redirect: true
+  letsencrypt:
+    # -- Email for letsencrypt.
+    email: filippo@metacell.us
+backup:
+  # -- Flag to enable/disable backups.
+  active: false
+  # -- Number of days to keep backups.
+  keep_days: "7"
+  # -- Number of weeks to keep backups.
+  keep_weeks: "4"
+  # -- Number of months to keep backups.
+  keep_months: "6"
+  # -- Schedule as cronjob expression.
+  schedule: "*/5 * * * *"
+  # -- The file suffix added to backup files.
+  suffix: ".gz"
+  # -- The volume size for backups (all backups share the same volume)
+  volumesize: "2Gi"
+  # -- Target directory of backups, the mount point of the persistent volume.
+  dir: "/backups"
+  resources:
+    requests:
+      # -- K8s memory resource definition.
+      memory: "32Mi"
+      # -- K8s cpu resource definition.
+      cpu: "25m"
+    limits:
+      # -- K8s memory resource definition.
+      memory: "64Mi"
+      # -- K8s cpu resource definition.
+      cpu: "50m"
+proxy:
+  timeout:
+    # -- Timeout for proxy connections in seconds.
+    send: 60
+    # -- Timeout for proxy responses in seconds.
+    read: 60
+    keepalive: 60
+  payload:
+    # -- Maximum size of payload in MB
+    max: 250
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
new file mode 100644
index 00000000..39ff0272
--- /dev/null
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -0,0 +1,753 @@
+"""
+Utilities to create a helm chart from a CloudHarness directory structure
+"""
+import yaml
+import os
+import shutil
+import logging
+from hashlib import sha1
+import subprocess
+from functools import cache
+import tarfile
+from docker import from_env as DockerClient
+from pathlib import Path
+
+
+from . import HERE, CH_ROOT
+from cloudharness_utils.constants import TEST_IMAGES_PATH, VALUES_MANUAL_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
+    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH
+from .utils import get_cluster_ip, get_image_name, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
+    get_template, merge_configuration_directories, merge_to_yaml_file, dict_merge, app_name_from_path, \
+    find_dockerfiles_paths
+
+from .models import HarnessMainConfig
+
+KEY_HARNESS = 'harness'
+KEY_SERVICE = 'service'
+KEY_DATABASE = 'database'
+KEY_DEPLOYMENT = 'deployment'
+KEY_APPS = 'apps'
+KEY_TASK_IMAGES = 'task-images'
+KEY_TEST_IMAGES = 'test-images'
+
+DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
+
+
+def create_docker_compose_configuration(root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+                      output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
+                      namespace=None, templates_path=HELM_PATH) -> HarnessMainConfig:
+    if (type(env)) == str:
+        env = [env]
+    return CloudHarnessHelm(root_paths, tag=tag, registry=registry, local=local, domain=domain, exclude=exclude, secured=secured,
+                            output_path=output_path, include=include, registry_secret=registry_secret, tls=tls, env=env,
+                            namespace=namespace, templates_path=templates_path).process_values()
+
+
+class CloudHarnessHelm:
+    def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+                 output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
+                 namespace=None, templates_path=HELM_PATH):
+        assert domain, 'A domain must be specified'
+        self.root_paths = [Path(r) for r in root_paths]
+        self.tag = tag
+        if not registry.endswith('/'):
+            self.registry = f'{registry}/'
+        else:
+            self.registry = registry
+        self.local = local
+        self.domain = domain
+        self.exclude = exclude
+        self.secured = secured
+        self.output_path = Path(output_path)
+        self.include = include
+        self.registry_secret = registry_secret
+        self.tls = tls
+        self.env = env
+        self.namespace = namespace
+
+        self.templates_path = templates_path
+        self.dest_deployment_path = self.output_path / templates_path
+        self.helm_chart_path = self.dest_deployment_path / 'Chart.yaml'
+        self.__init_deployment()
+
+        self.static_images = set()
+        self.base_images = {}
+        self.all_images = {}
+
+    def __init_deployment(self):
+        """
+        Create the base helm chart
+        """
+        if self.dest_deployment_path.exists():
+            shutil.rmtree(self.dest_deployment_path)
+        # Initialize with default
+        copy_merge_base_deployment(self.dest_deployment_path, Path(CH_ROOT) / DEPLOYMENT_CONFIGURATION_PATH / self.templates_path)
+
+        # Override for every cloudharness scaffolding
+        for root_path in self.root_paths:
+            copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
+                                       base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH /self.templates_path)
+            collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
+                                        dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
+
+    def __adjust_missing_values(self, helm_values):
+        if 'name' not in helm_values:
+            with open(self.helm_chart_path) as f:
+                chart_idx_content = yaml.safe_load(f)
+            helm_values['name'] = chart_idx_content['name'].lower()
+
+    def process_values(self) -> HarnessMainConfig:
+        """
+        Creates values file for the helm chart
+        """
+        helm_values = self.__get_default_helm_values()
+
+        self.__adjust_missing_values(helm_values)
+
+        helm_values = self.__merge_base_helm_values(helm_values)
+
+        helm_values[KEY_APPS] = {}
+
+        base_image_name = helm_values['name']
+
+        helm_values[KEY_TASK_IMAGES] = {}
+
+        self.__init_base_images(base_image_name)
+        self.__init_static_images(base_image_name)
+        helm_values[KEY_TEST_IMAGES] = self.__init_test_images(base_image_name)
+
+        self.__process_applications(helm_values, base_image_name)
+
+        # self.create_tls_certificate(helm_values)
+
+        values, include = self.__finish_helm_values(values=helm_values)
+
+        # Adjust dependencies from static (common) images
+        self.__assign_static_build_dependencies(helm_values)
+
+        for root_path in self.root_paths:
+            collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
+                                        dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
+
+        # Save values file for manual helm chart
+        merged_values = merge_to_yaml_file(helm_values, self.dest_deployment_path / VALUES_MANUAL_PATH)
+        if self.namespace:
+            merge_to_yaml_file({'metadata': {'namespace': self.namespace},
+                                'name': helm_values['name']}, self.helm_chart_path)
+        validate_helm_values(merged_values)
+        return HarnessMainConfig.from_dict(merged_values)
+
+    def __process_applications(self, helm_values, base_image_name):
+        for root_path in self.root_paths:
+            app_values = init_app_values(
+                root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
+            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+                                               app_values)
+
+            app_base_path = root_path / APPS_PATH
+            app_values = self.collect_app_values(
+                f"{app_base_path}", base_image_name=base_image_name)
+            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+                                               app_values)
+
+    def collect_app_values(self, app_base_path, base_image_name=None):
+        values = {}
+
+        for app_path in get_sub_paths(app_base_path):
+            app_name = app_name_from_path(
+                os.path.relpath(app_path, app_base_path))
+
+            if app_name in self.exclude:
+                continue
+            app_key = app_name.replace('-', '_')
+
+            app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
+
+            values[app_key] = dict_merge(
+                values[app_key], app_values) if app_key in values else app_values
+
+        return values
+
+    def __init_static_images(self, base_image_name):
+        for static_img_dockerfile in self.static_images:
+            img_name = image_name_from_dockerfile_path(os.path.basename(
+                static_img_dockerfile), base_name=base_image_name)
+            self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
+                img_name, build_context_path=static_img_dockerfile)
+
+    def __assign_static_build_dependencies(self, helm_values):
+        for static_img_dockerfile in self.static_images:
+            key = os.path.basename(static_img_dockerfile)
+            if key in helm_values[KEY_TASK_IMAGES]:
+                dependencies = guess_build_dependencies_from_dockerfile(
+                    static_img_dockerfile)
+                for dep in dependencies:
+                    if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
+                        helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
+
+        for image_name in list(helm_values[KEY_TASK_IMAGES].keys()):
+            if image_name in self.exclude:
+                del helm_values[KEY_TASK_IMAGES][image_name]
+
+    def __init_base_images(self, base_image_name):
+
+        for root_path in self.root_paths:
+            for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
+                img_name = image_name_from_dockerfile_path(
+                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
+                self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+                    img_name, build_context_path=root_path)
+
+            self.static_images.update(find_dockerfiles_paths(
+                os.path.join(root_path, STATIC_IMAGES_PATH)))
+        return self.base_images
+
+    def __init_test_images(self, base_image_name):
+        test_images = {}
+        for root_path in self.root_paths:
+            for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
+                img_name = image_name_from_dockerfile_path(
+                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
+                test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+                    img_name, build_context_path=base_img_dockerfile)
+
+        return test_images
+
+
+    def __find_static_dockerfile_paths(self, root_path):
+        return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
+
+    def __merge_base_helm_values(self, helm_values):
+        # Override for every cloudharness scaffolding
+        for root_path in self.root_paths:
+            helm_values = dict_merge(
+                helm_values,
+                collect_helm_values(root_path, env=self.env)
+            )
+
+        return helm_values
+
+    def __get_default_helm_values(self):
+        helm_values = get_template(os.path.join(
+            CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH, 'values.yaml'))
+        helm_values = dict_merge(helm_values,
+                                 collect_helm_values(CH_ROOT, env=self.env))
+
+        return helm_values
+
+    def create_tls_certificate(self, helm_values):
+        if not self.tls:
+            helm_values['tls'] = None
+            return
+        if not self.local:
+            return
+        helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
+
+        bootstrap_file = 'bootstrap.sh'
+        certs_parent_folder_path = self.output_path / 'helm' / 'resources'
+        certs_folder_path = certs_parent_folder_path / 'certs'
+
+        # if os.path.exists(os.path.join(certs_folder_path)):
+        if certs_folder_path.exists():
+            # don't overwrite the certificate if it exists
+            return
+
+        try:
+            client = DockerClient()
+            client.ping()
+        except:
+            raise ConnectionRefusedError(
+                '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
+
+        # Create CA and sign cert for domain
+        container = client.containers.run(image='frapsoft/openssl',
+                                          command=f'sleep 60',
+                                          entrypoint="",
+                                          detach=True,
+                                          environment=[
+                                              f"DOMAIN={self.domain}"],
+                                          )
+
+        container.exec_run('mkdir -p /mnt/vol1')
+        container.exec_run('mkdir -p /mnt/certs')
+
+        # copy bootstrap file
+        cur_dir = os.getcwd()
+        os.chdir(os.path.join(HERE, 'scripts'))
+        tar = tarfile.open(bootstrap_file + '.tar', mode='w')
+        try:
+            tar.add(bootstrap_file)
+        finally:
+            tar.close()
+        data = open(bootstrap_file + '.tar', 'rb').read()
+        container.put_archive('/mnt/vol1', data)
+        os.chdir(cur_dir)
+        container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
+
+        # exec bootstrap file
+        container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
+
+        # retrieve the certs from the container
+        bits, stat = container.get_archive('/mnt/certs')
+        if not certs_folder_path.exists():
+            certs_folder_path.mkdir(parents=True)
+        with open(certs_parent_folder_path / 'certs.tar', 'wb') as f:
+            for chunk in bits:
+                f.write(chunk)
+        cf = tarfile.open(f'{certs_parent_folder_path}/certs.tar')
+        cf.extractall(path=certs_parent_folder_path)
+
+        logs = container.logs()
+        logging.info(f'openssl container logs: {logs}')
+
+        # stop the container
+        container.kill()
+
+        logging.info("Created certificates for local deployment")
+
+    def __finish_helm_values(self, values):
+        """
+        Sets default overridden values
+        """
+        if self.registry:
+            logging.info(f"Registry set: {self.registry}")
+        if self.local:
+            values['registry']['secret'] = ''
+        if self.registry_secret:
+            logging.info(f"Registry secret set")
+        values['registry']['name'] = self.registry
+        values['registry']['secret'] = self.registry_secret
+        values['tag'] = self.tag
+        if self.namespace:
+            values['namespace'] = self.namespace
+        values['secured_gatekeepers'] = self.secured
+        values['ingress']['ssl_redirect'] = values['ingress']['ssl_redirect'] and self.tls
+        values['tls'] = self.tls
+        if self.domain:
+            values['domain'] = self.domain
+
+        values['local'] = self.local
+        if self.local:
+            try:
+                values['localIp'] = get_cluster_ip()
+            except subprocess.TimeoutExpired:
+                logging.warning("Minikube not available")
+            except:
+                logging.warning("Kubectl not available")
+
+        apps = values[KEY_APPS]
+
+        for app_key in apps:
+            v = apps[app_key]
+
+            values_from_legacy(v)
+            assert KEY_HARNESS in v, 'Default app value loading is broken'
+
+            app_name = app_key.replace('_', '-')
+            harness = v[KEY_HARNESS]
+            harness['name'] = app_name
+
+            if not harness[KEY_SERVICE].get('name', None):
+                harness[KEY_SERVICE]['name'] = app_name
+            if not harness[KEY_DEPLOYMENT].get('name', None):
+                harness[KEY_DEPLOYMENT]['name'] = app_name
+
+            if harness[KEY_DATABASE] and not harness[KEY_DATABASE].get('name', None):
+                harness[KEY_DATABASE]['name'] = app_name.strip() + '-db'
+
+            self.__clear_unused_db_configuration(harness)
+            values_set_legacy(v)
+
+        if self.include:
+            self.include = get_included_with_dependencies(
+                values, set(self.include))
+            logging.info('Selecting included applications')
+
+            for v in [v for v in apps]:
+                if apps[v]['harness']['name'] not in self.include:
+                    del apps[v]
+                    continue
+                values[KEY_TASK_IMAGES].update(apps[v][KEY_TASK_IMAGES])
+                # Create environment variables
+        else:
+            for v in [v for v in apps]:
+                values[KEY_TASK_IMAGES].update(apps[v][KEY_TASK_IMAGES])
+        create_env_variables(values)
+        return values, self.include
+
+    def __clear_unused_db_configuration(self, harness_config):
+        database_config = harness_config[KEY_DATABASE]
+        database_type = database_config.get('type', None)
+        if database_type is None:
+            del harness_config[KEY_DATABASE]
+            return
+        db_specific_keys = [k for k, v in database_config.items()
+                            if isinstance(v, dict) and 'image' in v and 'ports' in v]
+        for db in db_specific_keys:
+            if database_type != db:
+                del database_config[db]
+
+    def image_tag(self, image_name, build_context_path=None, dependencies=()):
+        tag = self.tag
+        if tag is None and not self.local:
+            logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
+            ignore_path = os.path.join(build_context_path, '.dockerignore')
+            ignore = set(DEFAULT_IGNORE)
+            if os.path.exists(ignore_path):
+                with open(ignore_path) as f:
+                    ignore = ignore.union({line.strip() for line in f})
+            logging.info(f"Ignoring {ignore}")
+            tag = generate_tag_from_content(build_context_path, ignore)
+            logging.info(f"Content hash: {tag}")
+            dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
+            tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
+            logging.info(f"Generated tag: {tag}")
+            app_name = image_name.split("/")[-1] # the image name can have a prefix
+            self.all_images[app_name] = tag
+        return self.registry + image_name + (f':{tag}' if tag else '')
+
+    def create_app_values_spec(self, app_name, app_path, base_image_name=None):
+        logging.info('Generating values script for ' + app_name)
+
+        specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
+        if os.path.exists(specific_template_path):
+            logging.info("Specific values template found: " +
+                        specific_template_path)
+            values = get_template(specific_template_path)
+        else:
+            values = {}
+
+        for e in self.env:
+            specific_template_path = os.path.join(
+                app_path, 'deploy', f'values-{e}.yaml')
+            if os.path.exists(specific_template_path):
+                logging.info(
+                    "Specific environment values template found: " + specific_template_path)
+                with open(specific_template_path) as f:
+                    values_env_specific = yaml.safe_load(f)
+                values = dict_merge(values, values_env_specific)
+
+        if KEY_HARNESS in values and 'name' in values[KEY_HARNESS] and values[KEY_HARNESS]['name']:
+            logging.warning('Name is automatically set in applications: name %s will be ignored',
+                            values[KEY_HARNESS]['name'])
+
+        image_paths = [path for path in find_dockerfiles_paths(
+            app_path) if 'tasks/' not in path and 'subapps' not in path]
+        if len(image_paths) > 1:
+            logging.warning('Multiple Dockerfiles found in application %s. Picking the first one: %s', app_name,
+                            image_paths[0])
+        if KEY_HARNESS in values and 'dependencies' in values[KEY_HARNESS] and 'build' in values[KEY_HARNESS]['dependencies']:
+            build_dependencies = values[KEY_HARNESS]['dependencies']['build']
+        else:
+            build_dependencies = []
+
+        if len(image_paths) > 0:
+            image_name = image_name_from_dockerfile_path(os.path.relpath(
+                image_paths[0], os.path.dirname(app_path)), base_image_name)
+
+            values['image'] = self.image_tag(
+                image_name, build_context_path=app_path, dependencies=build_dependencies)
+        elif KEY_HARNESS in values and not values[KEY_HARNESS].get(KEY_DEPLOYMENT, {}).get('image', None) and values[
+                KEY_HARNESS].get(KEY_DEPLOYMENT, {}).get('auto', False):
+            raise Exception(f"At least one Dockerfile must be specified on application {app_name}. "
+                            f"Specify harness.deployment.image value if you intend to use a prebuilt image.")
+
+        task_images_paths = [path for path in find_dockerfiles_paths(
+            app_path) if 'tasks/' in path]
+        values[KEY_TASK_IMAGES] = values.get(KEY_TASK_IMAGES, {})
+
+        if build_dependencies:
+            for build_dependency in values[KEY_HARNESS]['dependencies']['build']:
+                if build_dependency in self.base_images:
+                    values[KEY_TASK_IMAGES][build_dependency] = self.base_images[build_dependency]
+
+        for task_path in task_images_paths:
+            task_name = app_name_from_path(os.path.relpath(
+                task_path, os.path.dirname(app_path)))
+            img_name = image_name_from_dockerfile_path(task_name, base_image_name)
+
+            values[KEY_TASK_IMAGES][task_name] = self.image_tag(
+                img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys())
+
+        return values
+
+
+def get_included_with_dependencies(values, include):
+    app_values = values['apps'].values()
+    directly_included = [app for app in app_values if any(
+        inc == app[KEY_HARNESS]['name'] for inc in include)]
+
+    dependent = set(include)
+    for app in directly_included:
+        if app['harness']['dependencies'].get('hard', None):
+            dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
+        if app['harness']['dependencies'].get('soft', None):
+            dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
+        if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
+            dependent.add('accounts')
+    if len(dependent) == len(include):
+        return dependent
+    return get_included_with_dependencies(values, dependent)
+
+
+def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
+    pass
+
+
+def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_path, exclude=(), include=None):
+    """
+    Searches recursively for helm templates inside the applications and collects the templates in the destination
+
+    :param search_root:
+    :param dest_helm_chart_path: collected helm templates destination folder
+    :param exclude:
+    :return:
+    """
+    app_base_path = os.path.join(search_root, APPS_PATH)
+
+    for app_path in get_sub_paths(app_base_path):
+        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+        if app_name in exclude or (include and not any(inc in app_name for inc in include)):
+            continue
+        template_dir = os.path.join(app_path, 'deploy', 'templates', templates_path)
+        if os.path.exists(template_dir):
+            dest_dir = os.path.join(
+                dest_helm_chart_path, 'templates', app_name)
+
+            logging.info(
+                "Collecting templates for application %s to %s", app_name, dest_dir)
+            if os.path.exists(dest_dir):
+                logging.warning(
+                    "Merging/overriding all files in directory %s", dest_dir)
+                merge_configuration_directories(template_dir, dest_dir)
+            else:
+                shutil.copytree(template_dir, dest_dir)
+        resources_dir = os.path.join(app_path, 'deploy/resources')
+        if os.path.exists(resources_dir):
+            dest_dir = os.path.join(
+                dest_helm_chart_path, 'resources', app_name)
+
+            logging.info(
+                "Collecting resources for application  %s to %s", app_name, dest_dir)
+
+            merge_configuration_directories(resources_dir, dest_dir)
+
+        subchart_dir = os.path.join(app_path, 'deploy/charts')
+        if os.path.exists(subchart_dir):
+            dest_dir = os.path.join(dest_helm_chart_path, 'charts', app_name)
+
+            logging.info(
+                "Collecting templates for application %s to %s", app_name, dest_dir)
+            if os.path.exists(dest_dir):
+                logging.warning(
+                    "Merging/overriding all files in directory %s", dest_dir)
+                merge_configuration_directories(subchart_dir, dest_dir)
+            else:
+                shutil.copytree(subchart_dir, dest_dir)
+
+
+def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
+    if not os.path.exists(base_helm_chart):
+        return
+    if os.path.exists(dest_helm_chart_path):
+        logging.info("Merging/overriding all files in directory %s",
+                     dest_helm_chart_path)
+        merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
+    else:
+        logging.info("Copying base deployment chart from %s to %s",
+                     base_helm_chart, dest_helm_chart_path)
+        shutil.copytree(base_helm_chart, dest_helm_chart_path)
+
+
+def collect_helm_values(deployment_root, env=()):
+    """
+    Creates helm values from a cloudharness deployment scaffolding
+    """
+
+    values_template_path = os.path.join(
+        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'values-template.yaml')
+
+    values = get_template(values_template_path)
+
+    for e in env:
+        specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
+                                              f'values-template-{e}.yaml')
+        if os.path.exists(specific_template_path):
+            logging.info(
+                "Specific environment values template found: " + specific_template_path)
+            with open(specific_template_path) as f:
+                values_env_specific = yaml.safe_load(f)
+            values = dict_merge(values, values_env_specific)
+    return values
+
+
+def init_app_values(deployment_root, exclude, values=None):
+    values = values if values is not None else {}
+    app_base_path = os.path.join(deployment_root, APPS_PATH)
+    overridden_template_path = os.path.join(
+        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+    default_values_path = os.path.join(
+        CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+
+    for app_path in get_sub_paths(app_base_path):
+
+        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+
+        if app_name in exclude:
+            continue
+        app_key = app_name.replace('-', '_')
+        if app_key not in values:
+            default_values = get_template(default_values_path)
+            values[app_key] = default_values
+        overridden_defaults = get_template(overridden_template_path)
+        values[app_key] = dict_merge(values[app_key], overridden_defaults)
+
+    return values
+
+
+def values_from_legacy(values):
+    if KEY_HARNESS not in values:
+        values[KEY_HARNESS] = {}
+    harness = values[KEY_HARNESS]
+    if KEY_SERVICE not in harness:
+        harness[KEY_SERVICE] = {}
+    if KEY_DEPLOYMENT not in harness:
+        harness[KEY_DEPLOYMENT] = {}
+    if KEY_DATABASE not in harness:
+        harness[KEY_DATABASE] = {}
+
+    if 'subdomain' in values:
+        harness['subdomain'] = values['subdomain']
+    if 'autodeploy' in values:
+        harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
+    if 'autoservice' in values:
+        harness[KEY_SERVICE]['auto'] = values['autoservice']
+    if 'secureme' in values:
+        harness['secured'] = values['secureme']
+    if 'resources' in values:
+        harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
+    if 'replicas' in values:
+        harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
+    if 'image' in values:
+        harness[KEY_DEPLOYMENT]['image'] = values['image']
+    if 'port' in values:
+        harness[KEY_DEPLOYMENT]['port'] = values['port']
+        harness[KEY_SERVICE]['port'] = values['port']
+
+
+def values_set_legacy(values):
+    harness = values[KEY_HARNESS]
+    if 'image' in harness[KEY_DEPLOYMENT]:
+        values['image'] = harness[KEY_DEPLOYMENT]['image']
+
+    values['name'] = harness['name']
+    if harness[KEY_DEPLOYMENT].get('port', None):
+        values['port'] = harness[KEY_DEPLOYMENT]['port']
+    if 'resources' in harness[KEY_DEPLOYMENT]:
+        values['resources'] = harness[KEY_DEPLOYMENT]['resources']
+
+
+def generate_tag_from_content(content_path, ignore=()):
+    from dirhash import dirhash
+    return dirhash(content_path, 'sha1', ignore=ignore)
+
+
+def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
+    if isinstance(values, dict):
+        newenvs = list(envs)
+        for key, value in values.items():
+            v = extract_env_variables_from_values(
+                value, envs, f"{prefix}_{key}".replace('-', '_').upper())
+            if key in ('name', 'port', 'subdomain'):
+                newenvs.extend(v)
+        return newenvs
+    else:
+        return [env_variable(prefix, values)]
+
+
+def create_env_variables(values):
+    for app_name, value in values[KEY_APPS].items():
+        if KEY_HARNESS in value:
+            values['env'].extend(extract_env_variables_from_values(
+                value[KEY_HARNESS], prefix='CH_' + app_name))
+    values['env'].append(env_variable('CH_DOMAIN', values['domain']))
+    values['env'].append(env_variable(
+        'CH_IMAGE_REGISTRY', values['registry']['name']))
+    values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
+
+
+def hosts_info(values):
+    domain = values['domain']
+    namespace = values['namespace']
+    subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
+                  KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
+                                                                           KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
+    try:
+        ip = get_cluster_ip()
+    except:
+        logging.warning('Cannot get cluster ip')
+        return
+    logging.info(
+        "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
+
+    deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
+                   for app in values[KEY_APPS].values() if KEY_HARNESS in app)
+
+    logging.info(
+        "\nTo run locally some apps, also those references may be needed")
+    for appname in values[KEY_APPS]:
+        app = values[KEY_APPS][appname]['harness']
+        if 'deployment' not in app:
+            continue
+        print(
+            "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
+                app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
+
+    print(
+        f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
+
+
+class ValuesValidationException(Exception):
+    pass
+
+
+def validate_helm_values(values):
+    validate_dependencies(values)
+
+
+def validate_dependencies(values):
+    all_apps = {a for a in values["apps"]}
+    for app in all_apps:
+        app_values = values["apps"][app]
+        if 'dependencies' in app_values[KEY_HARNESS]:
+            soft_dependencies = {
+                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
+            not_found = {d for d in soft_dependencies if d not in all_apps}
+            if not_found:
+                logging.warning(
+                    f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
+            hard_dependencies = {
+                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
+            not_found = {d for d in hard_dependencies if d not in all_apps}
+            if not_found:
+                raise ValuesValidationException(
+                    f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
+
+            build_dependencies = {
+                d for d in app_values[KEY_HARNESS]['dependencies']['build']}
+
+            not_found = {
+                d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
+            not_found = {d for d in not_found if d not in all_apps}
+            if not_found:
+                raise ValuesValidationException(
+                    f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
+
+        if 'use_services' in app_values[KEY_HARNESS]:
+            service_dependencies = {d['name'].replace(
+                "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
+
+            not_found = {d for d in service_dependencies if d not in all_apps}
+            if not_found:
+                raise ValuesValidationException(
+                    f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index 4c75a909..9bd43b8c 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -212,7 +212,7 @@ def __init_base_images(self, base_image_name):
             self.static_images.update(find_dockerfiles_paths(
                 os.path.join(root_path, STATIC_IMAGES_PATH)))
         return self.base_images
-    
+
     def __init_test_images(self, base_image_name):
         test_images = {}
         for root_path in self.root_paths:
@@ -224,7 +224,7 @@ def __init_test_images(self, base_image_name):
 
         return test_images
 
-    
+
     def __find_static_dockerfile_paths(self, root_path):
         return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
 
@@ -417,7 +417,7 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()):
             app_name = image_name.split("/")[-1] # the image name can have a prefix
             self.all_images[app_name] = tag
         return self.registry + image_name + (f':{tag}' if tag else '')
-    
+
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
 
@@ -456,7 +456,7 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         if len(image_paths) > 0:
             image_name = image_name_from_dockerfile_path(os.path.relpath(
                 image_paths[0], os.path.dirname(app_path)), base_image_name)
-            
+
             values['image'] = self.image_tag(
                 image_name, build_context_path=app_path, dependencies=build_dependencies)
         elif KEY_HARNESS in values and not values[KEY_HARNESS].get(KEY_DEPLOYMENT, {}).get('image', None) and values[
@@ -521,7 +521,7 @@ def collect_apps_helm_templates(search_root, dest_helm_chart_path, exclude=(), i
         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
             continue
-        template_dir = os.path.join(app_path, 'deploy/templates')
+        template_dir = os.path.join(app_path, 'deploy', 'templates', HELM_PATH)
         if os.path.exists(template_dir):
             dest_dir = os.path.join(
                 dest_helm_chart_path, 'templates', app_name)
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index a9cecabb..d8aaebda 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -4,6 +4,7 @@ import logging
 import sys
 import os
 
+from ch_cli_tools.dockercompose import create_docker_compose_configuration
 from ch_cli_tools.helm import create_helm_chart, hosts_info, deploy
 from ch_cli_tools.skaffold import create_skaffold_configuration, create_vscode_debug_configuration
 from ch_cli_tools.codefresh import create_codefresh_deployment_scripts, write_env_file
@@ -61,6 +62,8 @@ if __name__ == "__main__":
                         help=f'Do not generate ci/cd files')
     parser.add_argument('-we', '--write-env', dest='write_env', action="store_const", default=None, const=True,
                             help=f'Write build env to .env file in {DEPLOYMENT_PATH}')
+    parser.add_argument('--docker-compose', dest='docker_compose', action="store_true",
+                        help='Generate docker-compose.yaml and dedicated Skaffold configuration')
 
 
     args, unknown = parser.parse_known_args(sys.argv[1:])
@@ -81,7 +84,24 @@ if __name__ == "__main__":
             merge_app_directories(root_paths, destination=args.merge)
             root_paths = [args.merge]
 
-        helm_values = create_helm_chart(
+        # helm_values = create_helm_chart(
+        #     root_paths,
+        #     tag=args.tag,
+        #     registry=args.registry,
+        #     domain=args.domain,
+        #     local=args.local,
+        #     secured=not args.unsecured,
+        #     output_path=args.output_path,
+        #     exclude=args.exclude,
+        #     include=args.include,
+        #     registry_secret=args.registry_secret,
+        #     tls=not args.no_tls,
+        #     env=envs,
+        #     namespace=args.namespace
+        # )
+
+        if not args.docker_compose:
+            helm_values = create_helm_chart(
             root_paths,
             tag=args.tag,
             registry=args.registry,
@@ -96,6 +116,23 @@ if __name__ == "__main__":
             env=envs,
             namespace=args.namespace
         )
+        else:
+            helm_values = create_docker_compose_configuration(
+            root_paths,
+            tag=args.tag,
+            registry=args.registry,
+            domain=args.domain,
+            local=args.local,
+            secured=not args.unsecured,
+            output_path=args.output_path,
+            exclude=args.exclude,
+            include=args.include,
+            registry_secret=args.registry_secret,
+            tls=not args.no_tls,
+            env=envs,
+            namespace=args.namespace,
+            templates_path="compose",
+        )
 
         merged_root_paths = preprocess_build_overrides(
             root_paths=root_paths, helm_values=helm_values)
@@ -108,7 +145,7 @@ if __name__ == "__main__":
                 envs=envs,
                 base_image_name=helm_values['name'],
                 helm_values=helm_values)
-            
+
         if args.write_env:
             write_env_file(helm_values, os.path.join(root_paths[-1], DEPLOYMENT_PATH, ".env"))
 

From 6f306a18a2f07a6ba78501946d9be3887244b162 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 7 Feb 2024 09:24:29 -0600
Subject: [PATCH 011/210] Squashed commit of the following:

commit c698bbadf4f5cf41a59818d3738258fb29919249
Author: aranega <vincent.aranega@gmail.com>
Date:   Wed Feb 7 08:55:45 2024 -0600

    CH-100 Add second path using pathlib

commit 0422bfe9860f272354c1faadd851d37b4976650a
Author: aranega <vincent.aranega@gmail.com>
Date:   Wed Feb 7 07:33:43 2024 -0600

    CH-100 Add first port to pathlib
---
 .../ch_cli_tools/dockercompose.py             | 92 +++++++++----------
 tools/deployment-cli-tools/harness-deployment |  1 -
 2 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 39ff0272..06bf6d23 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -31,16 +31,16 @@
 KEY_TEST_IMAGES = 'test-images'
 
 DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
-
+COMPOSE = 'compose'
 
 def create_docker_compose_configuration(root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-                      namespace=None, templates_path=HELM_PATH) -> HarnessMainConfig:
+                      namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:
         env = [env]
     return CloudHarnessHelm(root_paths, tag=tag, registry=registry, local=local, domain=domain, exclude=exclude, secured=secured,
                             output_path=output_path, include=include, registry_secret=registry_secret, tls=tls, env=env,
-                            namespace=namespace, templates_path=templates_path).process_values()
+                            namespace=namespace, templates_path=COMPOSE).process_values()
 
 
 class CloudHarnessHelm:
@@ -146,16 +146,15 @@ def __process_applications(self, helm_values, base_image_name):
 
             app_base_path = root_path / APPS_PATH
             app_values = self.collect_app_values(
-                f"{app_base_path}", base_image_name=base_image_name)
+                app_base_path, base_image_name=base_image_name)
             helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
                                                app_values)
 
     def collect_app_values(self, app_base_path, base_image_name=None):
         values = {}
 
-        for app_path in get_sub_paths(app_base_path):
-            app_name = app_name_from_path(
-                os.path.relpath(app_path, app_base_path))
+        for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
+            app_name = app_name_from_path(f"{app_path.relative_to(app_base_path)}")
 
             if app_name in self.exclude:
                 continue
@@ -185,7 +184,7 @@ def __assign_static_build_dependencies(self, helm_values):
                     if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
                         helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
 
-        for image_name in list(helm_values[KEY_TASK_IMAGES].keys()):
+        for image_name in helm_values[KEY_TASK_IMAGES].keys():
             if image_name in self.exclude:
                 del helm_values[KEY_TASK_IMAGES][image_name]
 
@@ -228,10 +227,11 @@ def __merge_base_helm_values(self, helm_values):
         return helm_values
 
     def __get_default_helm_values(self):
-        helm_values = get_template(os.path.join(
-            CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH, 'values.yaml'))
+        ch_root_path = Path(CH_ROOT)
+        values_yaml_path = ch_root_path / DEPLOYMENT_CONFIGURATION_PATH / HELM_PATH / 'values.yaml'
+        helm_values = get_template(values_yaml_path)
         helm_values = dict_merge(helm_values,
-                                 collect_helm_values(CH_ROOT, env=self.env))
+                                 collect_helm_values(ch_root_path, env=self.env))
 
         return helm_values
 
@@ -273,7 +273,7 @@ def create_tls_certificate(self, helm_values):
 
         # copy bootstrap file
         cur_dir = os.getcwd()
-        os.chdir(os.path.join(HERE, 'scripts'))
+        os.chdir(Path(HERE) / 'scripts')
         tar = tarfile.open(bootstrap_file + '.tar', mode='w')
         try:
             tar.add(bootstrap_file)
@@ -291,10 +291,11 @@ def create_tls_certificate(self, helm_values):
         bits, stat = container.get_archive('/mnt/certs')
         if not certs_folder_path.exists():
             certs_folder_path.mkdir(parents=True)
-        with open(certs_parent_folder_path / 'certs.tar', 'wb') as f:
+        certs_tar = certs_parent_folder_path / 'certs.tar'
+        with open(certs_tar, 'wb') as f:
             for chunk in bits:
                 f.write(chunk)
-        cf = tarfile.open(f'{certs_parent_folder_path}/certs.tar')
+        cf = tarfile.open(certs_tar)
         cf.extractall(path=certs_parent_folder_path)
 
         logs = container.logs()
@@ -409,20 +410,19 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()):
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
 
-        specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
-        if os.path.exists(specific_template_path):
-            logging.info("Specific values template found: " +
-                        specific_template_path)
+        deploy_path = app_path / 'deploy'
+        specific_template_path = deploy_path / 'values.yaml'
+        if specific_template_path.exists():
+            logging.info(f"Specific values template found: {specific_template_path}")
             values = get_template(specific_template_path)
         else:
             values = {}
 
         for e in self.env:
-            specific_template_path = os.path.join(
-                app_path, 'deploy', f'values-{e}.yaml')
-            if os.path.exists(specific_template_path):
+            specific_template_path = deploy_path / f'values-{e}.yaml'
+            if specific_template_path.exists():
                 logging.info(
-                    "Specific environment values template found: " + specific_template_path)
+                    f"Specific environment values template found: {specific_template_path}")
                 with open(specific_template_path) as f:
                     values_env_specific = yaml.safe_load(f)
                 values = dict_merge(values, values_env_specific)
@@ -433,6 +433,8 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
 
         image_paths = [path for path in find_dockerfiles_paths(
             app_path) if 'tasks/' not in path and 'subapps' not in path]
+        import ipdb; ipdb.set_trace()  # fmt: skip
+
         if len(image_paths) > 1:
             logging.warning('Multiple Dockerfiles found in application %s. Picking the first one: %s', app_name,
                             image_paths[0])
@@ -463,7 +465,7 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
 
         for task_path in task_images_paths:
             task_name = app_name_from_path(os.path.relpath(
-                task_path, os.path.dirname(app_path)))
+                task_path, app_path.parent))
             img_name = image_name_from_dockerfile_path(task_name, base_image_name)
 
             values[KEY_TASK_IMAGES][task_name] = self.image_tag(
@@ -503,53 +505,51 @@ def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_pat
     :param exclude:
     :return:
     """
-    app_base_path = os.path.join(search_root, APPS_PATH)
+    app_base_path = search_root / APPS_PATH
 
-    for app_path in get_sub_paths(app_base_path):
-        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+    for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
+        app_name = app_name_from_path(os.path.relpath(f"{app_path}", app_base_path))
         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
             continue
-        template_dir = os.path.join(app_path, 'deploy', 'templates', templates_path)
-        if os.path.exists(template_dir):
-            dest_dir = os.path.join(
-                dest_helm_chart_path, 'templates', app_name)
+        template_dir = app_path / 'deploy' / 'templates' / templates_path
+        if template_dir.exists():
+            dest_dir = dest_helm_chart_path / 'templates' / app_name
 
             logging.info(
                 "Collecting templates for application %s to %s", app_name, dest_dir)
-            if os.path.exists(dest_dir):
+            if dest_dir.exists():
                 logging.warning(
                     "Merging/overriding all files in directory %s", dest_dir)
-                merge_configuration_directories(template_dir, dest_dir)
+                merge_configuration_directories(f"{template_dir}", f"{dest_dir}")
             else:
                 shutil.copytree(template_dir, dest_dir)
-        resources_dir = os.path.join(app_path, 'deploy/resources')
-        if os.path.exists(resources_dir):
-            dest_dir = os.path.join(
-                dest_helm_chart_path, 'resources', app_name)
+        resources_dir = app_path / 'deploy' / 'resources'
+        if resources_dir.exists():
+            dest_dir = dest_helm_chart_path / 'resources' / app_name
 
             logging.info(
                 "Collecting resources for application  %s to %s", app_name, dest_dir)
 
-            merge_configuration_directories(resources_dir, dest_dir)
+            merge_configuration_directories(f"{resources_dir}", f"{dest_dir}")
 
-        subchart_dir = os.path.join(app_path, 'deploy/charts')
-        if os.path.exists(subchart_dir):
-            dest_dir = os.path.join(dest_helm_chart_path, 'charts', app_name)
+        subchart_dir = app_path / 'deploy/charts'
+        if subchart_dir.exists():
+            dest_dir = dest_helm_chart_path / 'charts' / app_name
 
             logging.info(
                 "Collecting templates for application %s to %s", app_name, dest_dir)
-            if os.path.exists(dest_dir):
+            if dest_dir.exists():
                 logging.warning(
                     "Merging/overriding all files in directory %s", dest_dir)
-                merge_configuration_directories(subchart_dir, dest_dir)
+                merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
             else:
                 shutil.copytree(subchart_dir, dest_dir)
 
 
 def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
-    if not os.path.exists(base_helm_chart):
+    if not base_helm_chart.exists():
         return
-    if os.path.exists(dest_helm_chart_path):
+    if dest_helm_chart_path.exists():
         logging.info("Merging/overriding all files in directory %s",
                      dest_helm_chart_path)
         merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
@@ -563,9 +563,7 @@ def collect_helm_values(deployment_root, env=()):
     """
     Creates helm values from a cloudharness deployment scaffolding
     """
-
-    values_template_path = os.path.join(
-        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'values-template.yaml')
+    values_template_path = deployment_root / DEPLOYMENT_CONFIGURATION_PATH / 'values-template.yaml'
 
     values = get_template(values_template_path)
 
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index d8aaebda..e5cf49f1 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -131,7 +131,6 @@ if __name__ == "__main__":
             tls=not args.no_tls,
             env=envs,
             namespace=args.namespace,
-            templates_path="compose",
         )
 
         merged_root_paths = preprocess_build_overrides(

From 6bbae19137873aa6970ae36d77680b2f0d750d3c Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 7 Feb 2024 10:24:48 -0600
Subject: [PATCH 012/210] CH-100 Add first skaffold dedicated generation for
 docker compose

---
 .../cloudharness_utils/constants.py           |   2 +
 .../ch_cli_tools/dockercompose.py             |  47 +++-
 .../ch_cli_tools/skaffoldcompose.py           | 251 ++++++++++++++++++
 tools/deployment-cli-tools/harness-deployment |   6 +-
 4 files changed, 300 insertions(+), 6 deletions(-)
 create mode 100644 tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py

diff --git a/libraries/cloudharness-utils/cloudharness_utils/constants.py b/libraries/cloudharness-utils/cloudharness_utils/constants.py
index 4b42761a..168b7811 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/constants.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/constants.py
@@ -10,6 +10,8 @@
 HELM_PATH = "helm"
 HELM_CHART_PATH = HELM_PATH
 
+COMPOSE = 'compose'
+
 INFRASTRUCTURE_PATH = 'infrastructure'
 STATIC_IMAGES_PATH = os.path.join(INFRASTRUCTURE_PATH, 'common-images')
 BASE_IMAGES_PATH = os.path.join(INFRASTRUCTURE_PATH, 'base-images')
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 06bf6d23..2cf768a4 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -15,10 +15,10 @@
 
 from . import HERE, CH_ROOT
 from cloudharness_utils.constants import TEST_IMAGES_PATH, VALUES_MANUAL_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
-    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH
+    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH, COMPOSE
 from .utils import get_cluster_ip, get_image_name, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
     get_template, merge_configuration_directories, merge_to_yaml_file, dict_merge, app_name_from_path, \
-    find_dockerfiles_paths
+    find_dockerfiles_paths, find_file_paths
 
 from .models import HarnessMainConfig
 
@@ -31,7 +31,6 @@
 KEY_TEST_IMAGES = 'test-images'
 
 DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
-COMPOSE = 'compose'
 
 def create_docker_compose_configuration(root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
@@ -50,7 +49,7 @@ def __init__(self, root_paths, tag='latest', registry='', local=True, domain=Non
         assert domain, 'A domain must be specified'
         self.root_paths = [Path(r) for r in root_paths]
         self.tag = tag
-        if not registry.endswith('/'):
+        if registry and not registry.endswith('/'):
             self.registry = f'{registry}/'
         else:
             self.registry = registry
@@ -433,7 +432,10 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
 
         image_paths = [path for path in find_dockerfiles_paths(
             app_path) if 'tasks/' not in path and 'subapps' not in path]
-        import ipdb; ipdb.set_trace()  # fmt: skip
+
+        # Inject entry points commands
+        for image_path in image_paths:
+            self.inject_entry_points_commands(values, image_path, app_path)
 
         if len(image_paths) > 1:
             logging.warning('Multiple Dockerfiles found in application %s. Picking the first one: %s', app_name,
@@ -474,6 +476,18 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         return values
 
 
+    def inject_entry_points_commands(self, helm_values, image_path, app_path):
+        context_path = os.path.relpath(image_path, '.')
+
+        mains_candidates = find_file_paths(context_path, '__main__.py')
+
+        task_main_file = identify_unicorn_based_main(mains_candidates, app_path)
+
+        if task_main_file:
+            helm_values[KEY_HARNESS]['deployment']['command'] = ['python']
+            helm_values[KEY_HARNESS]['deployment']['args'] = [f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py']
+
+
 def get_included_with_dependencies(values, include):
     app_values = values['apps'].values()
     directly_included = [app for app in app_values if any(
@@ -749,3 +763,26 @@ def validate_dependencies(values):
             if not_found:
                 raise ValuesValidationException(
                     f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
+
+
+def identify_unicorn_based_main(candidates, app_path):
+        import re
+        gunicorn_pattern = re.compile(r"gunicorn")
+        # sort candidates, shortest path first
+        for candidate in sorted(candidates,key=lambda x: len(x.split("/"))):
+            dockerfile_path = f"{candidate}/.."
+            while not os.path.exists(f"{dockerfile_path}/Dockerfile") and os.path.abspath(dockerfile_path) != os.path.abspath(app_path):
+                dockerfile_path += "/.."
+            dockerfile = f"{dockerfile_path}/Dockerfile"
+            if not os.path.exists(dockerfile):
+                continue
+            with open(dockerfile, 'r') as file:
+                if re.search(gunicorn_pattern, file.read()):
+                    return candidate
+            requirements = f"{candidate}/../requirements.txt"
+            if not os.path.exists(requirements):
+                continue
+            with open(requirements, 'r') as file:
+                if re.search(gunicorn_pattern, file.read()):
+                    return candidate
+        return None
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py b/tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py
new file mode 100644
index 00000000..27a4701a
--- /dev/null
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py
@@ -0,0 +1,251 @@
+import os
+import logging
+import json
+import time
+
+from os.path import join, relpath, basename, exists, abspath
+from cloudharness_model import ApplicationTestConfig, HarnessMainConfig
+
+from cloudharness_utils.constants import APPS_PATH, DEPLOYMENT_CONFIGURATION_PATH, \
+    BASE_IMAGES_PATH, STATIC_IMAGES_PATH, COMPOSE, HELM_PATH
+from .helm import KEY_APPS, KEY_HARNESS, KEY_DEPLOYMENT, KEY_TASK_IMAGES
+from .utils import get_template, dict_merge, find_dockerfiles_paths, app_name_from_path, \
+    find_file_paths, guess_build_dependencies_from_dockerfile, merge_to_yaml_file, get_json_template, get_image_name
+
+def relpath_if(p1, p2):
+    if os.path.isabs(p1):
+        return p1
+    return relpath(p1, p2)
+
+def create_skaffold_compose_configuration(root_paths, helm_values: HarnessMainConfig, output_path='.', manage_task_images=True):
+    skaffold_conf = get_template('skaffold-template.yaml', True)
+    apps = helm_values.apps
+    base_image_name = (helm_values.registry.name or "") + helm_values.name
+    artifacts = {}
+    overrides = {}
+
+    def remove_tag(image_name):
+        return image_name.split(":")[0]
+
+    def get_image_tag(name):
+        return f"{get_image_name(name, base_image_name)}"
+
+    builds = {}
+
+    def build_artifact(image_name, context_path, requirements=None, dockerfile_path=''):
+        artifact_spec = {
+            'image': image_name,
+            'context': context_path,
+            'docker': {
+                'dockerfile': join(dockerfile_path, 'Dockerfile'),
+                'buildArgs': {
+                    'REGISTRY': helm_values.registry.name,
+                    'TAG': helm_values.tag,
+                    'NOCACHE': str(time.time())
+                },
+                'ssh': 'default'
+            }
+        }
+        if requirements:
+            artifact_spec['requires'] = [{'image': get_image_tag(req), 'alias': req.replace('-', '_').upper()} for req
+                                         in requirements]
+        return artifact_spec
+
+
+    base_images = set()
+
+    def process_build_dockerfile(dockerfile_path, root_path, global_context=False, requirements=None, app_name=None):
+        if app_name is None:
+            app_name = app_name_from_path(basename(dockerfile_path))
+        if app_name in helm_values[KEY_TASK_IMAGES] or app_name.replace("-", "_") in helm_values.apps:
+            context_path = relpath_if(root_path, output_path) if global_context else relpath_if(dockerfile_path, output_path)
+
+            builds[app_name] = context_path
+            base_images.add(get_image_name(app_name))
+            artifacts[app_name] = build_artifact(
+                get_image_tag(app_name),
+                context_path,
+                dockerfile_path=relpath(dockerfile_path, output_path),
+                requirements=requirements or guess_build_dependencies_from_dockerfile(dockerfile_path)
+            )
+
+    for root_path in root_paths:
+        skaffold_conf = dict_merge(skaffold_conf, get_template(
+            join(root_path, DEPLOYMENT_CONFIGURATION_PATH, 'skaffold-template.yaml')))
+
+        base_dockerfiles = find_dockerfiles_paths(
+            join(root_path, BASE_IMAGES_PATH))
+
+        for dockerfile_path in base_dockerfiles:
+            process_build_dockerfile(dockerfile_path, root_path, global_context=True)
+
+    release_config = skaffold_conf['deploy']['helm']['releases'][0]
+    release_config['name'] = helm_values.namespace
+    release_config['namespace'] = helm_values.namespace
+    release_config['artifactOverrides'][KEY_APPS] = {}
+
+    static_images = set()
+    for root_path in root_paths:
+        static_dockerfiles = find_dockerfiles_paths(
+            join(root_path, STATIC_IMAGES_PATH))
+
+        for dockerfile_path in static_dockerfiles:
+            process_build_dockerfile(dockerfile_path, root_path)
+
+
+    for root_path in root_paths:
+        apps_path = join(root_path, APPS_PATH)
+        app_dockerfiles = find_dockerfiles_paths(apps_path)
+
+        release_config['artifactOverrides'][KEY_TASK_IMAGES] = {
+            task_image: remove_tag(helm_values[KEY_TASK_IMAGES][task_image])
+            for task_image in helm_values[KEY_TASK_IMAGES]
+        }
+        for dockerfile_path in app_dockerfiles:
+            app_relative_to_skaffold = os.path.relpath(
+                dockerfile_path, output_path)
+            context_path = os.path.relpath(dockerfile_path, '.')
+            app_relative_to_base = os.path.relpath(dockerfile_path, apps_path)
+            app_name = app_name_from_path(app_relative_to_base)
+            app_key = app_name.replace('-', '_')
+            if app_key not in apps:
+                if 'tasks' in app_relative_to_base and manage_task_images:
+                    parent_app_name = app_name_from_path(
+                        app_relative_to_base.split('/tasks')[0])
+                    parent_app_key = parent_app_name.replace('-', '_')
+
+                    if parent_app_key in apps:
+                        artifacts[app_key] = build_artifact(get_image_tag(app_name), app_relative_to_skaffold,
+                                                            base_images.union(static_images))
+
+                continue
+
+            build_requirements = apps[app_key][KEY_HARNESS].dependencies.build
+            # app_image_tag = remove_tag(
+            #     apps[app_key][KEY_HARNESS][KEY_DEPLOYMENT]['image'])
+            # artifacts[app_key] = build_artifact(
+            #     app_image_tag, app_relative_to_skaffold, build_requirements)
+            process_build_dockerfile(dockerfile_path, root_path, requirements=build_requirements, app_name=app_name)
+            app = apps[app_key]
+            if app[KEY_HARNESS][KEY_DEPLOYMENT]['image']:
+                release_config['artifactOverrides']['apps'][app_key] = \
+                    {
+                        KEY_HARNESS: {
+                            KEY_DEPLOYMENT: {
+                                'image': remove_tag(app[KEY_HARNESS][KEY_DEPLOYMENT]['image'])
+                            }
+                        }
+                }
+
+            mains_candidates = find_file_paths(context_path, '__main__.py')
+
+            def identify_unicorn_based_main(candidates):
+                import re
+                gunicorn_pattern = re.compile(r"gunicorn")
+                # sort candidates, shortest path first
+                for candidate in sorted(candidates,key=lambda x: len(x.split("/"))):
+                    dockerfile_path = f"{candidate}/.."
+                    while not exists(f"{dockerfile_path}/Dockerfile") and abspath(dockerfile_path) != abspath(root_path):
+                        dockerfile_path += "/.."
+                    dockerfile = f"{dockerfile_path}/Dockerfile"
+                    if not exists(dockerfile):
+                        continue
+                    with open(dockerfile, 'r') as file:
+                        if re.search(gunicorn_pattern, file.read()):
+                            return candidate
+                    requirements = f"{candidate}/../requirements.txt"
+                    if not exists(requirements):
+                        continue
+                    with open(requirements, 'r') as file:
+                        if re.search(gunicorn_pattern, file.read()):
+                            return candidate
+                return None
+
+            task_main_file = identify_unicorn_based_main(mains_candidates)
+
+            if task_main_file:
+                release_config['overrides']['apps'][app_key] = \
+                    {
+                        'harness': {
+                            'deployment': {
+                                'command': ['python'],
+                                'args': [f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py']
+                            }
+                        }
+                }
+
+            test_config: ApplicationTestConfig = helm_values.apps[app_key].harness.test
+            if test_config.unit.enabled and test_config.unit.commands:
+
+                    skaffold_conf['test'].append(dict(
+                        image=get_image_tag(app_name),
+                        custom=[dict(command="docker run $IMAGE " + cmd) for cmd in test_config.unit.commands]
+                    ))
+
+
+    del skaffold_conf['deploy']
+    skaffold_conf['deploy'] = {
+        'docker': {
+            'useCompose': True,
+            'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
+        }
+    }
+
+    skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
+    import ipdb; ipdb.set_trace()  # fmt: skip
+
+    merge_to_yaml_file(skaffold_conf, os.path.join(
+        output_path, 'skaffold.yaml'))
+
+    return skaffold_conf
+
+
+def create_vscode_debug_configuration(root_paths, helm_values):
+    logging.info(
+        "Creating VS code cloud build configuration.\nCloud build extension is needed to debug.")
+
+    vscode_launch_path = '.vscode/launch.json'
+
+    vs_conf = get_json_template(vscode_launch_path, True)
+    base_image_name = helm_values.name
+    debug_conf = get_json_template('vscode-debug-template.json', True)
+
+    def get_image_tag(name):
+        return f"{get_image_name(name, base_image_name)}"
+
+    if helm_values.registry.name:
+        base_image_name = helm_values.registry.name + helm_values.name
+    for i in range(len(vs_conf['configurations'])):
+        conf = vs_conf['configurations'][i]
+        if conf['name'] == debug_conf['name']:
+            del vs_conf['configurations'][i]
+            break
+    vs_conf['configurations'].append(debug_conf)
+
+    apps = helm_values.apps
+
+    for root_path in root_paths:
+        apps_path = os.path.join(root_path, 'applications')
+
+        src_root_paths = find_file_paths(apps_path, 'setup.py')
+
+        for path in src_root_paths:
+            app_relative_to_base = os.path.relpath(path, apps_path)
+            app_relative_to_root = os.path.relpath(path, '.')
+            app_name = app_name_from_path(app_relative_to_base.split('/')[0])
+            app_key = app_name.replace('-', '_')
+            if app_key in apps.keys():
+                debug_conf["debug"].append({
+                    "image": get_image_tag(app_name),
+                    "sourceFileMap": {
+                        "justMyCode": False,
+                        f"${{workspaceFolder}}/{app_relative_to_root}": apps[app_key].harness.get('sourceRoot',
+                                                                                                       "/usr/src/app"),
+                    }
+                })
+
+
+    if not os.path.exists(os.path.dirname(vscode_launch_path)):
+        os.makedirs(os.path.dirname(vscode_launch_path))
+    with open(vscode_launch_path, 'w') as f:
+        json.dump(vs_conf, f, indent=2, sort_keys=True)
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index e5cf49f1..97897516 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -7,6 +7,7 @@ import os
 from ch_cli_tools.dockercompose import create_docker_compose_configuration
 from ch_cli_tools.helm import create_helm_chart, hosts_info, deploy
 from ch_cli_tools.skaffold import create_skaffold_configuration, create_vscode_debug_configuration
+from ch_cli_tools.skaffoldcompose import create_skaffold_compose_configuration
 from ch_cli_tools.codefresh import create_codefresh_deployment_scripts, write_env_file
 from ch_cli_tools.preprocessing import preprocess_build_overrides
 from ch_cli_tools.utils import merge_app_directories
@@ -148,7 +149,10 @@ if __name__ == "__main__":
         if args.write_env:
             write_env_file(helm_values, os.path.join(root_paths[-1], DEPLOYMENT_PATH, ".env"))
 
-        create_skaffold_configuration(merged_root_paths, helm_values)
+        if not args.docker_compose:
+            create_skaffold_configuration(merged_root_paths, helm_values)
+        else:
+            create_skaffold_compose_configuration(merged_root_paths, helm_values)
         create_vscode_debug_configuration(root_paths, helm_values)
 
         hosts_info(helm_values)

From 528754579c3a33e993f623cb9e1a4fe9d86748fa Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 7 Feb 2024 10:33:07 -0600
Subject: [PATCH 013/210] CH-100 Make skaffold script a little bit more generic
 (ugly)

---
 .../cloudharness_utils/constants.py           |   2 +
 .../ch_cli_tools/skaffold.py                  |  19 +-
 .../ch_cli_tools/skaffoldcompose.py           | 251 ------------------
 tools/deployment-cli-tools/harness-deployment |  21 +-
 4 files changed, 18 insertions(+), 275 deletions(-)
 delete mode 100644 tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py

diff --git a/libraries/cloudharness-utils/cloudharness_utils/constants.py b/libraries/cloudharness-utils/cloudharness_utils/constants.py
index 168b7811..a5163f2b 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/constants.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/constants.py
@@ -9,8 +9,10 @@
 
 HELM_PATH = "helm"
 HELM_CHART_PATH = HELM_PATH
+HELM_ENGINE = HELM_PATH
 
 COMPOSE = 'compose'
+COMPOSE_ENGINE = 'docker-compose'
 
 INFRASTRUCTURE_PATH = 'infrastructure'
 STATIC_IMAGES_PATH = os.path.join(INFRASTRUCTURE_PATH, 'common-images')
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index c0de5764..bc66d616 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -7,7 +7,7 @@
 from cloudharness_model import ApplicationTestConfig, HarnessMainConfig
 
 from cloudharness_utils.constants import APPS_PATH, DEPLOYMENT_CONFIGURATION_PATH, \
-    BASE_IMAGES_PATH, STATIC_IMAGES_PATH
+    BASE_IMAGES_PATH, STATIC_IMAGES_PATH, HELM_ENGINE, COMPOSE_ENGINE
 from .helm import KEY_APPS, KEY_HARNESS, KEY_DEPLOYMENT, KEY_TASK_IMAGES
 from .utils import get_template, dict_merge, find_dockerfiles_paths, app_name_from_path, \
     find_file_paths, guess_build_dependencies_from_dockerfile, merge_to_yaml_file, get_json_template, get_image_name
@@ -17,12 +17,13 @@ def relpath_if(p1, p2):
         return p1
     return relpath(p1, p2)
 
-def create_skaffold_configuration(root_paths, helm_values: HarnessMainConfig, output_path='.', manage_task_images=True):
+def create_skaffold_configuration(root_paths, helm_values: HarnessMainConfig, output_path='.', manage_task_images=True, backend_deploy=HELM_ENGINE):
     skaffold_conf = get_template('skaffold-template.yaml', True)
     apps = helm_values.apps
     base_image_name = (helm_values.registry.name or "") + helm_values.name
     artifacts = {}
     overrides = {}
+    backend = backend_deploy or HELM_ENGINE
 
     def remove_tag(image_name):
         return image_name.split(":")[0]
@@ -183,10 +184,18 @@ def identify_unicorn_based_main(candidates):
                         custom=[dict(command="docker run $IMAGE " + cmd) for cmd in test_config.unit.commands]
                     ))
 
+    if backend == COMPOSE_ENGINE:
+        del skaffold_conf['deploy']
+        skaffold_conf['deploy'] = {
+            'docker': {
+                'useCompose': True,
+                'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
+            }
+        }
 
-        skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
-        merge_to_yaml_file(skaffold_conf, os.path.join(
-            output_path, 'skaffold.yaml'))
+    skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
+    merge_to_yaml_file(skaffold_conf, os.path.join(
+        output_path, 'skaffold.yaml'))
     return skaffold_conf
 
 
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py b/tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py
deleted file mode 100644
index 27a4701a..00000000
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffoldcompose.py
+++ /dev/null
@@ -1,251 +0,0 @@
-import os
-import logging
-import json
-import time
-
-from os.path import join, relpath, basename, exists, abspath
-from cloudharness_model import ApplicationTestConfig, HarnessMainConfig
-
-from cloudharness_utils.constants import APPS_PATH, DEPLOYMENT_CONFIGURATION_PATH, \
-    BASE_IMAGES_PATH, STATIC_IMAGES_PATH, COMPOSE, HELM_PATH
-from .helm import KEY_APPS, KEY_HARNESS, KEY_DEPLOYMENT, KEY_TASK_IMAGES
-from .utils import get_template, dict_merge, find_dockerfiles_paths, app_name_from_path, \
-    find_file_paths, guess_build_dependencies_from_dockerfile, merge_to_yaml_file, get_json_template, get_image_name
-
-def relpath_if(p1, p2):
-    if os.path.isabs(p1):
-        return p1
-    return relpath(p1, p2)
-
-def create_skaffold_compose_configuration(root_paths, helm_values: HarnessMainConfig, output_path='.', manage_task_images=True):
-    skaffold_conf = get_template('skaffold-template.yaml', True)
-    apps = helm_values.apps
-    base_image_name = (helm_values.registry.name or "") + helm_values.name
-    artifacts = {}
-    overrides = {}
-
-    def remove_tag(image_name):
-        return image_name.split(":")[0]
-
-    def get_image_tag(name):
-        return f"{get_image_name(name, base_image_name)}"
-
-    builds = {}
-
-    def build_artifact(image_name, context_path, requirements=None, dockerfile_path=''):
-        artifact_spec = {
-            'image': image_name,
-            'context': context_path,
-            'docker': {
-                'dockerfile': join(dockerfile_path, 'Dockerfile'),
-                'buildArgs': {
-                    'REGISTRY': helm_values.registry.name,
-                    'TAG': helm_values.tag,
-                    'NOCACHE': str(time.time())
-                },
-                'ssh': 'default'
-            }
-        }
-        if requirements:
-            artifact_spec['requires'] = [{'image': get_image_tag(req), 'alias': req.replace('-', '_').upper()} for req
-                                         in requirements]
-        return artifact_spec
-
-
-    base_images = set()
-
-    def process_build_dockerfile(dockerfile_path, root_path, global_context=False, requirements=None, app_name=None):
-        if app_name is None:
-            app_name = app_name_from_path(basename(dockerfile_path))
-        if app_name in helm_values[KEY_TASK_IMAGES] or app_name.replace("-", "_") in helm_values.apps:
-            context_path = relpath_if(root_path, output_path) if global_context else relpath_if(dockerfile_path, output_path)
-
-            builds[app_name] = context_path
-            base_images.add(get_image_name(app_name))
-            artifacts[app_name] = build_artifact(
-                get_image_tag(app_name),
-                context_path,
-                dockerfile_path=relpath(dockerfile_path, output_path),
-                requirements=requirements or guess_build_dependencies_from_dockerfile(dockerfile_path)
-            )
-
-    for root_path in root_paths:
-        skaffold_conf = dict_merge(skaffold_conf, get_template(
-            join(root_path, DEPLOYMENT_CONFIGURATION_PATH, 'skaffold-template.yaml')))
-
-        base_dockerfiles = find_dockerfiles_paths(
-            join(root_path, BASE_IMAGES_PATH))
-
-        for dockerfile_path in base_dockerfiles:
-            process_build_dockerfile(dockerfile_path, root_path, global_context=True)
-
-    release_config = skaffold_conf['deploy']['helm']['releases'][0]
-    release_config['name'] = helm_values.namespace
-    release_config['namespace'] = helm_values.namespace
-    release_config['artifactOverrides'][KEY_APPS] = {}
-
-    static_images = set()
-    for root_path in root_paths:
-        static_dockerfiles = find_dockerfiles_paths(
-            join(root_path, STATIC_IMAGES_PATH))
-
-        for dockerfile_path in static_dockerfiles:
-            process_build_dockerfile(dockerfile_path, root_path)
-
-
-    for root_path in root_paths:
-        apps_path = join(root_path, APPS_PATH)
-        app_dockerfiles = find_dockerfiles_paths(apps_path)
-
-        release_config['artifactOverrides'][KEY_TASK_IMAGES] = {
-            task_image: remove_tag(helm_values[KEY_TASK_IMAGES][task_image])
-            for task_image in helm_values[KEY_TASK_IMAGES]
-        }
-        for dockerfile_path in app_dockerfiles:
-            app_relative_to_skaffold = os.path.relpath(
-                dockerfile_path, output_path)
-            context_path = os.path.relpath(dockerfile_path, '.')
-            app_relative_to_base = os.path.relpath(dockerfile_path, apps_path)
-            app_name = app_name_from_path(app_relative_to_base)
-            app_key = app_name.replace('-', '_')
-            if app_key not in apps:
-                if 'tasks' in app_relative_to_base and manage_task_images:
-                    parent_app_name = app_name_from_path(
-                        app_relative_to_base.split('/tasks')[0])
-                    parent_app_key = parent_app_name.replace('-', '_')
-
-                    if parent_app_key in apps:
-                        artifacts[app_key] = build_artifact(get_image_tag(app_name), app_relative_to_skaffold,
-                                                            base_images.union(static_images))
-
-                continue
-
-            build_requirements = apps[app_key][KEY_HARNESS].dependencies.build
-            # app_image_tag = remove_tag(
-            #     apps[app_key][KEY_HARNESS][KEY_DEPLOYMENT]['image'])
-            # artifacts[app_key] = build_artifact(
-            #     app_image_tag, app_relative_to_skaffold, build_requirements)
-            process_build_dockerfile(dockerfile_path, root_path, requirements=build_requirements, app_name=app_name)
-            app = apps[app_key]
-            if app[KEY_HARNESS][KEY_DEPLOYMENT]['image']:
-                release_config['artifactOverrides']['apps'][app_key] = \
-                    {
-                        KEY_HARNESS: {
-                            KEY_DEPLOYMENT: {
-                                'image': remove_tag(app[KEY_HARNESS][KEY_DEPLOYMENT]['image'])
-                            }
-                        }
-                }
-
-            mains_candidates = find_file_paths(context_path, '__main__.py')
-
-            def identify_unicorn_based_main(candidates):
-                import re
-                gunicorn_pattern = re.compile(r"gunicorn")
-                # sort candidates, shortest path first
-                for candidate in sorted(candidates,key=lambda x: len(x.split("/"))):
-                    dockerfile_path = f"{candidate}/.."
-                    while not exists(f"{dockerfile_path}/Dockerfile") and abspath(dockerfile_path) != abspath(root_path):
-                        dockerfile_path += "/.."
-                    dockerfile = f"{dockerfile_path}/Dockerfile"
-                    if not exists(dockerfile):
-                        continue
-                    with open(dockerfile, 'r') as file:
-                        if re.search(gunicorn_pattern, file.read()):
-                            return candidate
-                    requirements = f"{candidate}/../requirements.txt"
-                    if not exists(requirements):
-                        continue
-                    with open(requirements, 'r') as file:
-                        if re.search(gunicorn_pattern, file.read()):
-                            return candidate
-                return None
-
-            task_main_file = identify_unicorn_based_main(mains_candidates)
-
-            if task_main_file:
-                release_config['overrides']['apps'][app_key] = \
-                    {
-                        'harness': {
-                            'deployment': {
-                                'command': ['python'],
-                                'args': [f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py']
-                            }
-                        }
-                }
-
-            test_config: ApplicationTestConfig = helm_values.apps[app_key].harness.test
-            if test_config.unit.enabled and test_config.unit.commands:
-
-                    skaffold_conf['test'].append(dict(
-                        image=get_image_tag(app_name),
-                        custom=[dict(command="docker run $IMAGE " + cmd) for cmd in test_config.unit.commands]
-                    ))
-
-
-    del skaffold_conf['deploy']
-    skaffold_conf['deploy'] = {
-        'docker': {
-            'useCompose': True,
-            'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
-        }
-    }
-
-    skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
-    import ipdb; ipdb.set_trace()  # fmt: skip
-
-    merge_to_yaml_file(skaffold_conf, os.path.join(
-        output_path, 'skaffold.yaml'))
-
-    return skaffold_conf
-
-
-def create_vscode_debug_configuration(root_paths, helm_values):
-    logging.info(
-        "Creating VS code cloud build configuration.\nCloud build extension is needed to debug.")
-
-    vscode_launch_path = '.vscode/launch.json'
-
-    vs_conf = get_json_template(vscode_launch_path, True)
-    base_image_name = helm_values.name
-    debug_conf = get_json_template('vscode-debug-template.json', True)
-
-    def get_image_tag(name):
-        return f"{get_image_name(name, base_image_name)}"
-
-    if helm_values.registry.name:
-        base_image_name = helm_values.registry.name + helm_values.name
-    for i in range(len(vs_conf['configurations'])):
-        conf = vs_conf['configurations'][i]
-        if conf['name'] == debug_conf['name']:
-            del vs_conf['configurations'][i]
-            break
-    vs_conf['configurations'].append(debug_conf)
-
-    apps = helm_values.apps
-
-    for root_path in root_paths:
-        apps_path = os.path.join(root_path, 'applications')
-
-        src_root_paths = find_file_paths(apps_path, 'setup.py')
-
-        for path in src_root_paths:
-            app_relative_to_base = os.path.relpath(path, apps_path)
-            app_relative_to_root = os.path.relpath(path, '.')
-            app_name = app_name_from_path(app_relative_to_base.split('/')[0])
-            app_key = app_name.replace('-', '_')
-            if app_key in apps.keys():
-                debug_conf["debug"].append({
-                    "image": get_image_tag(app_name),
-                    "sourceFileMap": {
-                        "justMyCode": False,
-                        f"${{workspaceFolder}}/{app_relative_to_root}": apps[app_key].harness.get('sourceRoot',
-                                                                                                       "/usr/src/app"),
-                    }
-                })
-
-
-    if not os.path.exists(os.path.dirname(vscode_launch_path)):
-        os.makedirs(os.path.dirname(vscode_launch_path))
-    with open(vscode_launch_path, 'w') as f:
-        json.dump(vs_conf, f, indent=2, sort_keys=True)
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index 97897516..9a5cc78c 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -7,11 +7,10 @@ import os
 from ch_cli_tools.dockercompose import create_docker_compose_configuration
 from ch_cli_tools.helm import create_helm_chart, hosts_info, deploy
 from ch_cli_tools.skaffold import create_skaffold_configuration, create_vscode_debug_configuration
-from ch_cli_tools.skaffoldcompose import create_skaffold_compose_configuration
 from ch_cli_tools.codefresh import create_codefresh_deployment_scripts, write_env_file
 from ch_cli_tools.preprocessing import preprocess_build_overrides
 from ch_cli_tools.utils import merge_app_directories
-from cloudharness_utils.constants import DEPLOYMENT_PATH
+from cloudharness_utils.constants import DEPLOYMENT_PATH, COMPOSE_ENGINE
 
 HERE = os.path.dirname(os.path.realpath(__file__)).replace(os.path.sep, '/')
 ROOT = os.path.dirname(os.path.dirname(HERE)).replace(os.path.sep, '/')
@@ -85,22 +84,6 @@ if __name__ == "__main__":
             merge_app_directories(root_paths, destination=args.merge)
             root_paths = [args.merge]
 
-        # helm_values = create_helm_chart(
-        #     root_paths,
-        #     tag=args.tag,
-        #     registry=args.registry,
-        #     domain=args.domain,
-        #     local=args.local,
-        #     secured=not args.unsecured,
-        #     output_path=args.output_path,
-        #     exclude=args.exclude,
-        #     include=args.include,
-        #     registry_secret=args.registry_secret,
-        #     tls=not args.no_tls,
-        #     env=envs,
-        #     namespace=args.namespace
-        # )
-
         if not args.docker_compose:
             helm_values = create_helm_chart(
             root_paths,
@@ -152,7 +135,7 @@ if __name__ == "__main__":
         if not args.docker_compose:
             create_skaffold_configuration(merged_root_paths, helm_values)
         else:
-            create_skaffold_compose_configuration(merged_root_paths, helm_values)
+            create_skaffold_configuration(merged_root_paths, helm_values, backend_deploy=COMPOSE_ENGINE)
         create_vscode_debug_configuration(root_paths, helm_values)
 
         hosts_info(helm_values)

From 9f75c9c109f0591ff845c20d370aba21e93fc74e Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 7 Feb 2024 11:30:18 -0600
Subject: [PATCH 014/210] CH-100 Fix issue with entrypoint

---
 deployment-configuration/compose/templates/auto-compose.yaml | 3 +++
 tools/deployment-cli-tools/ch_cli_tools/dockercompose.py     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 5b4893ba..43bd8401 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -29,6 +29,9 @@ services:
         reservations:
           cpus: {{ $deployment.resources.requests.cpu | default "25m" }}
           memory: {{ trimSuffix "i" $deployment.resources.requests.memory | default "32M" }}
+    {{- with $deployment.command }}
+    entrypoint: {{ cat . $deployment.args }}
+    {{- end }}
     environment:
       - CH_CURRENT_APP_NAME={{ $app_name | quote }}
 
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 2cf768a4..a935899e 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -484,8 +484,8 @@ def inject_entry_points_commands(self, helm_values, image_path, app_path):
         task_main_file = identify_unicorn_based_main(mains_candidates, app_path)
 
         if task_main_file:
-            helm_values[KEY_HARNESS]['deployment']['command'] = ['python']
-            helm_values[KEY_HARNESS]['deployment']['args'] = [f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py']
+            helm_values[KEY_HARNESS]['deployment']['command'] = 'python'
+            helm_values[KEY_HARNESS]['deployment']['args'] = f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py'
 
 
 def get_included_with_dependencies(values, include):

From c159a4f0d266592d4269e4911969065bd7acb764 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 8 Feb 2024 08:18:56 -0600
Subject: [PATCH 015/210] CH-100 Remove generation of chart files for
 docker-compose

---
 .../ch_cli_tools/dockercompose.py             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index a935899e..9abcd565 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -546,18 +546,18 @@ def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_pat
 
             merge_configuration_directories(f"{resources_dir}", f"{dest_dir}")
 
-        subchart_dir = app_path / 'deploy/charts'
-        if subchart_dir.exists():
-            dest_dir = dest_helm_chart_path / 'charts' / app_name
-
-            logging.info(
-                "Collecting templates for application %s to %s", app_name, dest_dir)
-            if dest_dir.exists():
-                logging.warning(
-                    "Merging/overriding all files in directory %s", dest_dir)
-                merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
-            else:
-                shutil.copytree(subchart_dir, dest_dir)
+        # subchart_dir = app_path / 'deploy/charts'
+        # if subchart_dir.exists():
+        #     dest_dir = dest_helm_chart_path / 'charts' / app_name
+
+        #     logging.info(
+        #         "Collecting templates for application %s to %s", app_name, dest_dir)
+        #     if dest_dir.exists():
+        #         logging.warning(
+        #             "Merging/overriding all files in directory %s", dest_dir)
+        #         merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
+        #     else:
+        #         shutil.copytree(subchart_dir, dest_dir)
 
 
 def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):

From 02bd318b84667e8cfc4a3a94fc0e2020c2ff79ac Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 9 Feb 2024 10:34:44 -0600
Subject: [PATCH 016/210] CH-100 Rollback default per-app helm template
 directory

---
 .../argo/deploy/templates/{helm => }/argo-sa.yaml     |  0
 .../deploy/templates/{helm => }/broker-config.yml     |  0
 .../events/deploy/templates/{helm => }/configmap.yaml |  0
 .../deploy/templates/{helm => }/deployments.yml       |  0
 .../events/deploy/templates/{helm => }/roles.yml      |  0
 .../events/deploy/templates/{helm => }/services.yml   |  0
 .../events/deploy/templates/{helm => }/zoo-config.yml |  0
 .../templates/{helm => }/_helpers-auth-rework.tpl     |  0
 .../deploy/templates/{helm => }/_helpers-names.tpl    |  0
 .../deploy/templates/{helm => }/_helpers.tpl          |  0
 .../templates/{helm => }/hub/_helpers-passwords.tpl   |  0
 .../deploy/templates/{helm => }/hub/configmap.yaml    |  0
 .../deploy/templates/{helm => }/hub/deployment.yaml   |  0
 .../deploy/templates/{helm => }/hub/netpol.yaml       |  0
 .../deploy/templates/{helm => }/hub/pdb.yaml          |  0
 .../deploy/templates/{helm => }/hub/pvc.yaml          |  0
 .../deploy/templates/{helm => }/hub/rbac.yaml         |  0
 .../deploy/templates/{helm => }/hub/secret.yaml       |  0
 .../deploy/templates/{helm => }/hub/service.yaml      |  0
 .../{helm => }/image-puller/_helpers-daemonset.tpl    |  0
 .../{helm => }/image-puller/daemonset-continuous.yaml |  0
 .../{helm => }/image-puller/daemonset-hook.yaml       |  0
 .../deploy/templates/{helm => }/image-puller/job.yaml |  0
 .../templates/{helm => }/image-puller/rbac.yaml       |  0
 .../templates/{helm => }/proxy/autohttps/_README.txt  |  0
 .../{helm => }/proxy/autohttps/configmap.yaml         |  0
 .../{helm => }/proxy/autohttps/deployment.yaml        |  0
 .../templates/{helm => }/proxy/autohttps/rbac.yaml    |  0
 .../templates/{helm => }/proxy/autohttps/service.yaml |  0
 .../deploy/templates/{helm => }/proxy/deployment.yaml |  0
 .../deploy/templates/{helm => }/proxy/netpol.yaml     |  0
 .../deploy/templates/{helm => }/proxy/pdb.yaml        |  0
 .../deploy/templates/{helm => }/proxy/secret.yaml     |  0
 .../deploy/templates/{helm => }/proxy/service.yaml    |  0
 .../{helm => }/scheduling/_scheduling-helpers.tpl     |  0
 .../{helm => }/scheduling/priorityclass.yaml          |  0
 .../{helm => }/scheduling/user-placeholder/pdb.yaml   |  0
 .../scheduling/user-placeholder/priorityclass.yaml    |  0
 .../scheduling/user-placeholder/statefulset.yaml      |  0
 .../scheduling/user-scheduler/configmap.yaml          |  0
 .../scheduling/user-scheduler/deployment.yaml         |  0
 .../{helm => }/scheduling/user-scheduler/pdb.yaml     |  0
 .../{helm => }/scheduling/user-scheduler/rbac.yaml    |  0
 .../templates/{helm => }/singleuser/netpol.yaml       |  0
 .../deploy/templates/{helm => }/_helpers.tpl          |  0
 .../deploy/templates/{helm => }/clusterrole.yaml      |  0
 .../templates/{helm => }/clusterrolebinding.yaml      |  0
 .../deploy/templates/{helm => }/nfs-server.yaml       |  0
 .../templates/{helm => }/podsecuritypolicy.yaml       |  0
 .../nfsserver/deploy/templates/{helm => }/role.yaml   |  0
 .../deploy/templates/{helm => }/rolebinding.yaml      |  0
 .../deploy/templates/{helm => }/serviceaccount.yaml   |  0
 .../deploy/templates/{helm => }/storageclass.yaml     |  0
 .../sentry/deploy/templates/{helm => }/redis.yaml     |  0
 .../compose/templates/auto-compose.yaml               | 11 +++++++----
 .../ch_cli_tools/dockercompose.py                     |  2 +-
 tools/deployment-cli-tools/ch_cli_tools/helm.py       |  2 +-
 57 files changed, 9 insertions(+), 6 deletions(-)
 rename applications/argo/deploy/templates/{helm => }/argo-sa.yaml (100%)
 rename applications/events/deploy/templates/{helm => }/broker-config.yml (100%)
 rename applications/events/deploy/templates/{helm => }/configmap.yaml (100%)
 rename applications/events/deploy/templates/{helm => }/deployments.yml (100%)
 rename applications/events/deploy/templates/{helm => }/roles.yml (100%)
 rename applications/events/deploy/templates/{helm => }/services.yml (100%)
 rename applications/events/deploy/templates/{helm => }/zoo-config.yml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/_helpers-auth-rework.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/_helpers-names.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/_helpers.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/_helpers-passwords.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/configmap.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/netpol.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/pvc.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/secret.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/hub/service.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/image-puller/_helpers-daemonset.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/image-puller/daemonset-continuous.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/image-puller/daemonset-hook.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/image-puller/job.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/image-puller/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/autohttps/_README.txt (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/autohttps/configmap.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/autohttps/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/autohttps/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/autohttps/service.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/netpol.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/secret.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/proxy/service.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/_scheduling-helpers.tpl (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/priorityclass.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-placeholder/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-placeholder/priorityclass.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-placeholder/statefulset.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-scheduler/configmap.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-scheduler/deployment.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-scheduler/pdb.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/scheduling/user-scheduler/rbac.yaml (100%)
 rename applications/jupyterhub/deploy/templates/{helm => }/singleuser/netpol.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/_helpers.tpl (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/clusterrole.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/clusterrolebinding.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/nfs-server.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/podsecuritypolicy.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/role.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/rolebinding.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/serviceaccount.yaml (100%)
 rename applications/nfsserver/deploy/templates/{helm => }/storageclass.yaml (100%)
 rename applications/sentry/deploy/templates/{helm => }/redis.yaml (100%)

diff --git a/applications/argo/deploy/templates/helm/argo-sa.yaml b/applications/argo/deploy/templates/argo-sa.yaml
similarity index 100%
rename from applications/argo/deploy/templates/helm/argo-sa.yaml
rename to applications/argo/deploy/templates/argo-sa.yaml
diff --git a/applications/events/deploy/templates/helm/broker-config.yml b/applications/events/deploy/templates/broker-config.yml
similarity index 100%
rename from applications/events/deploy/templates/helm/broker-config.yml
rename to applications/events/deploy/templates/broker-config.yml
diff --git a/applications/events/deploy/templates/helm/configmap.yaml b/applications/events/deploy/templates/configmap.yaml
similarity index 100%
rename from applications/events/deploy/templates/helm/configmap.yaml
rename to applications/events/deploy/templates/configmap.yaml
diff --git a/applications/events/deploy/templates/helm/deployments.yml b/applications/events/deploy/templates/deployments.yml
similarity index 100%
rename from applications/events/deploy/templates/helm/deployments.yml
rename to applications/events/deploy/templates/deployments.yml
diff --git a/applications/events/deploy/templates/helm/roles.yml b/applications/events/deploy/templates/roles.yml
similarity index 100%
rename from applications/events/deploy/templates/helm/roles.yml
rename to applications/events/deploy/templates/roles.yml
diff --git a/applications/events/deploy/templates/helm/services.yml b/applications/events/deploy/templates/services.yml
similarity index 100%
rename from applications/events/deploy/templates/helm/services.yml
rename to applications/events/deploy/templates/services.yml
diff --git a/applications/events/deploy/templates/helm/zoo-config.yml b/applications/events/deploy/templates/zoo-config.yml
similarity index 100%
rename from applications/events/deploy/templates/helm/zoo-config.yml
rename to applications/events/deploy/templates/zoo-config.yml
diff --git a/applications/jupyterhub/deploy/templates/helm/_helpers-auth-rework.tpl b/applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/_helpers-auth-rework.tpl
rename to applications/jupyterhub/deploy/templates/_helpers-auth-rework.tpl
diff --git a/applications/jupyterhub/deploy/templates/helm/_helpers-names.tpl b/applications/jupyterhub/deploy/templates/_helpers-names.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/_helpers-names.tpl
rename to applications/jupyterhub/deploy/templates/_helpers-names.tpl
diff --git a/applications/jupyterhub/deploy/templates/helm/_helpers.tpl b/applications/jupyterhub/deploy/templates/_helpers.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/_helpers.tpl
rename to applications/jupyterhub/deploy/templates/_helpers.tpl
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/_helpers-passwords.tpl b/applications/jupyterhub/deploy/templates/hub/_helpers-passwords.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/_helpers-passwords.tpl
rename to applications/jupyterhub/deploy/templates/hub/_helpers-passwords.tpl
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/configmap.yaml b/applications/jupyterhub/deploy/templates/hub/configmap.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/configmap.yaml
rename to applications/jupyterhub/deploy/templates/hub/configmap.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/deployment.yaml b/applications/jupyterhub/deploy/templates/hub/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/deployment.yaml
rename to applications/jupyterhub/deploy/templates/hub/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/netpol.yaml b/applications/jupyterhub/deploy/templates/hub/netpol.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/netpol.yaml
rename to applications/jupyterhub/deploy/templates/hub/netpol.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/pdb.yaml b/applications/jupyterhub/deploy/templates/hub/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/pdb.yaml
rename to applications/jupyterhub/deploy/templates/hub/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/pvc.yaml b/applications/jupyterhub/deploy/templates/hub/pvc.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/pvc.yaml
rename to applications/jupyterhub/deploy/templates/hub/pvc.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/rbac.yaml b/applications/jupyterhub/deploy/templates/hub/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/rbac.yaml
rename to applications/jupyterhub/deploy/templates/hub/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/secret.yaml b/applications/jupyterhub/deploy/templates/hub/secret.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/secret.yaml
rename to applications/jupyterhub/deploy/templates/hub/secret.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/hub/service.yaml b/applications/jupyterhub/deploy/templates/hub/service.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/hub/service.yaml
rename to applications/jupyterhub/deploy/templates/hub/service.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/image-puller/_helpers-daemonset.tpl b/applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/image-puller/_helpers-daemonset.tpl
rename to applications/jupyterhub/deploy/templates/image-puller/_helpers-daemonset.tpl
diff --git a/applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-continuous.yaml b/applications/jupyterhub/deploy/templates/image-puller/daemonset-continuous.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-continuous.yaml
rename to applications/jupyterhub/deploy/templates/image-puller/daemonset-continuous.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-hook.yaml b/applications/jupyterhub/deploy/templates/image-puller/daemonset-hook.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/image-puller/daemonset-hook.yaml
rename to applications/jupyterhub/deploy/templates/image-puller/daemonset-hook.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/image-puller/job.yaml b/applications/jupyterhub/deploy/templates/image-puller/job.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/image-puller/job.yaml
rename to applications/jupyterhub/deploy/templates/image-puller/job.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/image-puller/rbac.yaml b/applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/image-puller/rbac.yaml
rename to applications/jupyterhub/deploy/templates/image-puller/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/_README.txt b/applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/autohttps/_README.txt
rename to applications/jupyterhub/deploy/templates/proxy/autohttps/_README.txt
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/configmap.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/autohttps/configmap.yaml
rename to applications/jupyterhub/deploy/templates/proxy/autohttps/configmap.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/deployment.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/autohttps/deployment.yaml
rename to applications/jupyterhub/deploy/templates/proxy/autohttps/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/rbac.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/autohttps/rbac.yaml
rename to applications/jupyterhub/deploy/templates/proxy/autohttps/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/autohttps/service.yaml b/applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/autohttps/service.yaml
rename to applications/jupyterhub/deploy/templates/proxy/autohttps/service.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/deployment.yaml b/applications/jupyterhub/deploy/templates/proxy/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/deployment.yaml
rename to applications/jupyterhub/deploy/templates/proxy/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/netpol.yaml b/applications/jupyterhub/deploy/templates/proxy/netpol.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/netpol.yaml
rename to applications/jupyterhub/deploy/templates/proxy/netpol.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/pdb.yaml b/applications/jupyterhub/deploy/templates/proxy/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/pdb.yaml
rename to applications/jupyterhub/deploy/templates/proxy/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/secret.yaml b/applications/jupyterhub/deploy/templates/proxy/secret.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/secret.yaml
rename to applications/jupyterhub/deploy/templates/proxy/secret.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/proxy/service.yaml b/applications/jupyterhub/deploy/templates/proxy/service.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/proxy/service.yaml
rename to applications/jupyterhub/deploy/templates/proxy/service.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/_scheduling-helpers.tpl b/applications/jupyterhub/deploy/templates/scheduling/_scheduling-helpers.tpl
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/_scheduling-helpers.tpl
rename to applications/jupyterhub/deploy/templates/scheduling/_scheduling-helpers.tpl
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/priorityclass.yaml b/applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/priorityclass.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/priorityclass.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/pdb.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/pdb.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-placeholder/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/priorityclass.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/priorityclass.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-placeholder/priorityclass.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/statefulset.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-placeholder/statefulset.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-placeholder/statefulset.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/configmap.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/configmap.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-scheduler/configmap.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/deployment.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/deployment.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-scheduler/deployment.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/pdb.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/pdb.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-scheduler/pdb.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/rbac.yaml b/applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/scheduling/user-scheduler/rbac.yaml
rename to applications/jupyterhub/deploy/templates/scheduling/user-scheduler/rbac.yaml
diff --git a/applications/jupyterhub/deploy/templates/helm/singleuser/netpol.yaml b/applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
similarity index 100%
rename from applications/jupyterhub/deploy/templates/helm/singleuser/netpol.yaml
rename to applications/jupyterhub/deploy/templates/singleuser/netpol.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/_helpers.tpl b/applications/nfsserver/deploy/templates/_helpers.tpl
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/_helpers.tpl
rename to applications/nfsserver/deploy/templates/_helpers.tpl
diff --git a/applications/nfsserver/deploy/templates/helm/clusterrole.yaml b/applications/nfsserver/deploy/templates/clusterrole.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/clusterrole.yaml
rename to applications/nfsserver/deploy/templates/clusterrole.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/clusterrolebinding.yaml b/applications/nfsserver/deploy/templates/clusterrolebinding.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/clusterrolebinding.yaml
rename to applications/nfsserver/deploy/templates/clusterrolebinding.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/nfs-server.yaml b/applications/nfsserver/deploy/templates/nfs-server.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/nfs-server.yaml
rename to applications/nfsserver/deploy/templates/nfs-server.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/podsecuritypolicy.yaml b/applications/nfsserver/deploy/templates/podsecuritypolicy.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/podsecuritypolicy.yaml
rename to applications/nfsserver/deploy/templates/podsecuritypolicy.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/role.yaml b/applications/nfsserver/deploy/templates/role.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/role.yaml
rename to applications/nfsserver/deploy/templates/role.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/rolebinding.yaml b/applications/nfsserver/deploy/templates/rolebinding.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/rolebinding.yaml
rename to applications/nfsserver/deploy/templates/rolebinding.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/serviceaccount.yaml b/applications/nfsserver/deploy/templates/serviceaccount.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/serviceaccount.yaml
rename to applications/nfsserver/deploy/templates/serviceaccount.yaml
diff --git a/applications/nfsserver/deploy/templates/helm/storageclass.yaml b/applications/nfsserver/deploy/templates/storageclass.yaml
similarity index 100%
rename from applications/nfsserver/deploy/templates/helm/storageclass.yaml
rename to applications/nfsserver/deploy/templates/storageclass.yaml
diff --git a/applications/sentry/deploy/templates/helm/redis.yaml b/applications/sentry/deploy/templates/redis.yaml
similarity index 100%
rename from applications/sentry/deploy/templates/helm/redis.yaml
rename to applications/sentry/deploy/templates/redis.yaml
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 43bd8401..cdf8dddd 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -45,10 +45,13 @@ services:
       - {{ .name }}={{ .value | quote }}
       {{- end }}
     {{- with $app_config.harness.dependencies.soft }}
-    # links:
-    #   {{- range . }}
-    #   - {{ . }}
-    #   {{- end }}
+    links:
+      {{- range . }}
+      - {{ . }}
+      {{- with $app_config.harness.domain }}
+      :{{- . }}
+      {{- end }}
+      {{- end }}
     {{- end }}
     {{- with $app_config.harness.dependencies.hard }}
     depends_on:
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 9abcd565..2c2a2c35 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -525,7 +525,7 @@ def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_pat
         app_name = app_name_from_path(os.path.relpath(f"{app_path}", app_base_path))
         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
             continue
-        template_dir = app_path / 'deploy' / 'templates' / templates_path
+        template_dir = app_path / 'deploy' / f'templates-{templates_path}'
         if template_dir.exists():
             dest_dir = dest_helm_chart_path / 'templates' / app_name
 
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index 9bd43b8c..64683197 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -521,7 +521,7 @@ def collect_apps_helm_templates(search_root, dest_helm_chart_path, exclude=(), i
         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
             continue
-        template_dir = os.path.join(app_path, 'deploy', 'templates', HELM_PATH)
+        template_dir = os.path.join(app_path, 'deploy', 'templates')
         if os.path.exists(template_dir):
             dest_dir = os.path.join(
                 dest_helm_chart_path, 'templates', app_name)

From 1a570647182d3f89dd057cbe7a8be770fa39b52a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 9 Feb 2024 10:35:41 -0600
Subject: [PATCH 017/210] CH-100 Add subdomain configuration

---
 deployment-configuration/compose/templates/auto-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index cdf8dddd..9ba6a3ef 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -48,8 +48,8 @@ services:
     links:
       {{- range . }}
       - {{ . }}
-      {{- with $app_config.harness.domain }}
-      :{{- . }}
+      {{- with $app_config.harness.subdomain }}
+      {{- ":" }}{{ . }}.{{ $.Values.domain }}
       {{- end }}
       {{- end }}
     {{- end }}

From b97c19c827e3dbd4a51ff2df273b0e63e810be1a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 9 Feb 2024 12:20:31 -0600
Subject: [PATCH 018/210] CH-100 Fix bad "links" generation

---
 .../compose/templates/auto-compose.yaml                    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 9ba6a3ef..b15d32cd 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -47,10 +47,7 @@ services:
     {{- with $app_config.harness.dependencies.soft }}
     links:
       {{- range . }}
-      - {{ . }}
-      {{- with $app_config.harness.subdomain }}
-      {{- ":" }}{{ . }}.{{ $.Values.domain }}
-      {{- end }}
+      - {{ . }}:{{ . }}.{{ $.Values.domain }}
       {{- end }}
     {{- end }}
     {{- with $app_config.harness.dependencies.hard }}
@@ -77,7 +74,7 @@ services:
 {{- end }}
 
   traefik:
-    image: "traefik:v2.2"
+    image: "traefik:v2.10"
     container_name: "traefik"
     networks:
     - ch

From 85dcfd93cb131bd29097479ee6bcdd08ee966dbc Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 12 Feb 2024 12:54:00 -0600
Subject: [PATCH 019/210] CH-100 Add support for aliases and service links

---
 .../compose/templates/auto-compose.yaml           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index b15d32cd..512ba0db 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -2,16 +2,22 @@ version: '3.7'
 
 services:
 {{- range $app_name, $app_config := .Values.apps }}
-  {{- if has $app_name (list "argo" "nfsserver" "workflows" "events" ) }} {{- /* We deactivate generation for some services */}}
+  {{ $deployment :=  $app_config.harness.deployment }}
+  {{- if or (not $deployment.auto) (not $app_config.harness.service.auto) }}
   {{- continue }}
   {{- end}}
-  {{ $deployment :=  $app_config.harness.deployment }}
   {{ $app_name }}:
     {{- with $app_config.domain }}
     domainname: {{ . }}
     {{- end }}
     networks:
-    - ch
+      {{- if ne $app_config.harness.service.name $app_name}}
+      ch:
+        aliases:
+          - {{ $app_config.harness.service.name }}
+      {{- else }}
+      - ch
+      {{- end}}
     {{- with $app_config.image }}
     image: {{ . }}
     {{- end }}
@@ -47,7 +53,8 @@ services:
     {{- with $app_config.harness.dependencies.soft }}
     links:
       {{- range . }}
-      - {{ . }}:{{ . }}.{{ $.Values.domain }}
+      {{- $service_name := (get $.Values.apps .).harness.service.name }}
+      - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
       {{- end }}
     {{- end }}
     {{- with $app_config.harness.dependencies.hard }}

From 14292113f978415b7cff3a69e937785602449622 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 13 Feb 2024 18:38:03 +0100
Subject: [PATCH 020/210] CH-118 update node version

---
 .../base-images/cloudharness-frontend-build/Dockerfile          | 2 +-
 test/test-e2e/Dockerfile                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure/base-images/cloudharness-frontend-build/Dockerfile b/infrastructure/base-images/cloudharness-frontend-build/Dockerfile
index ec4c5990..412125e6 100644
--- a/infrastructure/base-images/cloudharness-frontend-build/Dockerfile
+++ b/infrastructure/base-images/cloudharness-frontend-build/Dockerfile
@@ -1,3 +1,3 @@
-FROM node:15.5
+FROM node:20
 
 
diff --git a/test/test-e2e/Dockerfile b/test/test-e2e/Dockerfile
index 48c8f855..ef17adee 100644
--- a/test/test-e2e/Dockerfile
+++ b/test/test-e2e/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-slim
+FROM node:20
 
 # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
 # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer

From 0f81d23699d2a8d99597ae8275b0a317c6647d7e Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 13 Feb 2024 18:39:08 +0100
Subject: [PATCH 021/210] CH-118 clean unused constant

---
 docs/dev.md                                                  | 1 -
 libraries/cloudharness-utils/cloudharness_utils/constants.py | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/docs/dev.md b/docs/dev.md
index 113e0c86..996e6350 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -93,7 +93,6 @@ This file is part of the CloudHarness runtime.
 Other constants are located there as shown in the following code extract.
 
 ```python
-NODE_BUILD_IMAGE = 'node:8.16.1-alpine'
 APPLICATION_TEMPLATE_PATH = 'application-templates'
 # ...
 APPS_PATH = 'applications'
diff --git a/libraries/cloudharness-utils/cloudharness_utils/constants.py b/libraries/cloudharness-utils/cloudharness_utils/constants.py
index e2a6a48b..53282691 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/constants.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/constants.py
@@ -1,9 +1,5 @@
 import os
 
-NODE_BUILD_IMAGE = 'node:8.16.1-alpine'
-
-
-
 APPLICATION_TEMPLATE_PATH = 'application-templates'
 DEFAULT_MERGE_PATH = ".overrides"
 

From 1ac82264e80fa1d19730d85036878ed4c75c6b81 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 14 Feb 2024 10:34:54 -0600
Subject: [PATCH 022/210] CH-100 Add first support for auto databases

---
 .../compose/templates/auto-compose.yaml       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 512ba0db..80f4845b 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -78,8 +78,29 @@ services:
     {{- end }}
     {{- end}}
     {{- end }}
+  {{- with $app_config.harness.database }}
+  {{- if not .auto }}
+  {{- continue}}
+  {{- end }}
+  # Database for {{ $app_name }}, type {{ .type }} named {{ .name }}
+  {{ .name }}:
+    {{- $db_infos := (get . .type) }}
+    image: {{ $db_infos.image }}
+    expose:
+    {{- range $port := $db_infos.ports }}
+    - {{ $port.port | quote }}
+    {{- end }}
+    {{- with .resources }}
+    resources:
+      limits:
+        cpus: {{ .limits.cpu | default "1000m" }}
+        memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
+      reservations:
+        cpus: {{ .requests.cpu | default "100m" }}
+        memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
+    {{- end }}
+  {{- end}}
 {{- end }}
-
   traefik:
     image: "traefik:v2.10"
     container_name: "traefik"

From 56e22b7b883a57cc0eb9c672c5b00f43cc8172a0 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 14 Feb 2024 10:41:32 -0600
Subject: [PATCH 023/210] CH-100 Add finer grain port handling

---
 .../compose/templates/auto-compose.yaml                     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 80f4845b..c432d522 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -24,6 +24,10 @@ services:
     {{- with $app_config.harness.service.port }}
     ports:
       - "{{ . }}:{{ $app_config.harness.deployment.port }}"
+    {{- end }}
+    {{- with $app_config.harness.deployment.port }}
+    expose:
+      - {{ . | quote }}
     {{- end}}
     deploy:
       mode: "replicated"
@@ -85,6 +89,8 @@ services:
   # Database for {{ $app_name }}, type {{ .type }} named {{ .name }}
   {{ .name }}:
     {{- $db_infos := (get . .type) }}
+    networks:
+      ch:
     image: {{ $db_infos.image }}
     expose:
     {{- range $port := $db_infos.ports }}

From 336b5585f7fa059b282cede4fcedd6023bcf563a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 15 Feb 2024 08:11:42 -0600
Subject: [PATCH 024/210] CH-100 Change way port is exposed to outside world

---
 .../compose/templates/auto-compose.yaml           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index c432d522..894814f6 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -97,13 +97,14 @@ services:
     - {{ $port.port | quote }}
     {{- end }}
     {{- with .resources }}
-    resources:
-      limits:
-        cpus: {{ .limits.cpu | default "1000m" }}
-        memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
-      reservations:
-        cpus: {{ .requests.cpu | default "100m" }}
-        memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
+    deploy:
+      resources:
+        limits:
+          cpus: {{ .limits.cpu | default "1000m" }}
+          memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
+        reservations:
+          cpus: {{ .requests.cpu | default "100m" }}
+          memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
     {{- end }}
   {{- end}}
 {{- end }}

From a004ffb80583dee5be24181789e8ca13cc8f508a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 15 Feb 2024 11:02:12 -0600
Subject: [PATCH 025/210] CH-100 Fix issue with env var quoting

---
 .../compose/templates/auto-compose.yaml          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 894814f6..138826e3 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -21,10 +21,12 @@ services:
     {{- with $app_config.image }}
     image: {{ . }}
     {{- end }}
+    {{- if eq $.Values.mainapp $app_name }}
     {{- with $app_config.harness.service.port }}
     ports:
       - "{{ . }}:{{ $app_config.harness.deployment.port }}"
     {{- end }}
+    {{- end }}
     {{- with $app_config.harness.deployment.port }}
     expose:
       - {{ . | quote }}
@@ -40,19 +42,20 @@ services:
           cpus: {{ $deployment.resources.requests.cpu | default "25m" }}
           memory: {{ trimSuffix "i" $deployment.resources.requests.memory | default "32M" }}
     {{- with $deployment.command }}
-    entrypoint: {{ cat . $deployment.args }}
+    # entrypoint: {{ cat . $deployment.args }}
     {{- end }}
     environment:
-      - CH_CURRENT_APP_NAME={{ $app_name | quote }}
+      - CH_CURRENT_APP_NAME={{ $app_name }}
+      - CH_VALUES_PATH=/opt/cloudharness/resources/allvalues.yaml
 
       {{- range $.Values.env }}
-      - {{ .name }}={{ .value | quote }}
+      - {{ .name }}={{ .value }}
       {{- end }}
       {{- /*{{- range $.Values.env }}
-      - {{ .name }}={{ .value | quote }}
+      - {{ .name }}={{ .value }}
       {{- end }} */}}
       {{- range $app_config.harness.env }}
-      - {{ .name }}={{ .value | quote }}
+      - {{ .name }}={{ .value }}
       {{- end }}
     {{- with $app_config.harness.dependencies.soft }}
     links:
@@ -67,8 +70,9 @@ services:
       - {{ . }}
       {{- end }}
     {{- end }}
-    {{- if or $deployment.volume $app_config.harness.resources }}
     volumes:
+      - ./compose/values.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
+    {{- if or $deployment.volume $app_config.harness.resources }}
     {{- with $deployment.volume }}
       - type: volume
         source: {{ .name }}

From f73108c2fa976d7654c76798cde9f2697e2ac23c Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 15 Feb 2024 11:20:41 -0600
Subject: [PATCH 026/210] CH-100 Add special behavior to produce allvalues.yaml

---
 .../compose/templates/auto-compose.yaml       |  2 +-
 .../ch_cli_tools/dockercompose.py             | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 138826e3..3896ae13 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -71,7 +71,7 @@ services:
       {{- end }}
     {{- end }}
     volumes:
-      - ./compose/values.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
+      - ./compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
     {{- if or $deployment.volume $app_config.harness.resources }}
     {{- with $deployment.volume }}
       - type: volume
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 2c2a2c35..1c51abd6 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -11,6 +11,7 @@
 import tarfile
 from docker import from_env as DockerClient
 from pathlib import Path
+import copy
 
 
 from . import HERE, CH_ROOT
@@ -134,6 +135,12 @@ def process_values(self) -> HarnessMainConfig:
             merge_to_yaml_file({'metadata': {'namespace': self.namespace},
                                 'name': helm_values['name']}, self.helm_chart_path)
         validate_helm_values(merged_values)
+
+        # All values save
+        all_values = self.__get_default_helm_values_with_secrets(merged_values)
+
+        merge_to_yaml_file(all_values, self.dest_deployment_path / 'allvalues.yaml')
+
         return HarnessMainConfig.from_dict(merged_values)
 
     def __process_applications(self, helm_values, base_image_name):
@@ -234,6 +241,18 @@ def __get_default_helm_values(self):
 
         return helm_values
 
+    def __get_default_helm_values_with_secrets(self, helm_values):
+        helm_values = copy.deepcopy(helm_values)
+        # {{- $values_copy := deepCopy .Values }}
+        # {{- range $key, $val := .Values.apps }}
+        #   {{- $new_secrets := dict "apps" (dict $key (dict "harness" (dict "secrets"))) }}
+        #   {{- $tmp := mergeOverwrite $values_copy $new_secrets }}
+        # {{- end }}
+        # {{ $values_copy | toYaml | indent 4 }}
+        for key, val in helm_values['apps'].items():
+            helm_values['apps'][key]['harness']['secrets'] = {}
+        return helm_values
+
     def create_tls_certificate(self, helm_values):
         if not self.tls:
             helm_values['tls'] = None

From 2370b20c646e2cb4c2c87221e746d23ab1ad5ec3 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 15 Feb 2024 12:08:01 -0600
Subject: [PATCH 027/210] CH-100 Add actual docker-compose.yaml generation in
 harness-deployment

---
 .../compose/templates/auto-compose.yaml              |  1 -
 .../ch_cli_tools/dockercompose.py                    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 3896ae13..4999b46f 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -46,7 +46,6 @@ services:
     {{- end }}
     environment:
       - CH_CURRENT_APP_NAME={{ $app_name }}
-      - CH_VALUES_PATH=/opt/cloudharness/resources/allvalues.yaml
 
       {{- range $.Values.env }}
       - {{ .name }}={{ .value }}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 1c51abd6..dfe0bf5b 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -141,8 +141,20 @@ def process_values(self) -> HarnessMainConfig:
 
         merge_to_yaml_file(all_values, self.dest_deployment_path / 'allvalues.yaml')
 
+        self.generate_docker_compose_yaml()
+
         return HarnessMainConfig.from_dict(merged_values)
 
+    def generate_docker_compose_yaml(self):
+        compose_templates = self.dest_deployment_path
+        dest_compose_yaml = self.dest_deployment_path.parent / "docker-compose.yaml"
+
+        logging.info(f'Generate docker compose configuration in: {dest_compose_yaml}, using templates from {compose_templates}')
+        command = f"helm template {compose_templates} > {dest_compose_yaml}"
+
+        subprocess.call(command, shell=True)
+
+
     def __process_applications(self, helm_values, base_image_name):
         for root_path in self.root_paths:
             app_values = init_app_values(

From 5ed630d8dcb9a12dbd7238dad51ad6ed03e3bbcd Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 15 Feb 2024 12:40:31 -0600
Subject: [PATCH 028/210] CH-100 Add first dedicated templates for postgres

---
 .../compose/templates/auto-compose.yaml                    | 7 ++++---
 .../compose/templates/auto-database-postgres.yaml          | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 deployment-configuration/compose/templates/auto-database-postgres.yaml

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 4999b46f..22f8c5a2 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -86,9 +86,9 @@ services:
     {{- end}}
     {{- end }}
   {{- with $app_config.harness.database }}
-  {{- if not .auto }}
-  {{- continue}}
-  {{- end }}
+    {{- if not .auto }}
+    {{- continue}}
+    {{- end }}
   # Database for {{ $app_name }}, type {{ .type }} named {{ .name }}
   {{ .name }}:
     {{- $db_infos := (get . .type) }}
@@ -109,6 +109,7 @@ services:
           cpus: {{ .requests.cpu | default "100m" }}
           memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
     {{- end }}
+  {{- include "deploy_utils.database.postgres" . }}
   {{- end}}
 {{- end }}
   traefik:
diff --git a/deployment-configuration/compose/templates/auto-database-postgres.yaml b/deployment-configuration/compose/templates/auto-database-postgres.yaml
new file mode 100644
index 00000000..d832193f
--- /dev/null
+++ b/deployment-configuration/compose/templates/auto-database-postgres.yaml
@@ -0,0 +1,7 @@
+{{- define "deploy_utils.database.postgres" }}
+    environment:
+      - POSTGRES_DB={{ .postgres.initialdb | quote }}
+      - POSTGRES_USER={{ .user | quote }}
+      - POSTGRES_PASSWORD={{ .pass | quote }}
+      - PGDATA=/data/db/pgdata
+{{- end }}
\ No newline at end of file

From 111a4f3e5be5d7655faa783009106a0dafebfd6f Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 15 Feb 2024 13:09:12 -0600
Subject: [PATCH 029/210] CH-100 Add volumes for db

---
 .../compose/templates/auto-compose.yaml         | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 22f8c5a2..f14c7e11 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -109,7 +109,16 @@ services:
           cpus: {{ .requests.cpu | default "100m" }}
           memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
     {{- end }}
-  {{- include "deploy_utils.database.postgres" . }}
+    volumes:
+      - type: volume
+        source: {{ .name }}
+        target: /data/db
+    {{- if eq .type "postgres" }}
+      - type: volume
+        source: dshm
+        target: /dev/shm
+    {{- include "deploy_utils.database.postgres" . }}
+    {{- end }}
   {{- end}}
 {{- end }}
   traefik:
@@ -142,4 +151,10 @@ volumes:  # this inclusion needs to be conditional
   {{- with $app_config.harness.deployment.volume }}
   {{ .name }}:
   {{- end }}
+  {{- with $app_config.harness.database }}
+  {{ .name }}:
+  {{- if eq .type "postgres" }}
+  dshm:
+  {{- end }}
+  {{- end }}
 {{- end }}
\ No newline at end of file

From ce4596ab1b62110c56c0bb1ef339cf9cc7cbdc91 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 16 Feb 2024 06:46:34 -0600
Subject: [PATCH 030/210] CH-100 Add first template for events

---
 .../templates-compose/events-deployment.yaml  | 13 +++++
 .../compose/templates/auto-compose.yaml       | 47 +++++++++++--------
 2 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 applications/events/deploy/templates-compose/events-deployment.yaml

diff --git a/applications/events/deploy/templates-compose/events-deployment.yaml b/applications/events/deploy/templates-compose/events-deployment.yaml
new file mode 100644
index 00000000..f16e7e38
--- /dev/null
+++ b/applications/events/deploy/templates-compose/events-deployment.yaml
@@ -0,0 +1,13 @@
+{{- define "events.deployment" }}
+{{- $nfs := .apps.nfsserver}}
+
+{{ $nfs.name }}:
+  image: {{ $nfs.harness.deployment.image }}
+  environment:
+    # NFS useDNS? {{ $nfs.nfs.useDNS }}
+    {{- if $nfs.nfs.useDNS }}
+    - NFS_SERVER={{ printf "nfs-server.%s.svc.cluster.local" .namespace }}
+    {{- end }}
+    - NFS_PATH={{ $nfs.nfs.path }}
+    - PROVISIONER_NAME={{ printf "%s-nfs-provisioner" .namespace }}
+{{- end }}
\ No newline at end of file
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index f14c7e11..b51aa02e 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -1,8 +1,32 @@
 version: '3.7'
 
 services:
+  traefik:
+    image: "traefik:v2.10"
+    container_name: "traefik"
+    networks:
+    - ch
+    command:
+      - "--log.level=INFO"
+      - "--api.insecure=true"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.web.address=:80"
+      - "--entrypoints.websecure.address=:443"
+      - "--providers.file.directory=/etc/traefik/dynamic_conf"
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "./certs/:/certs/:ro"
+      - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
+
 {{- range $app_name, $app_config := .Values.apps }}
   {{ $deployment :=  $app_config.harness.deployment }}
+  {{- if eq $app_name "nfsserver" }}
+  {{- include "events.deployment" $.Values}}
+  {{- end }}
   {{- if or (not $deployment.auto) (not $app_config.harness.service.auto) }}
   {{- continue }}
   {{- end}}
@@ -120,28 +144,11 @@ services:
     {{- include "deploy_utils.database.postgres" . }}
     {{- end }}
   {{- end}}
+
 {{- end }}
-  traefik:
-    image: "traefik:v2.10"
-    container_name: "traefik"
-    networks:
-    - ch
-    command:
-      - "--log.level=INFO"
-      - "--api.insecure=true"
-      - "--providers.docker=true"
-      - "--providers.docker.exposedbydefault=false"
-      - "--entrypoints.web.address=:80"
-      - "--entrypoints.websecure.address=:443"
-      - "--providers.file.directory=/etc/traefik/dynamic_conf"
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./certs/:/certs/:ro"
-      - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
 
+
+# Network definition
 networks:
   ch:
     name: ch_network

From 3868b56b476c97d0b3f2d84ea44c96f12339341a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 16 Feb 2024 07:04:48 -0600
Subject: [PATCH 031/210] CH-100 Refactor templates for the db

---
 .../compose/templates/auto-compose.yaml       | 35 ++-----------------
 .../templates/auto-database-postgres.yaml     | 10 +++---
 .../compose/templates/auto-database.yaml      | 32 +++++++++++++++++
 3 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 deployment-configuration/compose/templates/auto-database.yaml

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index b51aa02e..0ac27f32 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -25,7 +25,7 @@ services:
 {{- range $app_name, $app_config := .Values.apps }}
   {{ $deployment :=  $app_config.harness.deployment }}
   {{- if eq $app_name "nfsserver" }}
-  {{- include "events.deployment" $.Values}}
+  {{- include "events.deployment" $.Values | indent 2 }}
   {{- end }}
   {{- if or (not $deployment.auto) (not $app_config.harness.service.auto) }}
   {{- continue }}
@@ -113,41 +113,10 @@ services:
     {{- if not .auto }}
     {{- continue}}
     {{- end }}
-  # Database for {{ $app_name }}, type {{ .type }} named {{ .name }}
-  {{ .name }}:
-    {{- $db_infos := (get . .type) }}
-    networks:
-      ch:
-    image: {{ $db_infos.image }}
-    expose:
-    {{- range $port := $db_infos.ports }}
-    - {{ $port.port | quote }}
-    {{- end }}
-    {{- with .resources }}
-    deploy:
-      resources:
-        limits:
-          cpus: {{ .limits.cpu | default "1000m" }}
-          memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
-        reservations:
-          cpus: {{ .requests.cpu | default "100m" }}
-          memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
-    {{- end }}
-    volumes:
-      - type: volume
-        source: {{ .name }}
-        target: /data/db
-    {{- if eq .type "postgres" }}
-      - type: volume
-        source: dshm
-        target: /dev/shm
-    {{- include "deploy_utils.database.postgres" . }}
-    {{- end }}
+  {{- include "db.deployment" . | indent 2}}
   {{- end}}
-
 {{- end }}
 
-
 # Network definition
 networks:
   ch:
diff --git a/deployment-configuration/compose/templates/auto-database-postgres.yaml b/deployment-configuration/compose/templates/auto-database-postgres.yaml
index d832193f..b6db420c 100644
--- a/deployment-configuration/compose/templates/auto-database-postgres.yaml
+++ b/deployment-configuration/compose/templates/auto-database-postgres.yaml
@@ -1,7 +1,7 @@
 {{- define "deploy_utils.database.postgres" }}
-    environment:
-      - POSTGRES_DB={{ .postgres.initialdb | quote }}
-      - POSTGRES_USER={{ .user | quote }}
-      - POSTGRES_PASSWORD={{ .pass | quote }}
-      - PGDATA=/data/db/pgdata
+  environment:
+    - POSTGRES_DB={{ .postgres.initialdb }}
+    - POSTGRES_USER={{ .user }}
+    - POSTGRES_PASSWORD={{ .pass }}
+    - PGDATA=/data/db/pgdata
 {{- end }}
\ No newline at end of file
diff --git a/deployment-configuration/compose/templates/auto-database.yaml b/deployment-configuration/compose/templates/auto-database.yaml
new file mode 100644
index 00000000..70bda63a
--- /dev/null
+++ b/deployment-configuration/compose/templates/auto-database.yaml
@@ -0,0 +1,32 @@
+{{- define "db.deployment" }}
+# Database type {{ .type }} named {{ .name }}
+{{ .name }}:
+  {{- $db_infos := (get . .type) }}
+  networks:
+    ch:
+  image: {{ $db_infos.image }}
+  expose:
+  {{- range $port := $db_infos.ports }}
+    - {{ $port.port | quote }}
+  {{- end }}
+  {{- with .resources }}
+  deploy:
+    resources:
+      limits:
+        cpus: {{ .limits.cpu | default "1000m" }}
+        memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
+      reservations:
+        cpus: {{ .requests.cpu | default "100m" }}
+        memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
+  {{- end }}
+  volumes:
+    - type: volume
+      source: {{ .name }}
+      target: /data/db
+  {{- if eq .type "postgres" }}
+    - type: volume
+      source: dshm
+      target: /dev/shm
+  {{- include "deploy_utils.database.postgres" . }}
+  {{- end }}
+{{- end }}
\ No newline at end of file

From a0476d6cd29401a486e96d8654490e784bd0bcac Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 16 Feb 2024 07:13:09 -0600
Subject: [PATCH 032/210] CH-100 Add /etc/hosts generation

---
 .../compose/templates/auto-compose.yaml             | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 0ac27f32..04db3327 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -104,11 +104,22 @@ services:
     {{- with $app_config.harness.resources }}
     {{- range .}}
       - type: bind
-        source: compose/resources/{{ $app_name }}/{{.src }}
+        source: compose/resources/{{ $app_name }}/{{ .src }}
         target: {{ .dst }}
     {{- end }}
     {{- end}}
     {{- end }}
+  {{- if $.Values.local }}
+  {{- $domain := $.Values.domain }}
+  {{- $ip := $.Values.localIp }}
+  extra_hosts:
+    - "{{ $.Values.domain }}:{{ $ip }}"
+    {{- range $app := $.Values.apps }}
+    {{- with $app.harness.subdomain}}
+    - "{{ . }}.{{ $domain }}:{{ $ip }}"
+    {{- end }}
+    {{- end }}
+  {{- end }}
   {{- with $app_config.harness.database }}
     {{- if not .auto }}
     {{- continue}}

From bd3e423a08b34ece388d2cf175b9b6b270d4747a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 16 Feb 2024 07:27:20 -0600
Subject: [PATCH 033/210] CH-100 Add specific varenvs by container

---
 .../compose/templates/auto-compose.yaml               | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 04db3327..e05934b9 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -74,9 +74,13 @@ services:
       {{- range $.Values.env }}
       - {{ .name }}={{ .value }}
       {{- end }}
-      {{- /*{{- range $.Values.env }}
-      - {{ .name }}={{ .value }}
-      {{- end }} */}}
+      {{- with $.Values.apps.accounts }}
+      - CH_ACCOUNTS_CLIENT_SECRET={{ .client.secret }}
+      - CH_ACCOUNTS_REALM={{ $.Values.namespace }}
+      - CH_ACCOUNTS_AUTH_DOMAIN={{ printf "%s.%s" .harness.subdomain $.Values.domain }}
+      - CH_ACCOUNTS_CLIENT_ID={{ .client.id }}
+      - DOMAIN={{ $.Values.domain }}
+      {{- end}}
       {{- range $app_config.harness.env }}
       - {{ .name }}={{ .value }}
       {{- end }}
@@ -110,6 +114,7 @@ services:
     {{- end}}
     {{- end }}
   {{- if $.Values.local }}
+  # Extra /etc/hosts list
   {{- $domain := $.Values.domain }}
   {{- $ip := $.Values.localIp }}
   extra_hosts:

From 8851c48ef3777aef08144bcda1e309680cc878ca Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 20 Feb 2024 11:06:17 -0600
Subject: [PATCH 034/210] CH-100 Rename some templates

---
 .../nfsserver-deployment.yaml}                |  5 +-
 .../compose/templates/auto-compose.yaml       | 24 +++++-----
 .../ch_cli_tools/dockercompose.py             | 46 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 15 deletions(-)
 rename applications/{events/deploy/templates-compose/events-deployment.yaml => nfsserver/deploy/templates-compose/nfsserver-deployment.yaml} (74%)

diff --git a/applications/events/deploy/templates-compose/events-deployment.yaml b/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
similarity index 74%
rename from applications/events/deploy/templates-compose/events-deployment.yaml
rename to applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
index f16e7e38..2dd8509b 100644
--- a/applications/events/deploy/templates-compose/events-deployment.yaml
+++ b/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
@@ -1,7 +1,10 @@
-{{- define "events.deployment" }}
+{{- define "nfsserver.deployment" }}
 {{- $nfs := .apps.nfsserver}}
 
 {{ $nfs.name }}:
+  build:
+    context: {{ $nfs.build.context }}
+    dockerfile: {{ $nfs.build.dockerfile }}
   image: {{ $nfs.harness.deployment.image }}
   environment:
     # NFS useDNS? {{ $nfs.nfs.useDNS }}
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index e05934b9..f174d943 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -25,7 +25,7 @@ services:
 {{- range $app_name, $app_config := .Values.apps }}
   {{ $deployment :=  $app_config.harness.deployment }}
   {{- if eq $app_name "nfsserver" }}
-  {{- include "events.deployment" $.Values | indent 2 }}
+  {{- include "nfsserver.deployment" $.Values | indent 2 }}
   {{- end }}
   {{- if or (not $deployment.auto) (not $app_config.harness.service.auto) }}
   {{- continue }}
@@ -114,16 +114,16 @@ services:
     {{- end}}
     {{- end }}
   {{- if $.Values.local }}
-  # Extra /etc/hosts list
-  {{- $domain := $.Values.domain }}
-  {{- $ip := $.Values.localIp }}
-  extra_hosts:
-    - "{{ $.Values.domain }}:{{ $ip }}"
-    {{- range $app := $.Values.apps }}
-    {{- with $app.harness.subdomain}}
-    - "{{ . }}.{{ $domain }}:{{ $ip }}"
-    {{- end }}
-    {{- end }}
+    # Extra /etc/hosts list
+    {{- $domain := $.Values.domain }}
+    {{- $ip := $.Values.localIp }}
+    extra_hosts:
+      - "{{ $.Values.domain }}={{ $ip }}"
+      {{- range $app := $.Values.apps }}
+      {{- with $app.harness.subdomain}}
+      - "{{ . }}.{{ $domain }}={{ $ip }}"
+      {{- end }}
+      {{- end }}
   {{- end }}
   {{- with $app_config.harness.database }}
     {{- if not .auto }}
@@ -149,4 +149,4 @@ volumes:  # this inclusion needs to be conditional
   dshm:
   {{- end }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index dfe0bf5b..6563eac0 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -29,6 +29,7 @@
 KEY_DEPLOYMENT = 'deployment'
 KEY_APPS = 'apps'
 KEY_TASK_IMAGES = 'task-images'
+# KEY_TASK_IMAGES_BUILD = f"{KEY_TASK_IMAGES}-build"
 KEY_TEST_IMAGES = 'test-images'
 
 DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
@@ -180,6 +181,30 @@ def collect_app_values(self, app_base_path, base_image_name=None):
 
             app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
 
+            # dockerfile_path = next(app_path.rglob('**/Dockerfile'), None)
+            # # for dockerfile_path in app_path.rglob('**/Dockerfile'):
+            # #     parent_name = dockerfile_path.parent.name.replace("-", "_")
+            # #     if parent_name == app_key:
+            # #         app_values['build'] = {
+            # #             # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
+            # #             'dockerfile': "Dockerfile",
+            # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+            # #         }
+            # #     elif "tasks/" in f"{dockerfile_path}":
+            # #         parent_name = parent_name.upper()
+            # #         values.setdefault("task-images-build", {})[parent_name] = {
+            # #             'dockerfile': "Dockerfile",
+            # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+            # #         }
+            # #         import ipdb; ipdb.set_trace()  # fmt: skip
+
+            # if dockerfile_path:
+            #     app_values['build'] = {
+            #         # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
+            #         'dockerfile': "Dockerfile",
+            #         'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+            #     }
+
             values[app_key] = dict_merge(
                 values[app_key], app_values) if app_key in values else app_values
 
@@ -201,10 +226,15 @@ def __assign_static_build_dependencies(self, helm_values):
                 for dep in dependencies:
                     if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
                         helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
+                        # helm_values.setdefault(KEY_TASK_IMAGES_BUILD, {})[dep] = {
+                        #     'context': os.path.relpath(static_img_dockerfile, self.dest_deployment_path.parent),
+                        #     'dockerfile': 'Dockerfile',
+                        # }
 
         for image_name in helm_values[KEY_TASK_IMAGES].keys():
             if image_name in self.exclude:
                 del helm_values[KEY_TASK_IMAGES][image_name]
+                # del helm_values[KEY_TASK_IMAGES_BUILD][image_name]
 
     def __init_base_images(self, base_image_name):
 
@@ -501,8 +531,20 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
                 task_path, app_path.parent))
             img_name = image_name_from_dockerfile_path(task_name, base_image_name)
 
-            values[KEY_TASK_IMAGES][task_name] = self.image_tag(
-                img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys())
+            # import ipdb; ipdb.set_trace()  # fmt: skip
+
+            # values[KEY_TASK_IMAGES][task_name] = self.image_tag(
+            #     img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys())
+            # values.setdefault(KEY_TASK_IMAGES_BUILD, {})[task_name] = {
+            #     'context': os.path.relpath(task_path, self.dest_deployment_path.parent),
+            #     'dockerfile': 'Dockerfile',
+            # }
+
+            values[KEY_TASK_IMAGES][task_name] = {
+                'name': self.image_tag(img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys()),
+                # 'context': os.path.relpath(task_path, self.dest_deployment_path.parent),
+                # 'dockerfile': 'Dockerfile',
+            }
 
         return values
 

From ced7cd2b189c2e40ab3f77e95fb3437eb5fa909a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 20 Feb 2024 11:28:00 -0600
Subject: [PATCH 035/210] CH-100 Add first traeffik configuration

---
 .../templates-compose/nfsserver-deployment.yaml      |  3 ---
 .../compose/templates/auto-compose.yaml              |  9 +++++++++
 .../ch_cli_tools/dockercompose.py                    | 12 +++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml b/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
index 2dd8509b..7e9b6819 100644
--- a/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
+++ b/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
@@ -2,9 +2,6 @@
 {{- $nfs := .apps.nfsserver}}
 
 {{ $nfs.name }}:
-  build:
-    context: {{ $nfs.build.context }}
-    dockerfile: {{ $nfs.build.dockerfile }}
   image: {{ $nfs.harness.deployment.image }}
   environment:
     # NFS useDNS? {{ $nfs.nfs.useDNS }}
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index f174d943..11996c91 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -125,6 +125,15 @@ services:
       {{- end }}
       {{- end }}
   {{- end }}
+  labels:
+      - "traefik.enable=true"
+      {{- with $app_config.harness.service.port }}
+      - "traefik.http.services.{{ $app_name }}.loadbalancer.server.port={{ . }}"
+      {{- end }}
+      # - "traefik.http.middlewares.redirect-middleware.redirectscheme.scheme=https"
+      # - "traefik.http.routers.{{ .app_name }}.middlewares=redirect-middleware"
+      - "traefik.http.routers.{{ $app_name }}.rule=Host(`{{ $app_config.harness.subdomain }}.{{ $.Values.domain }}`)"
+      - "traefik.http.routers.{{ $app_name }}.entrypoints=web"
   {{- with $app_config.harness.database }}
     {{- if not .auto }}
     {{- continue}}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 6563eac0..83e04024 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -540,11 +540,13 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
             #     'dockerfile': 'Dockerfile',
             # }
 
-            values[KEY_TASK_IMAGES][task_name] = {
-                'name': self.image_tag(img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys()),
-                # 'context': os.path.relpath(task_path, self.dest_deployment_path.parent),
-                # 'dockerfile': 'Dockerfile',
-            }
+            # values[KEY_TASK_IMAGES][task_name] = {
+            #     'name': self.image_tag(img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys()),
+            #     # 'context': os.path.relpath(task_path, self.dest_deployment_path.parent),
+            #     # 'dockerfile': 'Dockerfile',
+            # }
+
+            values[KEY_TASK_IMAGES][task_name] = self.image_tag(img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys())
 
         return values
 

From f7ebeb03606302e9ffc56bf010ad49ad36cf428b Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 20 Feb 2024 11:40:27 -0600
Subject: [PATCH 036/210] CH-100 Fix bad indentation in docker-compose.yaml

---
 deployment-configuration/compose/templates/auto-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 11996c91..b175f2b5 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -125,7 +125,7 @@ services:
       {{- end }}
       {{- end }}
   {{- end }}
-  labels:
+    labels:
       - "traefik.enable=true"
       {{- with $app_config.harness.service.port }}
       - "traefik.http.services.{{ $app_name }}.loadbalancer.server.port={{ . }}"

From 8fdcba6e840340b4a347eb6ec00c61c0547ee645 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 20 Feb 2024 11:41:41 -0600
Subject: [PATCH 037/210] CH-100 Remove exposition of ports

---
 .../compose/templates/auto-compose.yaml                   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index b175f2b5..f25f558e 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -46,10 +46,10 @@ services:
     image: {{ . }}
     {{- end }}
     {{- if eq $.Values.mainapp $app_name }}
-    {{- with $app_config.harness.service.port }}
-    ports:
-      - "{{ . }}:{{ $app_config.harness.deployment.port }}"
-    {{- end }}
+    # {{- with $app_config.harness.service.port }}
+    # ports:
+    #   - "{{ . }}:{{ $app_config.harness.deployment.port }}"
+    # {{- end }}
     {{- end }}
     {{- with $app_config.harness.deployment.port }}
     expose:

From 428a6191b0ec0fd5a09a59082b2d376785967328 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 21 Feb 2024 06:48:39 -0600
Subject: [PATCH 038/210] CH-100 Add post-process mechanism to generate files

---
 .../ch_cli_tools/dockercompose.py             | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 83e04024..c088dc44 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -155,6 +155,32 @@ def generate_docker_compose_yaml(self):
 
         subprocess.call(command, shell=True)
 
+        self.__post_process_multiple_document_docker_compose(dest_compose_yaml)
+
+    def __post_process_multiple_document_docker_compose(self, yaml_document):
+        if not yaml_document.exists():
+            logging.warning("Something went wrong during the docker-compose.yaml generation, cannot post-process it")
+            return
+
+        with open(yaml_document, "r") as f:
+            documents = yaml.safe_load_all(f)
+
+            for document in documents:
+                if "cloudharness-metadata" in document:
+                    document_path = self.dest_deployment_path / document["cloudharness-metadata"]["path"]
+                    logging.info("Post-process docker-compose.yaml, creating %s", document_path)
+                    document_path.write_text(document["data"])
+                else:
+                    with open(yaml_document, "w") as f:
+                        yaml.dump(document, f)
+
+            # cloudharness-metadata:
+            #     path: secrets.yaml
+
+            # data: |
+            #     sdfmsldkf
+            #     sdfmlskdfmslkdfs
+            #     sdmlksdf
 
     def __process_applications(self, helm_values, base_image_name):
         for root_path in self.root_paths:

From 9d6c8b2f015c5269cb44dd27c9ae96038a39b46e Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 21 Feb 2024 08:12:00 -0600
Subject: [PATCH 039/210] CH-100 Add new templates

---
 .../deploy/templates-compose/deployments.yaml | 97 +++++++++++++++++++
 .../compose/templates/allvalues-template.yaml | 20 ++++
 2 files changed, 117 insertions(+)
 create mode 100644 applications/events/deploy/templates-compose/deployments.yaml
 create mode 100644 deployment-configuration/compose/templates/allvalues-template.yaml

diff --git a/applications/events/deploy/templates-compose/deployments.yaml b/applications/events/deploy/templates-compose/deployments.yaml
new file mode 100644
index 00000000..0001fde4
--- /dev/null
+++ b/applications/events/deploy/templates-compose/deployments.yaml
@@ -0,0 +1,97 @@
+{{- define "events.deployment" }}
+events:
+  networks:
+    - ch
+  image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+  ports:
+    - "9094:9092"
+  expose:
+    - 5555
+    - 9094
+    - 9092
+  environment:
+    - CLASSPATH=/opt/kafka/libs/extensions/*
+    - KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:/etc/kafka/log4j.properties
+    - JMX_PORT=5555
+  command:
+    - "./bin/kafka-server-start.sh"
+    - "/etc/kafka/server.properties"
+    - "--override"
+    - "default.replication.factor=1"
+    - "--override"
+    - "min.insync.replicas=1"
+    - "--override"
+    - "offsets.topic.replication.factor=1"
+    - "--override"
+    - "offsets.topic.num.partitions=1"
+  depends_on:
+    events-kafka-init:
+      condition: service_completed_successfully
+
+events-kafka-init:
+  networks:
+    - ch
+  image: solsson/kafka-initutils@sha256:f6d9850c6c3ad5ecc35e717308fddb47daffbde18eb93e98e031128fe8b899ef
+  command:
+    - "/bin/bash"
+    - "/etc/kafka-configmap/init.sh"
+  environment:
+
+pzoo:
+  networks:
+    - ch
+  expose:
+    - 2181
+    - 2888
+    - 3888
+  image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+  command:
+    - "./bin/zookeeper-server-start.sh"
+    - "/etc/kafka/zookeeper.properties"
+  environment:
+    - KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:/etc/kafka/log4j.properties
+  depends_on:
+    events-pzoo-init:
+      condition: service_completed_successfully
+
+events-pzoo-init:
+  networks:
+    - ch
+  expose:
+  image: solsson/kafka-initutils@sha256:f6d9850c6c3ad5ecc35e717308fddb47daffbde18eb93e98e031128fe8b899ef
+  command:
+    - "/bin/bash"
+    - "/etc/kafka-configmap/init.sh"
+  environment:
+    - PZOO_REPLICAS=1
+    - ZOO_REPLICAS=0
+
+zoo:
+  networks:
+    - ch
+  expose:
+    - 2181
+    - 2888
+    - 3888
+  image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+  command:
+    - "./bin/zookeeper-server-start.sh"
+    - "/etc/kafka/zookeeper.properties"
+  environment:
+    - KAFKA_LOG4J_OPTS=-Dlog4j.configuration=file:/etc/kafka/log4j.properties
+  depends_on:
+    events-zoo-init:
+      condition: service_completed_successfully
+
+events-zoo-init:
+  networks:
+    - ch
+  image: solsson/kafka-initutils@sha256:f6d9850c6c3ad5ecc35e717308fddb47daffbde18eb93e98e031128fe8b899ef
+  command:
+    - "/bin/bash"
+    - "/etc/kafka-configmap/init.sh"
+  environment:
+    - PZOO_REPLICAS=1
+    - ZOO_REPLICAS=0
+    - ID_OFFSET=2
+{{- end }}
\ No newline at end of file
diff --git a/deployment-configuration/compose/templates/allvalues-template.yaml b/deployment-configuration/compose/templates/allvalues-template.yaml
new file mode 100644
index 00000000..d69538aa
--- /dev/null
+++ b/deployment-configuration/compose/templates/allvalues-template.yaml
@@ -0,0 +1,20 @@
+{{- /*
+to replace the secrets values we create a dict with the structure:
+  app:
+    <app>:
+      harness:
+        secrets:
+
+thus with an empty secrets node
+and then it's mergeOverwrite the copy of the .Values we created
+resulting in a copy of the .Values with all secrets being ""
+*/ -}}
+cloudharness-metadata:
+  path: allvalues2.yaml
+data: |
+{{- $values_copy := deepCopy .Values }}
+{{- range $key, $val := .Values.apps }}
+  {{- $new_secrets := dict "apps" (dict $key (dict "harness" (dict "secrets"))) }}
+  {{- $tmp := mergeOverwrite $values_copy $new_secrets }}
+{{- end }}
+{{ $values_copy | toYaml | indent 4 }}

From ae7cf1918e0d2d370eabdf2ceb5b7c1db3de43cf Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 21 Feb 2024 10:33:20 -0600
Subject: [PATCH 040/210] CH-100 Add new templates (not modified yet)

---
 .../compose/templates/auto-gatekeepers.yaml   | 174 ++++++++++++++++++
 .../compose/templates/auto-secrets.yaml       |  50 +++++
 .../ch_cli_tools/dockercompose.py             |  19 +-
 3 files changed, 233 insertions(+), 10 deletions(-)
 create mode 100644 deployment-configuration/compose/templates/auto-gatekeepers.yaml
 create mode 100644 deployment-configuration/compose/templates/auto-secrets.yaml

diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
new file mode 100644
index 00000000..898995cd
--- /dev/null
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -0,0 +1,174 @@
+{{/* Secured Services/Deployments */}}
+{{- define "deploy_utils.securedservice" }}
+{{- $tls := not (not .root.Values.tls) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .app.harness.service.name }}-gk"
+  labels:
+    app: "{{ .app.harness.service.name }}-gk"
+data:
+  proxy.yml: |-
+    verbose: {{ .root.Values.debug }}
+    discovery-url: {{ ternary "https" "http" $tls}}://{{ .root.Values.apps.accounts.harness.subdomain }}.{{ .root.Values.domain }}/auth/realms/{{ .root.Values.namespace }}
+    client-id: {{ .root.Values.apps.accounts.webclient.id | quote }}
+    client-secret: {{ .root.Values.apps.accounts.webclient.secret }}
+    secure-cookie: {{ $tls }}
+    forbidden-page: /templates/access-denied.html.tmpl
+    enable-default-deny:  {{ eq (.app.harness.secured | toString) "true" }}
+    listen: 0.0.0.0:8080
+    enable-refresh-tokens: true
+    server-write-timeout: {{ .app.harness.proxy.timeout.send | default .root.Values.proxy.timeout.send | default 180 }}s
+    upstream-timeout: {{ .app.harness.proxy.timeout.read | default .root.Values.proxy.timeout.read | default 180 }}s
+    upstream-response-header-timeout:   {{ .app.harness.proxy.timeout.read | default .root.Values.proxy.timeout.read | default 180 }}s
+    upstream-expect-continue-timeout:  {{ .app.harness.proxy.timeout.read | default .root.Values.proxy.timeout.read | default 180 }}s
+    server-read-timeout:  {{ .app.harness.proxy.timeout.read | default .root.Values.proxy.timeout.read | default 180 }}s
+    upstream-keepalive-timeout:  {{ .app.harness.proxy.timeout.keepalive | default .root.Values.proxy.timeout.keepalive | default 180 }}s
+    http-only-cookie: false
+    tls-cert:
+    tls-private-key:
+    redirection-url: {{ ternary "https" "http" $tls }}://{{ .app.harness.subdomain }}.{{ .root.Values.domain }}
+    encryption-key: AgXa7xRcoClDEU0ZDSH4X0XhL5Qy2Z2j
+    upstream-url: http://{{ .app.harness.service.name }}.{{ .app.namespace | default .root.Release.Namespace }}:{{ .app.harness.service.port | default 80}}
+    {{ if .app.harness.secured }}
+      {{ with .app.harness.uri_role_mapping }}
+    resources:
+    {{. | toYaml | nindent 4 }}
+      {{- end }}
+    {{- end }}
+    {{ if or .root.Values.local (not $tls) }}
+    skip-openid-provider-tls-verify: true
+    skip-upstream-tls-verify: true
+    {{- end }}
+  cacert.crt: {{ .files.Get "resources/certs/cacert.crt" | quote }}
+  access-denied.html.tmpl: |-
+    <!DOCTYPE html>
+    <html>
+    <head>
+      <meta charset="UTF-8">
+      <title>403 - Access Forbidden</title>
+      <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+      <script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
+      <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+      <style>
+        .oops {
+          font-size: 9em;
+          letter-spacing: 2px;
+        }
+        .message {
+          font-size: 3em;
+        }
+      </style>
+    </head>
+    <body>
+      <div class="container text-center">
+        <div class="row vcenter" style="margin-top: 20%;">
+          <div class="col-md-12">
+            <div class="error-template">
+              <h1 class="oops">Oops!</h1>
+              <h2 class="message">403 Permission Denied</h2>
+              <div class="error-details">
+                Sorry, you do not have access to this page, please contact your administrator.
+                If you have been assigned new authorizations, try to refresh the page or to <a href="/oauth/logout?redirect=/">login again</a>.
+              </div>
+            </div>
+          </div>
+        </div>
+    </div>
+
+    </body>
+    </html>
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .app.harness.service.name }}-gk"
+  labels:
+    app: "{{ .app.harness.service.name }}-gk"
+spec:
+  ports:
+  - name: http
+    port: 8080
+  selector:
+    app: "{{ .app.harness.service.name }}-gk"
+  type: ClusterIP
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "{{ .app.harness.service.name }}-gk"
+  labels:
+    app: "{{ .app.harness.service.name }}-gk"
+  
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: "{{ .app.harness.service.name }}-gk"
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ .app.harness.uri_role_mapping | toString | sha256sum }}
+      labels:
+        app: "{{ .app.harness.service.name }}-gk"
+    spec:
+{{ include "deploy_utils.etcHosts" .root | indent 6 }}
+      containers:
+      - name: {{ .app.harness.service.name | quote }}
+        image: "quay.io/gogatekeeper/gatekeeper:1.3.8"
+        imagePullPolicy: IfNotPresent
+        {{ if .root.Values.local }}
+        securityContext:
+          allowPrivilegeEscalation: false
+          runAsUser: 0
+        {{- end }}
+        env:
+        - name: PROXY_CONFIG_FILE
+          value: /opt/proxy.yml
+        volumeMounts:
+        - name: "{{ .app.harness.service.name }}-gk-proxy-config"
+          mountPath: /opt/proxy.yml
+          subPath: proxy.yml
+        - name: "{{ .app.harness.service.name }}-gk-proxy-config"
+          mountPath: /etc/pki/ca-trust/source/anchors/cacert.crt
+          subPath: cacert.crt
+        - name: "{{ .app.harness.service.name }}-gk-proxy-config"
+          mountPath: /templates/access-denied.html.tmpl
+          subPath: access-denied.html.tmpl
+        ports:
+        - name: http
+          containerPort: 8080
+        - name: https
+          containerPort: 8443
+        resources:
+          requests:
+            memory: "32Mi"
+            cpu: "50m"
+          limits:
+            memory: "64Mi"
+            cpu: "100m"
+      volumes:
+      - name: "{{ .app.harness.service.name }}-gk-proxy-config"
+        configMap:
+          name: "{{ .app.harness.service.name }}-gk"
+---
+{{- end }}
+{{- if .Values.secured_gatekeepers }}
+{{ $files := .Files }}
+{{- range $app := .Values.apps }}
+  {{- if and (hasKey $app "port") ($app.harness.secured)   }}
+---
+    {{ include "deploy_utils.securedservice" (dict "root" $ "app" $app "files" $files) }}
+    {{- end }}
+  {{- range $subapp := $app }}
+  {{- if contains "map" (typeOf $subapp)  }}
+    {{- if and (hasKey $subapp "harness.port") (hasKey $subapp "harness.secured") }}
+      {{- if $subapp.harness.secured }}
+---
+      {{ include "deploy_utils.securedservice" (dict "root" $ "app" $subapp "files" $files) }}
+    {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+ {{- end }}
+{{- end }}
diff --git a/deployment-configuration/compose/templates/auto-secrets.yaml b/deployment-configuration/compose/templates/auto-secrets.yaml
new file mode 100644
index 00000000..a0a37a2f
--- /dev/null
+++ b/deployment-configuration/compose/templates/auto-secrets.yaml
@@ -0,0 +1,50 @@
+{{- define "deploy_utils.secret" }}
+{{- if .app.harness.secrets }}
+{{- $secret_name := printf "%s" .app.harness.deployment.name }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $secret_name }}
+  namespace: {{ .root.Values.namespace }}
+  labels:
+    app: {{ .app.harness.deployment.name }}
+type: Opaque
+  {{- $secret := (lookup "v1" "Secret" .root.Values.namespace $secret_name) }}
+  {{- if $secret }}
+# secret already exists
+    {{- if not (compact (values .app.harness.secrets)) }}
+# secret values are null, copy from the existing secret
+data:
+      {{- range $k, $v := $secret.data }}
+  {{ $k }}: {{ $v }}
+      {{- end }}
+    {{- else }}
+# there are non default values in values.yaml, use these
+stringData:
+      {{- range $k, $v := .app.harness.secrets }}
+  {{ $k }}: {{ $v | default (randAlphaNum 20) }}
+      {{- end }}
+    {{- end }}
+  {{- else }}
+# secret doesn't exist
+stringData:
+    {{- range $k, $v := .app.harness.secrets }}
+  {{ $k }}: {{ $v | default (randAlphaNum 20) }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+---
+{{- end }}
+---
+{{- range $app := .Values.apps }}
+---
+  {{- include "deploy_utils.secret" (dict "root" $ "app" $app) }}
+  {{- range $subapp := $app }}
+  {{- if contains "map" (typeOf $subapp)  }}
+    {{- if hasKey $subapp "harness" }}
+---
+      {{- include "deploy_utils.secret" (dict "root" $ "app" $subapp) }}
+    {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index c088dc44..d5d51a6f 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -166,21 +166,20 @@ def __post_process_multiple_document_docker_compose(self, yaml_document):
             documents = yaml.safe_load_all(f)
 
             for document in documents:
+                if not document:
+                    continue
                 if "cloudharness-metadata" in document:
                     document_path = self.dest_deployment_path / document["cloudharness-metadata"]["path"]
                     logging.info("Post-process docker-compose.yaml, creating %s", document_path)
-                    document_path.write_text(document["data"])
+                    data = document["data"]
+                    # if document_path.suffix == ".yaml":
+                    #     with open(document_path, "w") as f:
+                    #         yaml.dump(yaml.safe_load(data), f, default_flow_style=True)
+                    # else:
+                    document_path.write_text(data)
                 else:
                     with open(yaml_document, "w") as f:
-                        yaml.dump(document, f)
-
-            # cloudharness-metadata:
-            #     path: secrets.yaml
-
-            # data: |
-            #     sdfmsldkf
-            #     sdfmlskdfmslkdfs
-            #     sdmlksdf
+                        yaml.dump(document, f, default_flow_style=False)
 
     def __process_applications(self, helm_values, base_image_name):
         for root_path in self.root_paths:

From 7acc7f5eade36af4f859f8b6686444b0d9ed65d6 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 22 Feb 2024 08:21:00 -0600
Subject: [PATCH 041/210] CH-100 Add generation of resources files

---
 .../compose/templates/auto-compose.yaml        |  2 +-
 .../compose/templates/auto-resources.yaml      | 18 ++++++++++++++++++
 .../compose/templates/auto-secrets.yaml        |  3 ++-
 .../ch_cli_tools/dockercompose.py              | 12 ++++++++++--
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 deployment-configuration/compose/templates/auto-resources.yaml

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index f25f558e..9a0f4fd9 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -108,7 +108,7 @@ services:
     {{- with $app_config.harness.resources }}
     {{- range .}}
       - type: bind
-        source: compose/resources/{{ $app_name }}/{{ .src }}
+        source: compose/resources/generated/{{ $app_name }}/{{ .src }}
         target: {{ .dst }}
     {{- end }}
     {{- end}}
diff --git a/deployment-configuration/compose/templates/auto-resources.yaml b/deployment-configuration/compose/templates/auto-resources.yaml
new file mode 100644
index 00000000..8d1e1e73
--- /dev/null
+++ b/deployment-configuration/compose/templates/auto-resources.yaml
@@ -0,0 +1,18 @@
+{{- define "deploy_utils.resource"}}
+{{ $service_name := .app.harness.deployment.name }}
+---
+# {{ $service_name }}-{{ .resource.name }}
+cloudharness-metadata:
+  path: resources/generated/{{ $service_name  }}/{{ base .resource.src }}
+data: |
+{{ tpl (.root.Files.Get (print "resources/" $service_name "/" .resource.src)) .root | trim | indent 2 }}
+{{- end}}
+
+{{- range $app := .Values.apps }}
+  {{- if and (hasKey $app "port") $app.harness.deployment.auto | default false  }}
+---
+    {{- range $resource := $app.harness.resources }}
+    {{- include "deploy_utils.resource" (dict "app" $app "resource" $resource "root" $) }}
+    {{- end }}
+  {{- end }}
+ {{- end }}
\ No newline at end of file
diff --git a/deployment-configuration/compose/templates/auto-secrets.yaml b/deployment-configuration/compose/templates/auto-secrets.yaml
index a0a37a2f..9635d33a 100644
--- a/deployment-configuration/compose/templates/auto-secrets.yaml
+++ b/deployment-configuration/compose/templates/auto-secrets.yaml
@@ -1,5 +1,6 @@
 {{- define "deploy_utils.secret" }}
-{{- if .app.harness.secrets }}
+{{- if and .app.harness.secrets false }}  {{/* TODO */}}
+
 {{- $secret_name := printf "%s" .app.harness.deployment.name }}
 apiVersion: v1
 kind: Secret
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index d5d51a6f..c28eb2b7 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -165,21 +165,29 @@ def __post_process_multiple_document_docker_compose(self, yaml_document):
         with open(yaml_document, "r") as f:
             documents = yaml.safe_load_all(f)
 
+            main_document = None
             for document in documents:
                 if not document:
                     continue
                 if "cloudharness-metadata" in document:
                     document_path = self.dest_deployment_path / document["cloudharness-metadata"]["path"]
                     logging.info("Post-process docker-compose.yaml, creating %s", document_path)
+                    document_path.parent.mkdir(parents=True, exist_ok=True)
                     data = document["data"]
                     # if document_path.suffix == ".yaml":
                     #     with open(document_path, "w") as f:
                     #         yaml.dump(yaml.safe_load(data), f, default_flow_style=True)
                     # else:
+
                     document_path.write_text(data)
                 else:
-                    with open(yaml_document, "w") as f:
-                        yaml.dump(document, f, default_flow_style=False)
+                    # We need to save the main document later
+                    # "safe_load_all" returns a generator over the file,
+                    # so if we modify it while looping on "documents"
+                    # the output will be affected (probably truncated for some outputs)
+                    main_document = document  # we need to save the main document later,
+            with open(yaml_document, "w") as f:
+                yaml.dump(main_document, f, default_flow_style=False)
 
     def __process_applications(self, helm_values, base_image_name):
         for root_path in self.root_paths:

From 571c2ab494bd2207f500ae78a5738f77ec49b719 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 22 Feb 2024 09:12:20 -0600
Subject: [PATCH 042/210] CH-100 Add dependency between service and db

---
 deployment-configuration/compose/templates/auto-compose.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 9a0f4fd9..abfdb2c6 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -135,6 +135,8 @@ services:
       - "traefik.http.routers.{{ $app_name }}.rule=Host(`{{ $app_config.harness.subdomain }}.{{ $.Values.domain }}`)"
       - "traefik.http.routers.{{ $app_name }}.entrypoints=web"
   {{- with $app_config.harness.database }}
+    depends_on:
+      - {{ .name }}
     {{- if not .auto }}
     {{- continue}}
     {{- end }}

From 9c8c19ee7b7b79080e1ceb5c87979c363855f5ba Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 23 Feb 2024 06:00:47 -0600
Subject: [PATCH 043/210] CH-100 Add secret handling

---
 .../compose/templates/auto-compose.yaml       |  3 ++
 .../compose/templates/auto-secrets.yaml       | 32 +++++++++----------
 deployment/sc.yaml                            |  7 ----
 3 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100644 deployment/sc.yaml

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index abfdb2c6..120b8fa9 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -99,6 +99,9 @@ services:
     {{- end }}
     volumes:
       - ./compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
+    {{- range $file_name, $_ := $app_config.harness.secrets }}
+      - ./compose/resources/generated/auth/{{ $file_name }}:/opt/cloudharness/resources/auth/{{ $file_name }}
+    {{- end }}
     {{- if or $deployment.volume $app_config.harness.resources }}
     {{- with $deployment.volume }}
       - type: volume
diff --git a/deployment-configuration/compose/templates/auto-secrets.yaml b/deployment-configuration/compose/templates/auto-secrets.yaml
index 9635d33a..ed9345d2 100644
--- a/deployment-configuration/compose/templates/auto-secrets.yaml
+++ b/deployment-configuration/compose/templates/auto-secrets.yaml
@@ -1,49 +1,47 @@
 {{- define "deploy_utils.secret" }}
-{{- if and .app.harness.secrets false }}  {{/* TODO */}}
+{{- if .app.harness.secrets }}
 
 {{- $secret_name := printf "%s" .app.harness.deployment.name }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ $secret_name }}
-  namespace: {{ .root.Values.namespace }}
-  labels:
-    app: {{ .app.harness.deployment.name }}
-type: Opaque
   {{- $secret := (lookup "v1" "Secret" .root.Values.namespace $secret_name) }}
   {{- if $secret }}
 # secret already exists
     {{- if not (compact (values .app.harness.secrets)) }}
 # secret values are null, copy from the existing secret
-data:
       {{- range $k, $v := $secret.data }}
-  {{ $k }}: {{ $v }}
+cloudharness-metadata:
+  path: resources/generated/auth/{{ $k }}
+
+data: {{ $v }}
+---
       {{- end }}
     {{- else }}
 # there are non default values in values.yaml, use these
 stringData:
       {{- range $k, $v := .app.harness.secrets }}
-  {{ $k }}: {{ $v | default (randAlphaNum 20) }}
+cloudharness-metadata:
+  path: resources/generated/auth/{{ $k }}
+
+data: {{ $v | default (randAlphaNum 20) }}
+---
       {{- end }}
     {{- end }}
   {{- else }}
 # secret doesn't exist
 stringData:
     {{- range $k, $v := .app.harness.secrets }}
-  {{ $k }}: {{ $v | default (randAlphaNum 20) }}
+cloudharness-metadata:
+  path: resources/generated/auth/{{ $k }}
+data: {{ $v | default (randAlphaNum 20) }}
+---
     {{- end }}
   {{- end }}
 {{- end }}
----
 {{- end }}
----
 {{- range $app := .Values.apps }}
----
   {{- include "deploy_utils.secret" (dict "root" $ "app" $app) }}
   {{- range $subapp := $app }}
   {{- if contains "map" (typeOf $subapp)  }}
     {{- if hasKey $subapp "harness" }}
----
       {{- include "deploy_utils.secret" (dict "root" $ "app" $subapp) }}
     {{- end }}
   {{- end }}
diff --git a/deployment/sc.yaml b/deployment/sc.yaml
deleted file mode 100644
index 69c99d99..00000000
--- a/deployment/sc.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: standard
-provisioner: docker.io/hostpath
-reclaimPolicy: Delete
-volumeBindingMode: Immediate
\ No newline at end of file

From f6d0c6763b2378ff5cfe331d019dfa735bf61f2a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 23 Feb 2024 06:25:39 -0600
Subject: [PATCH 044/210] CH-100 Remove argo from dependencies

---
 .../compose/templates/auto-compose.yaml                    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 120b8fa9..b28fbc88 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -91,7 +91,10 @@ services:
       - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
       {{- end }}
     {{- end }}
-    {{- with $app_config.harness.dependencies.hard }}
+    {{/* Takes the hard deps, removes argo and adds the db if there is one */}}
+    {{/* To be sure to add the db properly, we "dig" the "harness" config for "database.name" and return "" if one of the keys doesn't exist */}}
+    {{/* "compact" in the beginning is to remove empty values */}}
+    {{- with compact (append (without $app_config.harness.dependencies.hard "argo") (dig "database" "name" "" $app_config.harness) ) }}
     depends_on:
       {{- range . }}
       - {{ . }}
@@ -138,8 +141,6 @@ services:
       - "traefik.http.routers.{{ $app_name }}.rule=Host(`{{ $app_config.harness.subdomain }}.{{ $.Values.domain }}`)"
       - "traefik.http.routers.{{ $app_name }}.entrypoints=web"
   {{- with $app_config.harness.database }}
-    depends_on:
-      - {{ .name }}
     {{- if not .auto }}
     {{- continue}}
     {{- end }}

From 4fd6deeb480add6f99fbc30223d1af8353a9288a Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 23 Feb 2024 06:41:41 -0600
Subject: [PATCH 045/210] CH-100 Change from pyyaml to ruamel

The dependency is already gathered from a third-party lib
---
 .../ch_cli_tools/dockercompose.py             | 45 +++++++++----------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index c28eb2b7..bafe5a00 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -2,6 +2,7 @@
 Utilities to create a helm chart from a CloudHarness directory structure
 """
 import yaml
+from ruamel.yaml import YAML
 import os
 import shutil
 import logging
@@ -162,32 +163,26 @@ def __post_process_multiple_document_docker_compose(self, yaml_document):
             logging.warning("Something went wrong during the docker-compose.yaml generation, cannot post-process it")
             return
 
-        with open(yaml_document, "r") as f:
-            documents = yaml.safe_load_all(f)
+        yaml_handler = YAML()
+        documents = yaml_handler.load_all(yaml_document)
 
-            main_document = None
-            for document in documents:
-                if not document:
-                    continue
-                if "cloudharness-metadata" in document:
-                    document_path = self.dest_deployment_path / document["cloudharness-metadata"]["path"]
-                    logging.info("Post-process docker-compose.yaml, creating %s", document_path)
-                    document_path.parent.mkdir(parents=True, exist_ok=True)
-                    data = document["data"]
-                    # if document_path.suffix == ".yaml":
-                    #     with open(document_path, "w") as f:
-                    #         yaml.dump(yaml.safe_load(data), f, default_flow_style=True)
-                    # else:
-
-                    document_path.write_text(data)
-                else:
-                    # We need to save the main document later
-                    # "safe_load_all" returns a generator over the file,
-                    # so if we modify it while looping on "documents"
-                    # the output will be affected (probably truncated for some outputs)
-                    main_document = document  # we need to save the main document later,
-            with open(yaml_document, "w") as f:
-                yaml.dump(main_document, f, default_flow_style=False)
+        main_document = None
+        for document in documents:
+            if not document:
+                continue
+            if "cloudharness-metadata" in document:
+                document_path = self.dest_deployment_path / document["cloudharness-metadata"]["path"]
+                logging.info("Post-process docker-compose.yaml, creating %s", document_path)
+                document_path.parent.mkdir(parents=True, exist_ok=True)
+                data = document["data"]
+                document_path.write_text(data)
+            else:
+                # We need to save the main document later
+                # "load_all" returns a generator over the file,
+                # so if we modify it while looping on "documents"
+                # the output will be affected (probably truncated for some outputs)
+                main_document = document  # we need to save the main document later
+        yaml_handler.dump(main_document, yaml_document)
 
     def __process_applications(self, helm_values, base_image_name):
         for root_path in self.root_paths:

From 86c0e4f51c4c4a56a4b59e148f1c1454675286ec Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 23 Feb 2024 06:42:24 -0600
Subject: [PATCH 046/210] CH-100 Remove tmp "events" from deps

---
 deployment-configuration/compose/templates/auto-compose.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index b28fbc88..8fc62e83 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -88,7 +88,11 @@ services:
     links:
       {{- range . }}
       {{- $service_name := (get $.Values.apps .).harness.service.name }}
+        {{- if eq . "events"}}
+#     - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
+        {{- else }}
       - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
+        {{- end }}
       {{- end }}
     {{- end }}
     {{/* Takes the hard deps, removes argo and adds the db if there is one */}}

From a5909cea41d1af911c025c29711adb73fb299ed4 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 23 Feb 2024 06:46:25 -0600
Subject: [PATCH 047/210] CH-100 Add back sc.yaml

---
 deployment/sc.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 deployment/sc.yaml

diff --git a/deployment/sc.yaml b/deployment/sc.yaml
new file mode 100644
index 00000000..69c99d99
--- /dev/null
+++ b/deployment/sc.yaml
@@ -0,0 +1,7 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: standard
+provisioner: docker.io/hostpath
+reclaimPolicy: Delete
+volumeBindingMode: Immediate
\ No newline at end of file

From 4379252dd0bea6e6b4ad4d66f671e075fca598f9 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 23 Feb 2024 07:46:38 -0600
Subject: [PATCH 048/210] CH-100 Add first handling of NFS volume

---
 .../nfsserver-deployment.yaml                  | 18 ++++++++++++------
 .../compose/templates/auto-compose.yaml        |  7 +++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml b/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
index 7e9b6819..50dc08ed 100644
--- a/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
+++ b/applications/nfsserver/deploy/templates-compose/nfsserver-deployment.yaml
@@ -1,13 +1,19 @@
 {{- define "nfsserver.deployment" }}
-{{- $nfs := .apps.nfsserver}}
+{{- with .apps.nfsserver}}
 
-{{ $nfs.name }}:
-  image: {{ $nfs.harness.deployment.image }}
+{{ .name }}:
+  image: {{ .harness.deployment.image }}
   environment:
-    # NFS useDNS? {{ $nfs.nfs.useDNS }}
-    {{- if $nfs.nfs.useDNS }}
+    # NFS useDNS? {{ .nfs.useDNS }}
+    {{- if .nfs.useDNS }}
     - NFS_SERVER={{ printf "nfs-server.%s.svc.cluster.local" .namespace }}
     {{- end }}
-    - NFS_PATH={{ $nfs.nfs.path }}
+    - NFS_PATH={{ .nfs.path }}
     - PROVISIONER_NAME={{ printf "%s-nfs-provisioner" .namespace }}
+
+  volumes:
+    - type: volume
+      source: {{ .nfs.volumeName }}
+      target: {{ .nfs.path }}
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 8fc62e83..a8ac40cf 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -168,4 +168,11 @@ volumes:  # this inclusion needs to be conditional
   dshm:
   {{- end }}
   {{- end }}
+  {{- if eq $app_name "nfsserver" }}
+  {{ $app_config.nfs.volumeName }}:
+    # driver_opts:
+    #  type: "nfs"
+    #  o: "{{ join "," $app_config.nfs.mountOptions }}"
+    #  device: ":{{ $app_config.nfs.path }}"
+  {{- end }}
 {{- end }}

From 46ee1408a87baf8f4f387a45ba4173af77b6a0e4 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 26 Feb 2024 11:36:48 -0600
Subject: [PATCH 049/210] CH-100 Add volumes conditionnally

---
 .../compose/templates/auto-compose.yaml           | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index a8ac40cf..c2aad014 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -157,7 +157,20 @@ networks:
   ch:
     name: ch_network
 
-volumes:  # this inclusion needs to be conditional
+{{- range $app_name, $app_config := .Values.apps }}
+  {{- with $app_config.harness.deployment.volume }}
+volumes:
+  {{- break }}
+  {{- end }}
+  {{- with $app_config.harness.database }}
+volumes:
+  {{- break }}
+  {{- end }}
+  {{- if eq $app_name "nfsserver" }}
+volumes:
+  {{- break }}
+  {{- end }}
+{{- end }}
 {{- range $app_name, $app_config := .Values.apps }}
   {{- with $app_config.harness.deployment.volume }}
   {{ .name }}:

From e135c6a6dbef827854d742e188f4866703da2b00 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 26 Feb 2024 12:27:56 -0600
Subject: [PATCH 050/210] CH-100 Add first tutorial about docker compose

---
 ...clock-application-with-docker-compose.adoc | 328 ++++++++++++++++++
 1 file changed, 328 insertions(+)
 create mode 100644 docs/tutorials/simple-date-clock-application-with-docker-compose.adoc

diff --git a/docs/tutorials/simple-date-clock-application-with-docker-compose.adoc b/docs/tutorials/simple-date-clock-application-with-docker-compose.adoc
new file mode 100644
index 00000000..70e8f1e2
--- /dev/null
+++ b/docs/tutorials/simple-date-clock-application-with-docker-compose.adoc
@@ -0,0 +1,328 @@
+:repo_url: ../../../../../
+:ch: CloudHarness
+:dc: Docker Compose
+:dc-: docker compose
+:repo_fragment: MetaCell/cloud-harness
+
+
+= A simple date-clock application: tutorial {ch} targeting {dc}
+
+In this small tutorial, we will see different aspects about the development of applications with {ch} through the development from scratch of a small webapp that fetches information from a server on a regular basis.
+This tutorial will show you how to generate the `{dc-}` configuration and how to build and deploy this simple application.
+
+{ch} generates the initial files and folders for your project depending on some templates tacking different aspects of your app depending on your requirements, __e.g.__, for a webapp project, it generates the frontend initial files for ReactJS and the initial Flask files for the backend.
+For the API part, {ch} relies on OpenAPI 3 to deal with the endpoints/model description.
+
+The different aspects that will be covered here are:
+
+* how to bootstrap a new app, build it, and deploy it on {dc};
+* how to modify/update the app, built it and run it again.
+
+== The tools you need to deploy/build your application
+
+The following tools, beside python, are not required to work with {ch}.
+Before installing everything, please be sure you have the following tools installed on your machine:
+
+* `python`
+* `yarn`
+* `{ch}` -- if not installed, please check other documentation and tutorials
+* `helm` -- to deal with the generation of the {dc}
+* `skaffold` -- to build the different images that will run on {dc}
+* `{dc-}` -- to actually run the built application
+
+
+== Creating a very simple webapp
+
+Now that we know how to configure/run/deploy apps on our local cluster, we will create a very simple webapp.
+In this first time, we will only generate the project's artifacts using the `harness-application`, then, we will build/run/deploy it.
+In a second time, we will modify the API to add new endpoints and deal with the frontend accordingly.
+
+=== Creating a new webapp and building the frontend
+
+The webapp that we will create will be a useless webapp that will fetch the current date and time when a button is pressed.
+Nothing fancy, just a way to see how to interact with the generated sources and get everything running on your local cluster.
+
+The first step is to generate the projects files.
+In our case, we want to develop a webapp, meaning that we want a frontend and a backend.
+We use `harness-application` to generate the first files with a specific templates: `webapp` and `flask-server`.
+We first place ourself in the parent directory of where you cloned the `cloud-harness` repository.
+
+[NOTE]
+We could place ourself anywhere, we would just have to remember the path towards the `cloud-harness` repository.
+
+.Generating the first project's file
+[source,bash]
+----
+harness-application clockdate -t webapp -t flask-server
+----
+
+The name of the application is `clockdate` and we use the `webapp` and `flask-server` template.
+There is various existing templates with different purpose: for DB interaction, backend, frontend, ...
+
+We observe now that a new directory had been created in an `applications` folder named `clockdate`.
+The folder is organized with many sub-folders, all playing a different role in the app.
+
+.Ensuring that the backend is considered as a webapp
+We will now make a small modification, or ensure that the code of the backend includes its activation as "webapp".
+Open the file generated in `clockdate/backend/clockdate/__main__.py` and check that the following line has the keyword parameter `webapp` set to `True`.
+
+[source,python]
+----
+app = init_flask(title="clockdate", init_app_fn=None, webapp=True)
+----
+
+This option ensures the registration of some specific endpoints by {ch}.
+In this case, it ensures that the `/` endpoint will be mapped to the `index.html` produced for the frontend.
+
+.Building the frontend
+
+In this tutorial, before generating the configuration files for {dc} by {ch}, we will build the frontend using `yarn`.
+Enter in the `clockdate/frontend` folder and just type
+
+[source, bash]
+----
+yarn install
+----
+
+This will generate a `yarn.lock` which is required later for the build of the Docker images.
+
+[NOTE]
+This step could have been done later, but it has to be done *before* the build of the different Docker images using `skaffold`.
+
+
+.Generating the `{dc-}` configuration files for our `clockdate` app
+[source,bash]
+----
+# run in the directory that contains the cloud-harness repository
+harness-deployment cloud-harness . -u -dtls -l -d azathoth.local -e local -n azathoth -i clockdate --docker-compose
+----
+
+The key here is to add the `--docker-compose` option that will trigger the generation of a set of files in the `deployment` folder,
+as well as a slightly modified version of the `skaffold.yaml` file.
+
+As a result, in the `deployment` folder, we should have something that looks like this:
+
+[source]
+----
++- CURRENT_DIRECTORY
+  [...]
+  + deployment/
+    + compose/               -> the template files and some generated files dedicated to docker compose
+    `- docker-compose.yaml   -> the main file used by {dc} to deploy everything
+  `- skaffold.yaml           -> used by skaffold to build the Docker images
+----
+
+Now you can build/deploy/run it using `skaffold`.
+
+[source,bash]
+----
+skaffold build
+----
+
+.Deploying your app on {dc}
+
+To deploy the application on {dc}, you only need to position yourself in the directory where the `docker-compose.yaml` file was generated, so in the `deployment` folder.
+
+[source,bash]
+----
+cd deployment
+docker compose up
+----
+
+This command will download the necessary images and reuses the ones built by `skaffold` to deploy everything.
+
+Now, to be sure to access properly the app, a small addition to your `/etc/hosts` file is required as such:
+
+[source]
+----
+127.0.0.1   clockdate.azathoth.local
+----
+
+Now you can open your browser to `http://clockdate.azathoth.local` and see that everything is running properly.
+You can also go to `http://clockdate.azathoth.local/api/ping` and check that you have a message.
+
+
+=== Modifying your webapp, adding behavior
+
+We are currently capable of generating/running applications, but we did not add our own behavior.
+We need to modify the generated sources to do so.
+If we take a deeper look to the folder generated by `harness-application`, we observe three folders that are the one we will modify on a normal usage/base:
+
+.Generated directory organization
+[source]
+----
++- api               -> owns the OpenAPI definition of the endpoints/resources handled by the API
++- backend
+  `- clockdate       -> the project backend files
+    |- controllers   -> the controller definition
+    `- models        -> the resources exposed by the API
++- frontend           -> the webpage files
+----
+
+In a first time, we will modify the backend to add a new endpoint that will answer in a string the current date and time.
+The process is the following:
+
+. we add the new endpoint in the `openapi` folder, modifying the `openapi.yaml` file,
+. we regenerate the code of the application using `harness-generate`
+. we code the behavior of the endpoint in the dedicated method generated in the `backend/clockdate/controllers` folder.
+. we build/deploy/run the code to see it running (this step can be changed with a pure python run of the backend for a quicker dev loop).
+
+==== Adding the new endpoint to the openapi specification
+
+We will add a new endpoint named `currentdate` that will answer a string when `GET`.
+To do so, we add a special path in the `path` section.
+
+.Modifying the `api/openapi.yaml` file
+[source,yaml]
+----
+paths:
+  /currentdate:
+    get:
+      operationId: currentdate
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: string
+          description: Current date and time
+        "500":
+          description: System cannot give the current time
+      summary: Gets the current date and time
+      tags: [datetime]
+----
+
+[NOTE]
+The name of the controller in which the function related to the endpoint will be generated depends on the `tags` value in defined in the `api/openapi.yaml` file.
+
+We validate that our openAPI specification is correct.
+
+[source]
+----
+$ openapi-spec-validator applications/clockdate/api/openapi.yaml
+OK
+----
+
+Now we generate again the code the application using `harness-application` another time.
+
+.Regenerating the code of our modified app
+[source,bash]
+----
+harness-application clockdate -t flask-server -t webapp
+----
+
+This will add a new `datetime_controller.py` in the `backend/clockdate/controllers` package.
+
+[IMPORTANT]
+You need to notice that all the controllers files (and all the files) are overridden in the `backend` directory.
+To prevent files of being overridden, you need to edit the `.openapi-generator-ignore` file, that acts like a `.gitignore` file (in a way), by marking the files/directories that needs to be ignored by the generation.
+
+When we open this file, we get the following controller method:
+
+[source,python]
+----
+def currentdate():  # noqa: E501
+    """Gets the current date and time
+
+     # noqa: E501
+
+
+    :rtype: str
+    """
+    return 'do some magic!'
+----
+
+This is the moment to add the behavior we want:
+
+[source,python]
+----
+def currentdate():  # noqa: E501
+    """Gets the current date and time
+
+     # noqa: E501
+
+
+    :rtype: str
+    """
+    from datetime import datetime
+    return f'{datetime.now()}'
+----
+
+We simply import the `datetime` module and type, and we ask for the current date and time.
+Here a string interpolation is used only to force the result to be considered and formatted as a string.
+It's not mandatory.
+
+Now that our new endpoint is coded, we can build/deploy/run it on our local cluster using `skaffold build` then `{dc-} up`.
+Once the deployment is done, we can navigate to: http://clockdate.azathoth.local/api/currentdate to appreciate the result.
+
+
+=== A quick and dirty frontend to test our endpoint
+
+
+Now that we have the "backend" running, we will modify the frontend to get a label and a button that will fetch the information about date and time from the new endpoint we defined.
+If we look in the frontend source code generated, we see a `src/rest/api.ts` file.
+The generated code targets ReactJS as framework.
+This module provides clients for the API generated from the `api/openapi.yaml` specification.
+Exactly, it provides one client by `tag` defined in the openAPI specification.
+In our case, we defined a tag `datetime`, so we find in `api.ts` a class `DatetimeApi`.
+This is the class we will instantiate and use to deal with the call to the API and the endpoint we defined in the previous section.
+
+First, we are going to code a new React component that will provide a header with the current date and time and a button to ask for a "fetch" of the current date and time from the server.
+
+We call this component `DateTime` inside of a `DateTime.tsx` file that is placed in the `src/components` directory.
+
+.Code of the `frontend/src/component/DateTime.tsx` component
+[source,javascript]
+----
+import React, { useState, useEffect, useCallback } from 'react';
+import { DatetimeApi } from '../rest/api'
+
+const api = new DatetimeApi() <1>
+
+const DateTime = () => {
+  const [datetime, setDatetime] = useState('unavailable');
+  useEffect(() => updateDate(), []);
+
+  const updateDate = useCallback(() => {
+    api.currentdate().then(r => setDatetime(r.data)); <2>
+  }, []);
+
+  return (
+    <div>
+        <h2>{datetime}</h2>
+        <button onClick={updateDate}>Fetch</button>
+    </div>
+  )
+}
+
+export default DateTime;
+----
+
+<1> The `DatetimeApi` class is instantiated, this is now the instance we will use everytime we need to perform a request toward an API endpoint.
+<2> is where is actually perform the call. The `currentdate` method is generated by {ch}.
+
+Now that we have our dedicated component, we will integrate it in the current page.
+To do that, we need to modify the `App.tsx` component.
+This component is located in `frontend/src/App.tsx`.
+We modify the content of this file this way:
+
+.Code of the `frontend/src/App.tsx` component
+[source,javascript]
+----
+import React from 'react';
+import './styles/style.less';
+import DateTime from './components/DateTime';
+
+const Main = () => (
+    <>
+      <h1>Ask for date and time</h1>
+      <DateTime />
+      <p>See api documentation <a href="/api/ui">here</a></p>
+    </>
+);
+
+export default Main;
+----
+
+Once this is done, we can build/deploy/run again our webapp on our local cluster using `skaffold buld` then `{dc-} up`.
+That's it!

From 0f701461b25885eec04a25c2d02d8085204967c0 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 29 Feb 2024 12:35:18 -0600
Subject: [PATCH 051/210] CH-100 Add first real config for gatekeeper

---
 .../compose/templates/auto-compose.yaml       |  18 +++
 .../compose/templates/auto-gatekeepers.yaml   | 134 ++++++------------
 2 files changed, 63 insertions(+), 89 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index c2aad014..67154da4 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -23,10 +23,28 @@ services:
       - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
 
 {{- range $app_name, $app_config := .Values.apps }}
+  {{- if eq $app_name "argo" -}}
+  {{- continue -}}
+  {{- end -}}
   {{ $deployment :=  $app_config.harness.deployment }}
   {{- if eq $app_name "nfsserver" }}
   {{- include "nfsserver.deployment" $.Values | indent 2 }}
   {{- end }}
+  {{- if $.Values.secured_gatekeepers }}
+  {{ if and (hasKey $app_config "port") $app_config.harness.secured }}
+  # Gatekeeper for {{ $app_config.harness.service.name }}-gk
+{{- include "securedservice.deploy" (dict "root" $ "app" $app_config) | indent 2 }}
+  {{- end }}
+  {{- range $subapp := $app_config }}
+  {{- if contains "map" (typeOf $subapp)  }}
+    {{- if and (hasKey $subapp "harness.port") (hasKey $subapp "harness.secured") }}
+      {{- if $subapp.harness.secured }}
+{{ include "securedservice.deploy" (dict "root" $ "app" $subapp) | indent 2 }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
   {{- if or (not $deployment.auto) (not $app_config.harness.service.auto) }}
   {{- continue }}
   {{- end}}
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index 898995cd..f0d68c7f 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -1,14 +1,35 @@
 {{/* Secured Services/Deployments */}}
-{{- define "deploy_utils.securedservice" }}
+{{- define "securedservice.deploy" }}
 {{- $tls := not (not .root.Values.tls) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: "{{ .app.harness.service.name }}-gk"
-  labels:
-    app: "{{ .app.harness.service.name }}-gk"
-data:
-  proxy.yml: |-
+{{ .app.harness.service.name }}-gk:
+  image: quay.io/gogatekeeper/gatekeeper:1.3.8
+  expose:
+    - '8080'
+    - '8443'
+  deploy:
+    mode: replicated
+    replicas: 1
+    resources:
+      limits:
+        cpus: 100m
+        memory: 64M
+      reservations:
+        cpus: 50m
+        memory: 32M
+  environment:
+    - PROXY_CONFIG_FILE=/opt/proxy.yml
+  volumes:
+    - compose/resources/generated/{{ .app.harness.service.name }}-gk/proxy.yml:/opt/proxy.yml
+    - compose/resources/generated/{{ .app.harness.service.name }}-gk/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
+    - compose/resources/generated/{{ .app.harness.service.name }}-gk/access-denied.html.tmpl:/templates/access-denied.html.tmpl
+{{- end }}
+
+{{- define "securedservice.deploy.resources" }}
+{{- $tls := not (not .root.Values.tls) }}
+cloudharness-metadata:
+  path: resources/generated/{{ .app.harness.service.name }}-gk/proxy.yml
+
+data: |-
     verbose: {{ .root.Values.debug }}
     discovery-url: {{ ternary "https" "http" $tls}}://{{ .root.Values.apps.accounts.harness.subdomain }}.{{ .root.Values.domain }}/auth/realms/{{ .root.Values.namespace }}
     client-id: {{ .root.Values.apps.accounts.webclient.id | quote }}
@@ -40,8 +61,17 @@ data:
     skip-openid-provider-tls-verify: true
     skip-upstream-tls-verify: true
     {{- end }}
-  cacert.crt: {{ .files.Get "resources/certs/cacert.crt" | quote }}
-  access-denied.html.tmpl: |-
+---
+cloudharness-metadata:
+  path: resources/generated/{{ .app.harness.service.name }}-gk/cacert.crt
+
+data: |-
+{{ .files.Get "resources/certs/cacert.crt" | indent 2 }}
+---
+cloudharness-metadata:
+  path: resources/generated/{{ .app.harness.service.name }}-gk/access-denied.html.tmpl
+
+data: |-
     <!DOCTYPE html>
     <html>
     <head>
@@ -79,93 +109,19 @@ data:
     </body>
     </html>
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  name: "{{ .app.harness.service.name }}-gk"
-  labels:
-    app: "{{ .app.harness.service.name }}-gk"
-spec:
-  ports:
-  - name: http
-    port: 8080
-  selector:
-    app: "{{ .app.harness.service.name }}-gk"
-  type: ClusterIP
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: "{{ .app.harness.service.name }}-gk"
-  labels:
-    app: "{{ .app.harness.service.name }}-gk"
-  
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: "{{ .app.harness.service.name }}-gk"
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ .app.harness.uri_role_mapping | toString | sha256sum }}
-      labels:
-        app: "{{ .app.harness.service.name }}-gk"
-    spec:
-{{ include "deploy_utils.etcHosts" .root | indent 6 }}
-      containers:
-      - name: {{ .app.harness.service.name | quote }}
-        image: "quay.io/gogatekeeper/gatekeeper:1.3.8"
-        imagePullPolicy: IfNotPresent
-        {{ if .root.Values.local }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          runAsUser: 0
-        {{- end }}
-        env:
-        - name: PROXY_CONFIG_FILE
-          value: /opt/proxy.yml
-        volumeMounts:
-        - name: "{{ .app.harness.service.name }}-gk-proxy-config"
-          mountPath: /opt/proxy.yml
-          subPath: proxy.yml
-        - name: "{{ .app.harness.service.name }}-gk-proxy-config"
-          mountPath: /etc/pki/ca-trust/source/anchors/cacert.crt
-          subPath: cacert.crt
-        - name: "{{ .app.harness.service.name }}-gk-proxy-config"
-          mountPath: /templates/access-denied.html.tmpl
-          subPath: access-denied.html.tmpl
-        ports:
-        - name: http
-          containerPort: 8080
-        - name: https
-          containerPort: 8443
-        resources:
-          requests:
-            memory: "32Mi"
-            cpu: "50m"
-          limits:
-            memory: "64Mi"
-            cpu: "100m"
-      volumes:
-      - name: "{{ .app.harness.service.name }}-gk-proxy-config"
-        configMap:
-          name: "{{ .app.harness.service.name }}-gk"
----
 {{- end }}
+
 {{- if .Values.secured_gatekeepers }}
 {{ $files := .Files }}
 {{- range $app := .Values.apps }}
   {{- if and (hasKey $app "port") ($app.harness.secured)   }}
----
-    {{ include "deploy_utils.securedservice" (dict "root" $ "app" $app "files" $files) }}
-    {{- end }}
+    {{ include "securedservice.deploy.resources" (dict "root" $ "app" $app "files" $files) }}
+  {{- end }}
   {{- range $subapp := $app }}
   {{- if contains "map" (typeOf $subapp)  }}
     {{- if and (hasKey $subapp "harness.port") (hasKey $subapp "harness.secured") }}
       {{- if $subapp.harness.secured }}
----
-      {{ include "deploy_utils.securedservice" (dict "root" $ "app" $subapp "files" $files) }}
+      {{ include "securedservice.deploy.resources" (dict "root" $ "app" $subapp "files" $files) }}
     {{- end }}
   {{- end }}
   {{- end }}

From 6bbef64e633cecebc14d0c85cfc18393f843122d Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 29 Feb 2024 12:55:39 -0600
Subject: [PATCH 052/210] CH-100 Add reverse proxy config for gatekeeper

---
 .../compose/templates/auto-compose.yaml       | 25 ++++++++++++-------
 .../compose/templates/auto-gatekeepers.yaml   |  5 ++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 67154da4..9379c57d 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -30,8 +30,9 @@ services:
   {{- if eq $app_name "nfsserver" }}
   {{- include "nfsserver.deployment" $.Values | indent 2 }}
   {{- end }}
-  {{- if $.Values.secured_gatekeepers }}
-  {{ if and (hasKey $app_config "port") $app_config.harness.secured }}
+  {{- $isSecured := (and $.Values.secured_gatekeepers ( and (hasKey $app_config "port") $app_config.harness.secured )) -}}
+  {{ if $isSecured }}
+
   # Gatekeeper for {{ $app_config.harness.service.name }}-gk
 {{- include "securedservice.deploy" (dict "root" $ "app" $app_config) | indent 2 }}
   {{- end }}
@@ -44,7 +45,6 @@ services:
     {{- end }}
   {{- end }}
   {{- end }}
-  {{- end }}
   {{- if or (not $deployment.auto) (not $app_config.harness.service.auto) }}
   {{- continue }}
   {{- end}}
@@ -104,19 +104,24 @@ services:
       {{- end }}
     {{- with $app_config.harness.dependencies.soft }}
     links:
-      {{- range . }}
-      {{- $service_name := (get $.Values.apps .).harness.service.name }}
-        {{- if eq . "events"}}
+      {{- range . -}}
+      {{- $service_name := (get $.Values.apps .).harness.service.name -}}
+        {{- if eq . "events" }}
 #     - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
         {{- else }}
       - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
         {{- end }}
-      {{- end }}
-    {{- end }}
+      {{- end -}}
+    {{- end -}}
     {{/* Takes the hard deps, removes argo and adds the db if there is one */}}
     {{/* To be sure to add the db properly, we "dig" the "harness" config for "database.name" and return "" if one of the keys doesn't exist */}}
     {{/* "compact" in the beginning is to remove empty values */}}
-    {{- with compact (append (without $app_config.harness.dependencies.hard "argo") (dig "database" "name" "" $app_config.harness) ) }}
+    {{- with compact
+          (append
+            (append
+              (without $app_config.harness.dependencies.hard "argo")
+              (dig "database" "name" "" $app_config.harness))
+            (ternary (printf "%s-gk" $app_config.harness.service.name) "" $isSecured)) -}}
     depends_on:
       {{- range . }}
       - {{ . }}
@@ -153,6 +158,7 @@ services:
       {{- end }}
       {{- end }}
   {{- end }}
+  {{- if not $isSecured }}
     labels:
       - "traefik.enable=true"
       {{- with $app_config.harness.service.port }}
@@ -162,6 +168,7 @@ services:
       # - "traefik.http.routers.{{ .app_name }}.middlewares=redirect-middleware"
       - "traefik.http.routers.{{ $app_name }}.rule=Host(`{{ $app_config.harness.subdomain }}.{{ $.Values.domain }}`)"
       - "traefik.http.routers.{{ $app_name }}.entrypoints=web"
+  {{- end }}
   {{- with $app_config.harness.database }}
     {{- if not .auto }}
     {{- continue}}
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index f0d68c7f..d27a6f50 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -22,6 +22,11 @@
     - compose/resources/generated/{{ .app.harness.service.name }}-gk/proxy.yml:/opt/proxy.yml
     - compose/resources/generated/{{ .app.harness.service.name }}-gk/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
     - compose/resources/generated/{{ .app.harness.service.name }}-gk/access-denied.html.tmpl:/templates/access-denied.html.tmpl
+  labels:
+    - "traefik.enable=true"
+    - "traefik.http.services.{{ .app.harness.service.name }}-gk.loadbalancer.server.port={{ .app.harness.service.port }}"
+    - "traefik.http.routers.{{ .app.harness.service.name }}-gk.rule=Host(`{{ .app.harness.subdomain }}.{{ .root.Values.domain }}`)"
+    - "traefik.http.routers.{{ .app.harness.service.name }}-gk.entrypoints=web"
 {{- end }}
 
 {{- define "securedservice.deploy.resources" }}

From 3b437cf018a01085e13d462f168e7796568376d7 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 29 Feb 2024 13:27:30 -0600
Subject: [PATCH 053/210] CH-100 Fix path to generated resources

---
 .../compose/templates/auto-compose.yaml              |  2 +-
 .../compose/templates/auto-gatekeepers.yaml          | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 9379c57d..ba7dd79e 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -141,7 +141,7 @@ services:
     {{- with $app_config.harness.resources }}
     {{- range .}}
       - type: bind
-        source: compose/resources/generated/{{ $app_name }}/{{ .src }}
+        source: ./compose/resources/generated/{{ $app_name }}/{{ .src }}
         target: {{ .dst }}
     {{- end }}
     {{- end}}
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index d27a6f50..fc27efd0 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -19,14 +19,20 @@
   environment:
     - PROXY_CONFIG_FILE=/opt/proxy.yml
   volumes:
-    - compose/resources/generated/{{ .app.harness.service.name }}-gk/proxy.yml:/opt/proxy.yml
-    - compose/resources/generated/{{ .app.harness.service.name }}-gk/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
-    - compose/resources/generated/{{ .app.harness.service.name }}-gk/access-denied.html.tmpl:/templates/access-denied.html.tmpl
+    - ./compose/resources/generated/{{ .app.harness.service.name }}-gk/proxy.yml:/opt/proxy.yml
+    - ./compose/resources/generated/{{ .app.harness.service.name }}-gk/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
+    - ./compose/resources/generated/{{ .app.harness.service.name }}-gk/access-denied.html.tmpl:/templates/access-denied.html.tmpl
   labels:
     - "traefik.enable=true"
     - "traefik.http.services.{{ .app.harness.service.name }}-gk.loadbalancer.server.port={{ .app.harness.service.port }}"
     - "traefik.http.routers.{{ .app.harness.service.name }}-gk.rule=Host(`{{ .app.harness.subdomain }}.{{ .root.Values.domain }}`)"
     - "traefik.http.routers.{{ .app.harness.service.name }}-gk.entrypoints=web"
+  depends_on:
+    - accounts
+  links:
+    - accounts:accounts.{{ .root.Values.domain }}
+  extra_hosts:
+    - "accounts.{{ .root.Values.domain }}=127.0.0.11"
 {{- end }}
 
 {{- define "securedservice.deploy.resources" }}

From 1135b992db0b533997b8866ee0fa5becff7543b5 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 1 Mar 2024 07:25:07 -0600
Subject: [PATCH 054/210] CH-100 Fix bad GK configuration

---
 .../compose/templates/auto-compose.yaml             | 13 ++++++++++---
 .../compose/templates/auto-gatekeepers.yaml         | 10 ++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index ba7dd79e..7ef77386 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -86,6 +86,13 @@ services:
     {{- with $deployment.command }}
     # entrypoint: {{ cat . $deployment.args }}
     {{- end }}
+    {{- if eq $app_name "accounts" }}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/auth/realms/azathoth/account"]
+      interval: 1s
+      timeout: 3s
+      retries: 30
+    {{- end }}
     environment:
       - CH_CURRENT_APP_NAME={{ $app_name }}
 
@@ -117,11 +124,9 @@ services:
     {{/* To be sure to add the db properly, we "dig" the "harness" config for "database.name" and return "" if one of the keys doesn't exist */}}
     {{/* "compact" in the beginning is to remove empty values */}}
     {{- with compact
-          (append
             (append
               (without $app_config.harness.dependencies.hard "argo")
-              (dig "database" "name" "" $app_config.harness))
-            (ternary (printf "%s-gk" $app_config.harness.service.name) "" $isSecured)) -}}
+              (dig "database" "name" "" $app_config.harness)) -}}
     depends_on:
       {{- range . }}
       - {{ . }}
@@ -146,6 +151,7 @@ services:
     {{- end }}
     {{- end}}
     {{- end }}
+  {{/*
   {{- if $.Values.local }}
     # Extra /etc/hosts list
     {{- $domain := $.Values.domain }}
@@ -158,6 +164,7 @@ services:
       {{- end }}
       {{- end }}
   {{- end }}
+  */}}
   {{- if not $isSecured }}
     labels:
       - "traefik.enable=true"
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index fc27efd0..a91bd96a 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -2,6 +2,9 @@
 {{- define "securedservice.deploy" }}
 {{- $tls := not (not .root.Values.tls) }}
 {{ .app.harness.service.name }}-gk:
+  networks:
+  - ch
+  restart: always
   image: quay.io/gogatekeeper/gatekeeper:1.3.8
   expose:
     - '8080'
@@ -28,11 +31,10 @@
     - "traefik.http.routers.{{ .app.harness.service.name }}-gk.rule=Host(`{{ .app.harness.subdomain }}.{{ .root.Values.domain }}`)"
     - "traefik.http.routers.{{ .app.harness.service.name }}-gk.entrypoints=web"
   depends_on:
-    - accounts
+    accounts:
+      condition: service_healthy
   links:
     - accounts:accounts.{{ .root.Values.domain }}
-  extra_hosts:
-    - "accounts.{{ .root.Values.domain }}=127.0.0.11"
 {{- end }}
 
 {{- define "securedservice.deploy.resources" }}
@@ -42,7 +44,7 @@ cloudharness-metadata:
 
 data: |-
     verbose: {{ .root.Values.debug }}
-    discovery-url: {{ ternary "https" "http" $tls}}://{{ .root.Values.apps.accounts.harness.subdomain }}.{{ .root.Values.domain }}/auth/realms/{{ .root.Values.namespace }}
+    discovery-url: {{ ternary "https" "http" $tls}}://{{ .root.Values.apps.accounts.harness.subdomain }}.{{ .root.Values.domain }}:8080/auth/realms/{{ .root.Values.namespace }}
     client-id: {{ .root.Values.apps.accounts.webclient.id | quote }}
     client-secret: {{ .root.Values.apps.accounts.webclient.secret }}
     secure-cookie: {{ $tls }}

From b23f03b87319d4dce2c1b1288834ad00b95b4755 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 1 Mar 2024 08:04:40 -0600
Subject: [PATCH 055/210] CH-100 Adapt gk configuration

---
 .../compose/templates/auto-compose.yaml         | 10 +++++-----
 .../compose/templates/auto-gatekeepers.yaml     | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 7ef77386..ff6145cb 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -64,14 +64,14 @@ services:
     image: {{ . }}
     {{- end }}
     {{- if eq $.Values.mainapp $app_name }}
-    # {{- with $app_config.harness.service.port }}
-    # ports:
-    #   - "{{ . }}:{{ $app_config.harness.deployment.port }}"
-    # {{- end }}
+    {{- with $app_config.harness.service.port }}
+    ports:
+      - "{{ . }}:{{ $app_config.harness.deployment.port }}"
+    {{- end }}
     {{- end }}
     {{- with $app_config.harness.deployment.port }}
     expose:
-      - {{ . | quote }}
+      - {{ . }}
     {{- end}}
     deploy:
       mode: "replicated"
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index a91bd96a..b9e6f8cb 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -1,7 +1,8 @@
 {{/* Secured Services/Deployments */}}
 {{- define "securedservice.deploy" }}
 {{- $tls := not (not .root.Values.tls) }}
-{{ .app.harness.service.name }}-gk:
+{{- $gk_name := printf "%s-gk" .app.harness.service.name }}
+{{ $gk_name }}:
   networks:
   - ch
   restart: always
@@ -22,19 +23,21 @@
   environment:
     - PROXY_CONFIG_FILE=/opt/proxy.yml
   volumes:
-    - ./compose/resources/generated/{{ .app.harness.service.name }}-gk/proxy.yml:/opt/proxy.yml
-    - ./compose/resources/generated/{{ .app.harness.service.name }}-gk/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
-    - ./compose/resources/generated/{{ .app.harness.service.name }}-gk/access-denied.html.tmpl:/templates/access-denied.html.tmpl
+    - ./compose/resources/generated/{{ $gk_name }}/proxy.yml:/opt/proxy.yml
+    - ./compose/resources/generated/{{ $gk_name }}/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
+    - ./compose/resources/generated/{{ $gk_name }}/access-denied.html.tmpl:/templates/access-denied.html.tmpl
   labels:
     - "traefik.enable=true"
-    - "traefik.http.services.{{ .app.harness.service.name }}-gk.loadbalancer.server.port={{ .app.harness.service.port }}"
-    - "traefik.http.routers.{{ .app.harness.service.name }}-gk.rule=Host(`{{ .app.harness.subdomain }}.{{ .root.Values.domain }}`)"
-    - "traefik.http.routers.{{ .app.harness.service.name }}-gk.entrypoints=web"
+    - "traefik.http.services.{{ $gk_name }}.loadbalancer.server.port={{ .app.harness.service.port }}"
+    - "traefik.http.routers.gatekeeper.middlewares=redirect-middleware"
+    - "traefik.http.routers.{{ $gk_name }}.rule=Host(`{{ .app.harness.subdomain }}.{{ .root.Values.domain }}`)"
+    - "traefik.http.routers.{{ $gk_name }}.entrypoints=web"
   depends_on:
     accounts:
       condition: service_healthy
   links:
     - accounts:accounts.{{ .root.Values.domain }}
+    - {{ .app.harness.service.name }}:{{ .app.harness.service.name }}.default
 {{- end }}
 
 {{- define "securedservice.deploy.resources" }}

From 361ca4633a302a8b3d27e10db862cd1bba370eeb Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 1 Mar 2024 13:02:16 -0600
Subject: [PATCH 056/210] CH-100 Fix gk configuration

---
 applications/samples/frontend/webpack.config.js               | 2 +-
 deployment-configuration/compose/templates/auto-compose.yaml  | 2 +-
 .../compose/templates/auto-gatekeepers.yaml                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/samples/frontend/webpack.config.js b/applications/samples/frontend/webpack.config.js
index ad5ee556..69f80cb9 100644
--- a/applications/samples/frontend/webpack.config.js
+++ b/applications/samples/frontend/webpack.config.js
@@ -29,7 +29,7 @@ module.exports = function webpacking(envVariables) {
 
   const output = {
     path: path.resolve(__dirname, "dist"),
-    filename: "[name].[contenthash].js",
+    filename: "js/[name].[contenthash].js",
     publicPath: "/"
   };
 
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index ff6145cb..156547a4 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -23,7 +23,7 @@ services:
       - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
 
 {{- range $app_name, $app_config := .Values.apps }}
-  {{- if eq $app_name "argo" -}}
+  {{- if has $app_name (list "argo" "events") -}}
   {{- continue -}}
   {{- end -}}
   {{ $deployment :=  $app_config.harness.deployment }}
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index b9e6f8cb..4094a925 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -36,7 +36,7 @@
     accounts:
       condition: service_healthy
   links:
-    - accounts:accounts.{{ .root.Values.domain }}
+    - traefik:accounts.{{ .root.Values.domain }}
     - {{ .app.harness.service.name }}:{{ .app.harness.service.name }}.default
 {{- end }}
 
@@ -47,7 +47,7 @@ cloudharness-metadata:
 
 data: |-
     verbose: {{ .root.Values.debug }}
-    discovery-url: {{ ternary "https" "http" $tls}}://{{ .root.Values.apps.accounts.harness.subdomain }}.{{ .root.Values.domain }}:8080/auth/realms/{{ .root.Values.namespace }}
+    discovery-url: {{ ternary "https" "http" $tls}}://{{ .root.Values.apps.accounts.harness.subdomain }}.{{ .root.Values.domain }}/auth/realms/{{ .root.Values.namespace }}
     client-id: {{ .root.Values.apps.accounts.webclient.id | quote }}
     client-secret: {{ .root.Values.apps.accounts.webclient.secret }}
     secure-cookie: {{ $tls }}

From 74d074eec720731bd2c1b4d4601914ef07e3c7f8 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 1 Mar 2024 13:15:04 -0600
Subject: [PATCH 057/210] CH-100 Comment unused "ports"

---
 deployment-configuration/compose/templates/auto-compose.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 156547a4..52f5a157 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -63,12 +63,13 @@ services:
     {{- with $app_config.image }}
     image: {{ . }}
     {{- end }}
+    {{/*
     {{- if eq $.Values.mainapp $app_name }}
     {{- with $app_config.harness.service.port }}
     ports:
       - "{{ . }}:{{ $app_config.harness.deployment.port }}"
     {{- end }}
-    {{- end }}
+    {{- end }}*/}}
     {{- with $app_config.harness.deployment.port }}
     expose:
       - {{ . }}

From fec25bee546836c823020e25aa45fd62c69a7b88 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 15 Mar 2024 06:05:26 -0600
Subject: [PATCH 058/210] CH-100 Fix issue with service names in dependencies

---
 .../compose/templates/auto-compose.yaml       | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 52f5a157..8f1543bd 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -23,7 +23,7 @@ services:
       - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
 
 {{- range $app_name, $app_config := .Values.apps }}
-  {{- if has $app_name (list "argo" "events") -}}
+  {{- if has $app_name (list "argo" "events" "nfsserver") -}}
   {{- continue -}}
   {{- end -}}
   {{ $deployment :=  $app_config.harness.deployment }}
@@ -113,12 +113,17 @@ services:
     {{- with $app_config.harness.dependencies.soft }}
     links:
       {{- range . -}}
-      {{- $service_name := (get $.Values.apps .).harness.service.name -}}
-        {{- if eq . "events" }}
-#     - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
+        {{- $service := .}}
+        {{- range $name, $conf := $.Values.apps }}
+          {{- if eq $conf.harness.name $service }}
+            {{- if has . (list "events" "nfsserver") }}
+#     - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
         {{- else }}
-      - {{ . }}:{{ $service_name }}.{{ $.Values.domain }}
-        {{- end }}
+      - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
+            {{- end }}
+            {{- break -}}
+          {{- end -}}
+        {{- end -}}
       {{- end -}}
     {{- end -}}
     {{/* Takes the hard deps, removes argo and adds the db if there is one */}}
@@ -129,9 +134,15 @@ services:
               (without $app_config.harness.dependencies.hard "argo")
               (dig "database" "name" "" $app_config.harness)) -}}
     depends_on:
-      {{- range . }}
-      - {{ . }}
-      {{- end }}
+      {{- range . -}}
+        {{- $service := .}}
+        {{- range $name, $conf := $.Values.apps -}}
+          {{- if eq $conf.harness.name $service }}
+      - {{ $name }}
+            {{- break -}}
+          {{- end -}}
+        {{- end -}}
+      {{- end -}}
     {{- end }}
     volumes:
       - ./compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro

From 0db12d801a4b729d68c3126aaddd251f0dfbe721 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 15 Mar 2024 06:19:44 -0600
Subject: [PATCH 059/210] CH-100 Fix issue with db-volumes

---
 .../compose/templates/auto-compose.yaml                   | 8 ++++++--
 .../compose/templates/auto-database.yaml                  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 8f1543bd..07d120dd 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -138,11 +138,15 @@ services:
         {{- $service := .}}
         {{- range $name, $conf := $.Values.apps -}}
           {{- if eq $conf.harness.name $service }}
+            {{- if has $name (list "events" "nfsserver") }}
+#     - {{ $name }}
+            {{- else }}
       - {{ $name }}
+            {{- end }}
             {{- break -}}
           {{- end -}}
         {{- end -}}
-      {{- end -}}
+      {{- end }}
     {{- end }}
     volumes:
       - ./compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
@@ -222,7 +226,7 @@ volumes:
   {{- with $app_config.harness.database }}
   {{ .name }}:
   {{- if eq .type "postgres" }}
-  dshm:
+  dshm-{{ $app_name }}:
   {{- end }}
   {{- end }}
   {{- if eq $app_name "nfsserver" }}
diff --git a/deployment-configuration/compose/templates/auto-database.yaml b/deployment-configuration/compose/templates/auto-database.yaml
index 70bda63a..569bb220 100644
--- a/deployment-configuration/compose/templates/auto-database.yaml
+++ b/deployment-configuration/compose/templates/auto-database.yaml
@@ -25,7 +25,7 @@
       target: /data/db
   {{- if eq .type "postgres" }}
     - type: volume
-      source: dshm
+      source: dshm-{{ .name }}
       target: /dev/shm
   {{- include "deploy_utils.database.postgres" . }}
   {{- end }}

From f8d4c84c909440358a6e345e69402dd0ddcb3036 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 15 Mar 2024 07:14:17 -0600
Subject: [PATCH 060/210] CH-100 Fix health check for account services

---
 deployment-configuration/compose/templates/auto-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 07d120dd..e932362d 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -89,7 +89,7 @@ services:
     {{- end }}
     {{- if eq $app_name "accounts" }}
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/auth/realms/azathoth/account"]
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/auth/realms/{{ $.Values.namespace }}/account"]
       interval: 1s
       timeout: 3s
       retries: 30
@@ -226,7 +226,7 @@ volumes:
   {{- with $app_config.harness.database }}
   {{ .name }}:
   {{- if eq .type "postgres" }}
-  dshm-{{ $app_name }}:
+  dshm-{{ .name }}:
   {{- end }}
   {{- end }}
   {{- if eq $app_name "nfsserver" }}

From 41211804e81089366b1efdbc7b46e82ac9006d5d Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 15 Mar 2024 09:51:44 -0600
Subject: [PATCH 061/210] CH-100 Fix issue with dependencies

---
 .../compose/templates/auto-compose.yaml                   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index e932362d..1302040e 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -110,13 +110,13 @@ services:
       {{- range $app_config.harness.env }}
       - {{ .name }}={{ .value }}
       {{- end }}
-    {{- with $app_config.harness.dependencies.soft }}
+    {{- with (concat (without $app_config.harness.dependencies.hard "argo") $app_config.harness.dependencies.soft) }}
     links:
       {{- range . -}}
         {{- $service := .}}
         {{- range $name, $conf := $.Values.apps }}
           {{- if eq $conf.harness.name $service }}
-            {{- if has . (list "events" "nfsserver") }}
+            {{- if has $name (list "events" "nfsserver") }}
 #     - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
         {{- else }}
       - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
@@ -131,9 +131,11 @@ services:
     {{/* "compact" in the beginning is to remove empty values */}}
     {{- with compact
             (append
-              (without $app_config.harness.dependencies.hard "argo")
+              (without $app_config.harness.dependencies.hard "argo" )
               (dig "database" "name" "" $app_config.harness)) -}}
+    {{- with without $app_config.harness.dependencies.hard "argo" "events" }}
     depends_on:
+    {{- end }}
       {{- range . -}}
         {{- $service := .}}
         {{- range $name, $conf := $.Values.apps -}}

From 5bf5532d88e651ac443b5082be7dafd4ec25a932 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 26 Mar 2024 12:50:24 -0600
Subject: [PATCH 062/210] CH-100 Change tagPolicy for docker-compose target

---
 tools/deployment-cli-tools/ch_cli_tools/skaffold.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 55efc587..7859d043 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -199,6 +199,11 @@ def identify_unicorn_based_main(candidates):
                 'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
             }
         }
+        skaffold_conf['build']['tagPolicy'] = {
+            'envTemplate': {
+                'template': "TAG"
+            }
+        }
 
     skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
     merge_to_yaml_file(skaffold_conf, os.path.join(
@@ -212,7 +217,7 @@ def git_clone_hook(conf: GitDependencyConfig, context_path: str):
             join(os.path.dirname(os.path.dirname(HERE)), 'clone.sh'),
             conf.branch_tag,
             conf.url,
-            join(context_path, "dependencies", conf.path or os.path.basename(conf.url).split('.')[0])   
+            join(context_path, "dependencies", conf.path or os.path.basename(conf.url).split('.')[0])
         ]
     }
 

From 319352b3c8762a536568b4b916f86b2f442bf912 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 26 Mar 2024 13:37:08 -0600
Subject: [PATCH 063/210] CH-100 Add first information for the docker compose
 target

---
 README.md                   | 28 ++++++++++++-------
 docs/build-deploy/README.md | 54 +++++++++++++++++++++++++++++++------
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 459b2929..46c1cdf2 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 <img src="https://github.com/MetaCell/cloud-harness/blob/develop/cloudharness.png?raw=true" alt="drawing" width="200"/>
 </p>
 
-CloudHarness is a base infrastructure facilitator for microservice based applications deployed on Kubernetes.
+CloudHarness is a base infrastructure facilitator for microservice based applications deployed on Kubernetes and Docker Compose.
 Can scaffold and maintain your cloud solution on top of Cloudharness without writing
 Kubernetes templates, with in place common utilities and applications already configured for you.
 
 What building your cloud solution with CloudHarness gives to you:
-- Common framework and utilities to develop and deploy micro-service application 
+- Common framework and utilities to develop and deploy micro-service application
   - Helm chart automatic generation
     - deployments
     - services
@@ -17,6 +17,12 @@ What building your cloud solution with CloudHarness gives to you:
     - access gatekeepers configuration
     - secrets
     - templated config maps from files
+  - Docker compose configuration generation
+    - services
+    - traefik configuration
+    - databases (postgreql)
+    - access gatekeepers configuration
+    - secrets
   * Automatic build and push of images
   * REST-API scaffolding building based on OpenApi
   * Continuous deployment script generation
@@ -46,14 +52,14 @@ In particular, these questions may rise:
  - How to manage databases without being locked to a specific vendor solution?
  - How to perform database backups?
  - How to manage secret data?
- - What about having a precounfigured account management application? 
- - Sooner rather than later I'll need an orchestration queue. Why not have that just ready to use? 
+ - What about having a precounfigured account management application?
+ - Sooner rather than later I'll need an orchestration queue. Why not have that just ready to use?
 
 # Command line tools
 
 CloudHarness provides the following command line tools to help application scaffolding and deployment.
 
-* `harness-deployment` - generate the helm chart to deploy on Kubernetes. 
+* `harness-deployment` - generate the helm chart to deploy on Kubernetes.
 * `harness-application` - create a new CloudHarness REST application.
 * `harness-generate` - generates server and client code for all CloudHarness REST applications.
 * `harness-test` - run end to end tests
@@ -67,13 +73,13 @@ Cloudharness can be used on all major operative systems.
 - Linux: supported and tested
 - MacOS: supported and tested
 - Windows/WSL2: supported and tested
-- Windows native: mostly working, unsupported  
+- Windows native: mostly working, unsupported
 
 ### Python
 Python 3.9 must be installed.
 
 It is recommended to setup a virtual environment.
-With conda: 
+With conda:
 ```bash
 conda create --name ch python=3.9
 conda activate ch
@@ -94,6 +100,10 @@ conda activate ch
 
 [Skaffold](https://skaffold.dev/docs/install/) is the way to go to build and debug your application in your local development environment.
 
+### Docker compose
+
+[Docker Compose](https://docs.docker.com/compose/) is required if the docker compose system is the target (instead of Kubernetes).
+
 ### Node environment
 
 A node environment with npm is required for developing web applications and to run end to end tests.
@@ -139,7 +149,7 @@ or simply copy the *blueprint* folder.
 
 The script `harness-deployment` scans your applications and configurations to create the build and deploy artifacts.
 Created artifacts include:
- - Helm chart
+ - Helm chart (or docker compose configuration file)
  - Skaffold build and run configuration
  - Visual Studio Code debug and run configuration
  - Codefresh pipeline yaml specification (optional)
@@ -153,7 +163,7 @@ infrastructure
 cloud-harness
 ```
 
-run 
+run
 
 ```
 harness-deployment cloud-harness . [PARAMS]
diff --git a/docs/build-deploy/README.md b/docs/build-deploy/README.md
index 35e5fbdc..03046971 100644
--- a/docs/build-deploy/README.md
+++ b/docs/build-deploy/README.md
@@ -17,7 +17,7 @@ infrastructure
 cloud-harness
 ```
 
-run 
+run
 
 ```
 harness-deployment cloud-harness . [PARAMS]
@@ -34,7 +34,7 @@ Deployment definition:
 - `--env`, `-e`: sets a custom environment (default: none)
 - `--namespace`, `-n`: set the kubernetes namespace (default: ch)
 - `--tag`, `-t`: define build tag (default: latest)
-- `--registry`, `-r`: set the Docker registry where images are pushed on build 
+- `--registry`, `-r`: set the Docker registry where images are pushed on build
 - `--include`, `-i`: set application(s) to include (with their dependencies). If not set, every application will be included
 - `--exclude`, `-ex`: explicitly exclude applications or task images
 
@@ -46,6 +46,7 @@ Development parameters:
 
 Optional settings
 - `--output`, `-o`: specify helm chart base path (default `./deployment)
+- `--docker-compose`: targets Docker Compose instead of Kubernetes (see details below)
 
 Build and deploy (deprecated, use Skaffold instead)
 - `--build`, `-b`: builds and pushes Docker images in the specified registry (if any)
@@ -70,7 +71,7 @@ harness-deployment cloud-harness . -d mydomain.dev.org -n mynamespace -e dev -r
 
 **Note: Docker registry**
 
-By default `skaffold` builds the images in the local Docker registry. In order to make the deploy work, we need to specify a 
+By default `skaffold` builds the images in the local Docker registry. In order to make the deploy work, we need to specify a
 registry that is visible from inside the cluster. The parameter `--registry` allows to specify a registry in which images are pushed after the build.
 Any public registry will work. The suggested way to go is to install a registry on localhost:5000 inside
 the kube cluster and push on that registry, also forwarded to localhost.
@@ -90,21 +91,21 @@ for instance with a Google Cloud cluster or a local Kubernetes like Minikube or
 1. Create the namespace `kubectl create ns ch`
 1. Build images and Install or upgrade the helm chart with `skaffold deploy`
 
-To build and reploy 
+To build and reploy
 
 ## Continuous deployment with Codefresh
 
 See [here](./codefresh.md).
 
 ## Relevant files and directory structure
-Deployment files are automatically generated with the script 
+Deployment files are automatically generated with the script
 `harness-deployment`.
 
 all the resources intended to install and deploy the platform on Kubernetes.
  - `codefresh`: codefresh build related files (automatically generated)
  - `deployment/helm`: the helm chart
 
-What this script does is to go through all the defined applications and use templates to define all the required 
+What this script does is to go through all the defined applications and use templates to define all the required
 definitions and variables.
 
 General templates are defined inside `deployment-configuration`.
@@ -116,7 +117,7 @@ Applications can override templates values by defining a file `values.yaml` in t
 The following deployment files are generated by `harness-deployment`:
 
 - Helm chart configuration for custom deployment: **./helm/values.yaml**
-- Codefresh build and deploment definition: **./codefresh/codefresh.yaml** 
+- Codefresh build and deploment definition: **./codefresh/codefresh.yaml**
 
 The script `harness-deployment` also generates a build script to be used by codefresh.
 
@@ -131,6 +132,43 @@ Things to notice:
 - A Helm chart was created under `deployment/helm` path to handle deployments.
 - To populate the generated file `deployment/helm/values.yaml` is used.
 
+## Docker compose target
+
+The Docker compose target, still in alpha stage, allows you to generate the adequate configuration to run all your services on docker compose.
+
+Not all features of the Kubernetes target are supported by this target.
+Currently, the Docker compose target supports:
+
+- generation of services and links/bindings between them
+- generation of volumes for the services
+- traefik configuration
+- databases (postgreql)
+- access gatekeepers configuration
+- secrets
+- dedicated Skaffold configuration
+
+The following deployment files are generated by `harness-deployment ... --docker-compose`:
+
+- Docker compose configuration: **deployemnt/docker-compose.yaml**
+- Configuration files for the services that needs to be mounted in each docker container: **deployment/resources/**
+- Skaffold configuration file for building the services images: **skaffold.yaml**
+
+The process to build and run the services in Docker compose is the following:
+
+1. generate the Skaffold and Docker compose configuration (option `--docker-compose` for `harness-deployment`)
+2. build the images for all the services using Skaffold
+3. run Docker compose
+
+Translated to the command line:
+
+```bash
+harmess-deployment ... --docker-compose  # replace ... by your options
+skaffold build
+cd deployment
+docker compose up  # or "docker-compose up" depending on your installation
+```
+
+
 ## Manual configurations
 
 - [Configure user accounts](../accounts.md)
@@ -141,5 +179,5 @@ In order to access the applications from your browser, set up your hosts file as
 
 Example: after running `harness-deployment -d mydomain.local -i samples`, set
 ```
-127.0.0.1  samples.mydomain.local workflows.mydomain.local events.mydomain.local argo.mydomain.local 
+127.0.0.1  samples.mydomain.local workflows.mydomain.local events.mydomain.local argo.mydomain.local
 ```

From 7ec48e15f2fdf5b3af7949c0c522087de88b20d9 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Wed, 27 Mar 2024 11:05:47 -0600
Subject: [PATCH 064/210] CH-100 Update documentation

---
 docs/build-deploy/README.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/build-deploy/README.md b/docs/build-deploy/README.md
index 03046971..c3b9b72f 100644
--- a/docs/build-deploy/README.md
+++ b/docs/build-deploy/README.md
@@ -46,7 +46,7 @@ Development parameters:
 
 Optional settings
 - `--output`, `-o`: specify helm chart base path (default `./deployment)
-- `--docker-compose`: targets Docker Compose instead of Kubernetes (see details below)
+- `--docker-compose`: targets Docker Compose instead of Kubernetes (see [details below](#docker-compose-target))
 
 Build and deploy (deprecated, use Skaffold instead)
 - `--build`, `-b`: builds and pushes Docker images in the specified registry (if any)
@@ -143,7 +143,7 @@ Currently, the Docker compose target supports:
 - generation of volumes for the services
 - traefik configuration
 - databases (postgreql)
-- access gatekeepers configuration
+- access gatekeepers configuration (Keycloak)
 - secrets
 - dedicated Skaffold configuration
 
@@ -168,6 +168,18 @@ cd deployment
 docker compose up  # or "docker-compose up" depending on your installation
 ```
 
+### Unsupported features
+
+There is still some features that are not supported by the Docker compose target.
+Some are planned, others will not be, or not in a form that is compatible with the original k8s target.
+
+Here is a list of the unsupported features at the moment:
+
+- certificates
+- Argo (will not be supported as Argo is a dedicated solution for k8s)
+- events through Kafka
+- NFS server
+- DB backups
 
 ## Manual configurations
 

From 7edfcc467e3ac61bd5f542b8544359d713d6e12b Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 27 Mar 2024 19:35:32 +0100
Subject: [PATCH 065/210] #CH-100 improve documentation

---
 .gitignore                          |  1 +
 README.md                           | 20 ++++----
 blueprint/.gitignore                |  2 +-
 docs/README.md                      |  1 +
 docs/build-deploy/README.md         | 48 ++----------------
 docs/build-deploy/docker-compose.md | 78 +++++++++++++++++++++++++++++
 docs/dev.md                         | 40 ++++++++++++++-
 7 files changed, 133 insertions(+), 57 deletions(-)
 create mode 100644 docs/build-deploy/docker-compose.md

diff --git a/.gitignore b/.gitignore
index 90f643c0..c6add695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ node_modules
 .coverage
 *.DS_Store
 deployment/helm
+deployment/compose
 *.egg-info
 *.idea
 /build
diff --git a/README.md b/README.md
index 46c1cdf2..cee34fbd 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 <img src="https://github.com/MetaCell/cloud-harness/blob/develop/cloudharness.png?raw=true" alt="drawing" width="200"/>
 </p>
 
-CloudHarness is a base infrastructure facilitator for microservice based applications deployed on Kubernetes and Docker Compose.
+CloudHarness is a base infrastructure facilitator for microservice based applications deployed primarily on Kubernetes.
 Can scaffold and maintain your cloud solution on top of Cloudharness without writing
 Kubernetes templates, with in place common utilities and applications already configured for you.
 
@@ -22,7 +22,7 @@ What building your cloud solution with CloudHarness gives to you:
     - traefik configuration
     - databases (postgreql)
     - access gatekeepers configuration
-    - secrets
+    - secrets and configmaps
   * Automatic build and push of images
   * REST-API scaffolding building based on OpenApi
   * Continuous deployment script generation
@@ -63,6 +63,7 @@ CloudHarness provides the following command line tools to help application scaff
 * `harness-application` - create a new CloudHarness REST application.
 * `harness-generate` - generates server and client code for all CloudHarness REST applications.
 * `harness-test` - run end to end tests
+  
 # Get started
 
 ## Prerequisites
@@ -137,13 +138,14 @@ To (re)generate the code for your applications, run `harness-generate` from the
 The script will look for all openapi applications, and regenerate the Flask server code and documentation.
 Note: the script will eventually override any manually modified file. To avoid that, define a file openapi-generator-ignore.
 
-# Extend CloudHarness to build your solution
-CloudHarness is born to be extended. In order to extend CloudHarness you just need to mirror the folder structure:
-* **applications**: place here your custom applications, or override default ones
-* **deployment-configuration**: override the helm chart default values and templates
-* **infrastructure**: define base images to use in your application
+# Extend CloudHarness to build your project
+
+CloudHarness is born to be extended. 
+
+The quickest way to start is to install Cloud Harness, copy the *blueprint* folder and build from that with the cli tools, such as
+`harness-application`, `harness-generate`, `harness-deployment`.
 
-or simply copy the *blueprint* folder.
+See the [developers documentation](docs/dev.md#start-your-project) for more information.
 
 # Build and deploy
 
@@ -154,7 +156,7 @@ Created artifacts include:
  - Visual Studio Code debug and run configuration
  - Codefresh pipeline yaml specification (optional)
 
-With your solution folder structure looking like
+With your project folder structure looking like
 
 ```
 applications
diff --git a/blueprint/.gitignore b/blueprint/.gitignore
index 0ea6b224..54e3e15f 100644
--- a/blueprint/.gitignore
+++ b/blueprint/.gitignore
@@ -2,7 +2,6 @@
 .idea
 *.iml
 node_modules
-mnp-custom
 .openapi-generator
 *.pyc
 .vscode
@@ -12,6 +11,7 @@ cloud-harness
 build
 skaffold.yaml
 /deployment.yaml
+/deployment/compose
 /.run/
 *.egg-info
 .overrides
diff --git a/docs/README.md b/docs/README.md
index b6a8087f..df93d935 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,6 +2,7 @@
 - [Create and run a deployment](./build-deploy/README.md)
   - [Create a codefresh continuous deployment](./build-deploy/codefresh.md)
   - [Configure the Helm chart](./build-deploy/helm-configuration.md)
+  - [Docker Compose target generation](./build-deploy/docker-compose.md)
   - [Set up environments](./build-deploy/environments.md)
   - [Work with local deployments](./build-deploy/local-deploy/README.md)
     - [Debug your applications](./build-deploy/local-deploy/debug.md)
diff --git a/docs/build-deploy/README.md b/docs/build-deploy/README.md
index c3b9b72f..4b1f4b99 100644
--- a/docs/build-deploy/README.md
+++ b/docs/build-deploy/README.md
@@ -134,52 +134,10 @@ Things to notice:
 
 ## Docker compose target
 
-The Docker compose target, still in alpha stage, allows you to generate the adequate configuration to run all your services on docker compose.
+Docker compose is partially supported as a deployment target as an alternative when Kubernetes
+is not available option or for local development.
 
-Not all features of the Kubernetes target are supported by this target.
-Currently, the Docker compose target supports:
-
-- generation of services and links/bindings between them
-- generation of volumes for the services
-- traefik configuration
-- databases (postgreql)
-- access gatekeepers configuration (Keycloak)
-- secrets
-- dedicated Skaffold configuration
-
-The following deployment files are generated by `harness-deployment ... --docker-compose`:
-
-- Docker compose configuration: **deployemnt/docker-compose.yaml**
-- Configuration files for the services that needs to be mounted in each docker container: **deployment/resources/**
-- Skaffold configuration file for building the services images: **skaffold.yaml**
-
-The process to build and run the services in Docker compose is the following:
-
-1. generate the Skaffold and Docker compose configuration (option `--docker-compose` for `harness-deployment`)
-2. build the images for all the services using Skaffold
-3. run Docker compose
-
-Translated to the command line:
-
-```bash
-harmess-deployment ... --docker-compose  # replace ... by your options
-skaffold build
-cd deployment
-docker compose up  # or "docker-compose up" depending on your installation
-```
-
-### Unsupported features
-
-There is still some features that are not supported by the Docker compose target.
-Some are planned, others will not be, or not in a form that is compatible with the original k8s target.
-
-Here is a list of the unsupported features at the moment:
-
-- certificates
-- Argo (will not be supported as Argo is a dedicated solution for k8s)
-- events through Kafka
-- NFS server
-- DB backups
+See [here](./docker-compose.md) for more information.
 
 ## Manual configurations
 
diff --git a/docs/build-deploy/docker-compose.md b/docs/build-deploy/docker-compose.md
new file mode 100644
index 00000000..361ae173
--- /dev/null
+++ b/docs/build-deploy/docker-compose.md
@@ -0,0 +1,78 @@
+# Docker compose target generation
+
+The Docker compose target, still in alpha stage, allows you to generate the base 
+configuration to run your services on docker compose.
+
+This feature is intended for limited and development purposes, so no all features of 
+the Kubernetes target are supported by this target.
+
+## How to use
+
+The process to build and run the services in Docker compose is the following:
+
+1. generate the Skaffold and Docker compose configuration (option `--docker-compose` for `harness-deployment`)
+2. build the images for all the services using Skaffold
+3. run Docker compose
+
+Translated to the command line:
+
+```bash
+harness-deployment ... --docker-compose  # replace ... by your options
+skaffold build
+cd deployment
+docker compose up  # or "docker-compose up" depending on your installation
+```
+
+
+## Supported features
+In general, the supported scope for docker compose services includes the ones that are automatically
+handled by Cloud Harness, hence:
+
+```yaml
+harness:
+  deployment:
+    auto: true 
+  service:
+    auto: true
+```
+Other custom Kubernetes templates are not included in the deployment.
+
+Currently, the Docker compose target supports:
+
+- generation of "auto" deployment/services (service and deployment bing to the same artifact in Docker)
+  - environmental variables
+  - links/bindings between services
+  - readiness/liveness probes as healthchecks
+  - Resources requests and limits controls
+  - replicas
+- generation of "auto" volumes and mounting on the services
+- resources (handled as configmaps in Kubernetes, handled as file mounts here)
+- reverse proxy (traefik configuration)
+- "auto" databases (postgresql)
+- secured: access gatekeepers configuration (Keycloak)
+- secrets (no encryption)
+
+The following deployment files are generated by `harness-deployment ... --docker-compose`:
+
+- Docker compose configuration: **deployment/docker-compose.yaml**
+- Configuration files for the services that needs to be mounted in each docker container: **deployment/compose/resources/**
+- Skaffold configuration file for building the services images: **skaffold.yaml**
+
+## Unsupported features
+
+There are still some features that are not supported by the Docker compose target.
+Some are planned, others will not be, or not in a form that is compatible with the original k8s target.
+
+Here is a list of the unsupported features at the moment that are in the roadmap:
+
+- TLS certificates
+- application proxy (use_services) specification
+- definition of custom compose templates
+- Events (through Kafka)
+- Jupyterhub
+
+These features are not currently in the roadmap for Docker compose
+- Unsupported Kubernetes features from Docker
+- NFS server
+- Workflows and tasks (will not be supported as Argo is a dedicated solution for k8s)
+- DB backups
\ No newline at end of file
diff --git a/docs/dev.md b/docs/dev.md
index 113e0c86..8871806e 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -4,6 +4,42 @@ This documentation is meant to be read by developers that needs to make modifica
 The goal of this doc is to show how CloudHarness is internally built, the different parts of the code/files that are relative to specific features, and to provide a map to be able to modify or implement new features quickly.
 
 CloudHarness is a project that allows you to: quickly generate the code of your webapp, considering that it runs in the cloud with a micro-service architecture, and to easily connect all those micro-services together to finally build the final app.
+
+## Prerequisites and installation
+
+This information is covered in the [main readme](../../README.md#prerequisites)
+
+## Start your project
+
+A Cloud Harness project can go to a simple service deployed on Kubernetes and so taking advantage of the 
+Helm Chart and CI/CD generation, to anything more structured using a mix of custom applications and
+applications that are built-in in Cloud Harness.
+
+The quickest way to start your project is to copy the **blueprint** directory from cloudharness somewhere and
+commit that to your repository and start building from that. 
+
+What the blueprint gives us is basically a mirror the folder structure that can be recognized by Cloud Harness:
+* **applications**: place here your custom applications, or override default ones
+* **deployment-configuration**: override the helm chart default values and templates
+* **infrastructure**: define base images to use in your application
+
+An initial workflow to start the first project with Cloud Harness can look like this:
+
+1. Copy blueprint to a *my-project* folder
+2. Commit push to a (git or any other) repository
+3. Clone cloud-harness inside it. Cloud harness can be placed anywhere and shared across different projects but it's easier to start our tutorials with this structure.
+4. Use `harness-application myapp` to create one service/application from one of the available templates.
+5. Play with the `applications/myapp/deploy/values.yaml` file to configure your deployment and add a database, a volume, or other applications as dependencies
+6. Use `harness-deployment cloud-harness . -i myapp` to start generating a deployment including your application and its dependencies
+7. Run locally with `skaffold dev`
+
+The above workflow based on an application template is a great place to get started, but anything can be deployed with Cloud Harness,
+including custom templates and even helm charts.
+
+The above workflow and more is covered in our [tutorials](./tutorials/).
+
+
+## Built-in applications and features
 Currently, the tools that CloudHarness can consider to build the final app are the following:
 
 * [OpenAPI](https://www.openapis.org/) for generating the model and API of your application (based on an OpenAPI specification),
@@ -14,8 +50,8 @@ Currently, the tools that CloudHarness can consider to build the final app are t
 * [JupyterHub](https://jupyter.org/hub) to provide jupyter notebooks access to a group of users,
 * [Volume Manager](../applications/volumemanager/) to deal with external file system,
 * [NFS Server](../applications/nfsserver/) to provide storage of file on an external NFS file system,
-* [Kubernete](https://kubernetes.io/) is used to manage the auto-scaling, deployements, ... of micro-services on a cluster,
-* [Code Fresh](https://codefresh.io/) for the remote build of the application, and it is configured to initiate a deployment on a remote Kubernete cluster,
+* [Kubernetes](https://kubernetes.io/) is used to manage the auto-scaling, deployements, ... of micro-services on a cluster,
+* [Codefresh](https://codefresh.io/) for the remote build of the application, and it is configured to initiate a deployment on a remote Kubernete cluster,
 * [Helm Chart](https://helm.sh/docs/topics/charts/) for the packaging of Kubernete resources to simplify the deployment of the application,
 * [Skaffold](https://skaffold.dev/) to help deploying the packaged application in a Kubernete cluster.
 

From e5d56b7fb6941020ddedb50341a908f78253b404 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 07:28:50 -0600
Subject: [PATCH 066/210] CH-100 First refactoring

---
 .../compose/templates/auto-compose.yaml       |   14 -
 .../ch_cli_tools/codefresh.py                 |   16 +-
 .../ch_cli_tools/configurationgenerator.py    |  654 ++++++++++
 .../ch_cli_tools/dockercompose.py             | 1138 ++++++++---------
 .../deployment-cli-tools/ch_cli_tools/helm.py | 1089 ++++++++--------
 .../tests/test_codefresh.py                   |    7 +-
 tools/deployment-cli-tools/tests/test_helm.py |   25 +-
 7 files changed, 1782 insertions(+), 1161 deletions(-)
 create mode 100644 tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 1302040e..ca024edd 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -27,9 +27,6 @@ services:
   {{- continue -}}
   {{- end -}}
   {{ $deployment :=  $app_config.harness.deployment }}
-  {{- if eq $app_name "nfsserver" }}
-  {{- include "nfsserver.deployment" $.Values | indent 2 }}
-  {{- end }}
   {{- $isSecured := (and $.Values.secured_gatekeepers ( and (hasKey $app_config "port") $app_config.harness.secured )) -}}
   {{ if $isSecured }}
 
@@ -213,10 +210,6 @@ volumes:
   {{- break }}
   {{- end }}
   {{- with $app_config.harness.database }}
-volumes:
-  {{- break }}
-  {{- end }}
-  {{- if eq $app_name "nfsserver" }}
 volumes:
   {{- break }}
   {{- end }}
@@ -231,11 +224,4 @@ volumes:
   dshm-{{ .name }}:
   {{- end }}
   {{- end }}
-  {{- if eq $app_name "nfsserver" }}
-  {{ $app_config.nfs.volumeName }}:
-    # driver_opts:
-    #  type: "nfs"
-    #  o: "{{ join "," $app_config.nfs.mountOptions }}"
-    #  device: ":{{ $app_config.nfs.path }}"
-  {{- end }}
 {{- end }}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
index c4b7dd26..bb4b8434 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
@@ -11,7 +11,7 @@
 from cloudharness_utils.testing.util import get_app_environment
 from .models import HarnessMainConfig, ApplicationTestConfig, ApplicationHarnessConfig
 from cloudharness_utils.constants import *
-from .helm import KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, generate_tag_from_content
+from .configurationgenerator import KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES
 from .utils import check_docker_manifest_exists, 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, clean_path
 from cloudharness_utils.testing.api import get_api_filename, get_schemathesis_command, get_urls_from_api_file
@@ -74,7 +74,7 @@ def check_image_exists(name, image):
         else:
             env[app_specific_tag_variable(name) + "_NEW"] = 1
 
-    
+
 
     for app in helm_values.apps.values():
         if app.harness and app.harness.deployment.image:
@@ -128,7 +128,7 @@ def create_codefresh_deployment_scripts(root_paths, envs=(), include=(), exclude
 
     for root_path in root_paths:
         for e in envs:
-            
+
             template_name = f"codefresh-template-{e}.yaml"
             template_path = join(
                 root_path, DEPLOYMENT_CONFIGURATION_PATH, template_name)
@@ -245,7 +245,7 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
                                     clean_path(dockerfile_relative_to_root), app_name),
                                 environment=e2e_test_environment(app_config)
                             )
-            
+
 
             def add_unit_test_step(app_config: ApplicationHarnessConfig):
                 # Create a run step for each application with tests/unit.yaml file using the corresponding image built at the previous step
@@ -280,7 +280,7 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
                 codefresh_steps_from_base_path(join(
                     root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False)
                 steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
-   
+
     if not codefresh:
         logging.warning(
             "No template file found. Codefresh script not created.")
@@ -420,7 +420,7 @@ def codefresh_app_build_spec(app_name, app_context_path, dockerfile_path="Docker
         title=title,
         working_directory='./' + app_context_path,
         dockerfile=dockerfile_path)
-    
+
     tag = app_specific_tag_variable(app_name)
     build["tag"] = "${{%s}}" % tag
 
@@ -450,7 +450,7 @@ def add_arg_dependencies(dependencies):
                 helm_values.apps[values_key].harness.dependencies.build)
         except (KeyError, AttributeError):
             add_arg_dependencies(helm_values['task-images'])
-    
+
     when_condition = existing_build_when_condition(tag)
     build["when"] = when_condition
     return build
@@ -471,5 +471,5 @@ def existing_build_when_condition(tag):
             }
         }
     }
-    
+
     return when_condition
diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
new file mode 100644
index 00000000..9a445456
--- /dev/null
+++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
@@ -0,0 +1,654 @@
+"""
+Utilities to create a helm chart from a CloudHarness directory structure
+"""
+import yaml
+from ruamel.yaml import YAML
+import os
+import shutil
+import logging
+from hashlib import sha1
+import subprocess
+from functools import cache
+import tarfile
+from docker import from_env as DockerClient
+from pathlib import Path
+import copy
+
+
+from . import HERE, CH_ROOT
+from cloudharness_utils.constants import TEST_IMAGES_PATH, VALUES_MANUAL_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
+    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH, COMPOSE
+from .utils import get_cluster_ip, get_image_name, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
+    get_template, merge_configuration_directories, merge_to_yaml_file, dict_merge, app_name_from_path, \
+    find_dockerfiles_paths, find_file_paths
+
+from .models import HarnessMainConfig
+
+
+KEY_HARNESS = 'harness'
+KEY_SERVICE = 'service'
+KEY_DATABASE = 'database'
+KEY_DEPLOYMENT = 'deployment'
+KEY_APPS = 'apps'
+KEY_TASK_IMAGES = 'task-images'
+# KEY_TASK_IMAGES_BUILD = f"{KEY_TASK_IMAGES}-build"
+KEY_TEST_IMAGES = 'test-images'
+
+DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
+
+
+class ConfigurationGenerator(object):
+    def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+                 output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
+                 namespace=None, templates_path=HELM_PATH):
+        assert domain, 'A domain must be specified'
+        self.root_paths = [Path(r) for r in root_paths]
+        self.tag = tag
+        if registry and not registry.endswith('/'):
+            self.registry = f'{registry}/'
+        else:
+            self.registry = registry
+        self.local = local
+        self.domain = domain
+        self.exclude = exclude
+        self.secured = secured
+        self.output_path = Path(output_path)
+        self.include = include
+        self.registry_secret = registry_secret
+        self.tls = tls
+        self.env = env
+        self.namespace = namespace
+
+        self.templates_path = templates_path
+        self.dest_deployment_path = self.output_path / templates_path
+        self.helm_chart_path = self.dest_deployment_path / 'Chart.yaml'
+        self.__init_deployment()
+
+        self.static_images = set()
+        self.base_images = {}
+        self.all_images = {}
+
+    def __init_deployment(self):
+        """
+        Create the base helm chart
+        """
+        if self.dest_deployment_path.exists():
+            shutil.rmtree(self.dest_deployment_path)
+        # Initialize with default
+        copy_merge_base_deployment(self.dest_deployment_path, Path(CH_ROOT) / DEPLOYMENT_CONFIGURATION_PATH / self.templates_path)
+
+        # Override for every cloudharness scaffolding
+        for root_path in self.root_paths:
+            copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
+                                       base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH /self.templates_path)
+            collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
+                                        dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
+
+    def _adjust_missing_values(self, helm_values):
+        if 'name' not in helm_values:
+            with open(self.helm_chart_path) as f:
+                chart_idx_content = yaml.safe_load(f)
+            helm_values['name'] = chart_idx_content['name'].lower()
+
+    def _process_applications(self, helm_values, base_image_name):
+        for root_path in self.root_paths:
+            app_values = init_app_values(
+                root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
+            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+                                               app_values)
+
+            app_base_path = root_path / APPS_PATH
+            app_values = self.collect_app_values(
+                app_base_path, base_image_name=base_image_name)
+            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+                                               app_values)
+
+    def collect_app_values(self, app_base_path, base_image_name=None):
+        values = {}
+
+        for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
+            app_name = app_name_from_path(f"{app_path.relative_to(app_base_path)}")
+
+            if app_name in self.exclude:
+                continue
+            app_key = app_name.replace('-', '_')
+
+            app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
+
+            # dockerfile_path = next(app_path.rglob('**/Dockerfile'), None)
+            # # for dockerfile_path in app_path.rglob('**/Dockerfile'):
+            # #     parent_name = dockerfile_path.parent.name.replace("-", "_")
+            # #     if parent_name == app_key:
+            # #         app_values['build'] = {
+            # #             # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
+            # #             'dockerfile': "Dockerfile",
+            # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+            # #         }
+            # #     elif "tasks/" in f"{dockerfile_path}":
+            # #         parent_name = parent_name.upper()
+            # #         values.setdefault("task-images-build", {})[parent_name] = {
+            # #             'dockerfile': "Dockerfile",
+            # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+            # #         }
+            # #         import ipdb; ipdb.set_trace()  # fmt: skip
+
+            # if dockerfile_path:
+            #     app_values['build'] = {
+            #         # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
+            #         'dockerfile': "Dockerfile",
+            #         'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+            #     }
+
+            values[app_key] = dict_merge(
+                values[app_key], app_values) if app_key in values else app_values
+
+        return values
+
+    def _init_static_images(self, base_image_name):
+        for static_img_dockerfile in self.static_images:
+            img_name = image_name_from_dockerfile_path(os.path.basename(
+                static_img_dockerfile), base_name=base_image_name)
+            self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
+                img_name, build_context_path=static_img_dockerfile)
+
+    def _assign_static_build_dependencies(self, helm_values):
+        for static_img_dockerfile in self.static_images:
+            key = os.path.basename(static_img_dockerfile)
+            if key in helm_values[KEY_TASK_IMAGES]:
+                dependencies = guess_build_dependencies_from_dockerfile(
+                    f"{static_img_dockerfile}")
+                for dep in dependencies:
+                    if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
+                        helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
+                        # helm_values.setdefault(KEY_TASK_IMAGES_BUILD, {})[dep] = {
+                        #     'context': os.path.relpath(static_img_dockerfile, self.dest_deployment_path.parent),
+                        #     'dockerfile': 'Dockerfile',
+                        # }
+
+        for image_name in list(helm_values[KEY_TASK_IMAGES].keys()):
+            if image_name in self.exclude:
+                del helm_values[KEY_TASK_IMAGES][image_name]
+                # del helm_values[KEY_TASK_IMAGES_BUILD][image_name]
+
+    def _init_base_images(self, base_image_name):
+
+        for root_path in self.root_paths:
+            for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
+                img_name = image_name_from_dockerfile_path(
+                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
+                self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+                    img_name, build_context_path=root_path)
+
+            self.static_images.update(find_dockerfiles_paths(
+                os.path.join(root_path, STATIC_IMAGES_PATH)))
+        return self.base_images
+
+    def _init_test_images(self, base_image_name):
+        test_images = {}
+        for root_path in self.root_paths:
+            for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
+                img_name = image_name_from_dockerfile_path(
+                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
+                test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+                    img_name, build_context_path=base_img_dockerfile)
+
+        return test_images
+
+    def __find_static_dockerfile_paths(self, root_path):
+        return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
+
+    def _merge_base_helm_values(self, helm_values):
+        # Override for every cloudharness scaffolding
+        for root_path in self.root_paths:
+            helm_values = dict_merge(
+                helm_values,
+                collect_helm_values(root_path, env=self.env)
+            )
+
+        return helm_values
+
+    def _get_default_helm_values(self):
+        ch_root_path = Path(CH_ROOT)
+        values_yaml_path = ch_root_path / DEPLOYMENT_CONFIGURATION_PATH / HELM_PATH / 'values.yaml'
+        helm_values = get_template(values_yaml_path)
+        helm_values = dict_merge(helm_values,
+                                 collect_helm_values(ch_root_path, env=self.env))
+
+        return helm_values
+
+    def create_tls_certificate(self, helm_values):
+        if not self.tls:
+            helm_values['tls'] = None
+            return
+        if not self.local:
+            return
+        helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
+
+        bootstrap_file = 'bootstrap.sh'
+        certs_parent_folder_path = self.output_path / 'helm' / 'resources'
+        certs_folder_path = certs_parent_folder_path / 'certs'
+
+        # if os.path.exists(os.path.join(certs_folder_path)):
+        if certs_folder_path.exists():
+            # don't overwrite the certificate if it exists
+            return
+
+        try:
+            client = DockerClient()
+            client.ping()
+        except:
+            raise ConnectionRefusedError(
+                '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
+
+        # Create CA and sign cert for domain
+        container = client.containers.run(image='frapsoft/openssl',
+                                          command=f'sleep 60',
+                                          entrypoint="",
+                                          detach=True,
+                                          environment=[
+                                              f"DOMAIN={self.domain}"],
+                                          )
+
+        container.exec_run('mkdir -p /mnt/vol1')
+        container.exec_run('mkdir -p /mnt/certs')
+
+        # copy bootstrap file
+        cur_dir = os.getcwd()
+        os.chdir(Path(HERE) / 'scripts')
+        tar = tarfile.open(bootstrap_file + '.tar', mode='w')
+        try:
+            tar.add(bootstrap_file)
+        finally:
+            tar.close()
+        data = open(bootstrap_file + '.tar', 'rb').read()
+        container.put_archive('/mnt/vol1', data)
+        os.chdir(cur_dir)
+        container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
+
+        # exec bootstrap file
+        container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
+
+        # retrieve the certs from the container
+        bits, stat = container.get_archive('/mnt/certs')
+        if not certs_folder_path.exists():
+            certs_folder_path.mkdir(parents=True)
+        certs_tar = certs_parent_folder_path / 'certs.tar'
+        with open(certs_tar, 'wb') as f:
+            for chunk in bits:
+                f.write(chunk)
+        cf = tarfile.open(certs_tar)
+        cf.extractall(path=certs_parent_folder_path)
+
+        logs = container.logs()
+        logging.info(f'openssl container logs: {logs}')
+
+        # stop the container
+        container.kill()
+
+        logging.info("Created certificates for local deployment")
+
+    def _clear_unused_db_configuration(self, harness_config):
+        database_config = harness_config[KEY_DATABASE]
+        database_type = database_config.get('type', None)
+        if database_type is None:
+            del harness_config[KEY_DATABASE]
+            return
+        db_specific_keys = [k for k, v in database_config.items()
+                            if isinstance(v, dict) and 'image' in v and 'ports' in v]
+        for db in db_specific_keys:
+            if database_type != db:
+                del database_config[db]
+
+    def image_tag(self, image_name, build_context_path=None, dependencies=()):
+        tag = self.tag
+        if tag is None and not self.local:
+            logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
+            ignore_path = os.path.join(build_context_path, '.dockerignore')
+            ignore = set(DEFAULT_IGNORE)
+            if os.path.exists(ignore_path):
+                with open(ignore_path) as f:
+                    ignore = ignore.union({line.strip() for line in f})
+            logging.info(f"Ignoring {ignore}")
+            tag = generate_tag_from_content(build_context_path, ignore)
+            logging.info(f"Content hash: {tag}")
+            dependencies = dependencies or guess_build_dependencies_from_dockerfile(f"{build_context_path}")
+            tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
+            logging.info(f"Generated tag: {tag}")
+            app_name = image_name.split("/")[-1] # the image name can have a prefix
+            self.all_images[app_name] = tag
+        return self.registry + image_name + (f':{tag}' if tag else '')
+
+
+def get_included_with_dependencies(values, include):
+    app_values = values['apps'].values()
+    directly_included = [app for app in app_values if any(
+        inc == app[KEY_HARNESS]['name'] for inc in include)]
+
+    dependent = set(include)
+    for app in directly_included:
+        if app['harness']['dependencies'].get('hard', None):
+            dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
+        if app['harness']['dependencies'].get('soft', None):
+            dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
+        if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
+            dependent.add('accounts')
+    if len(dependent) == len(include):
+        return dependent
+    return get_included_with_dependencies(values, dependent)
+
+
+def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
+    pass
+
+
+def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
+    if not base_helm_chart.exists():
+        return
+    if dest_helm_chart_path.exists():
+        logging.info("Merging/overriding all files in directory %s",
+                    dest_helm_chart_path)
+        merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
+    else:
+        logging.info("Copying base deployment chart from %s to %s",
+                    base_helm_chart, dest_helm_chart_path)
+        shutil.copytree(base_helm_chart, dest_helm_chart_path)
+
+
+def collect_helm_values(deployment_root, env=()):
+    """
+    Creates helm values from a cloudharness deployment scaffolding
+    """
+    values_template_path = deployment_root / DEPLOYMENT_CONFIGURATION_PATH / 'values-template.yaml'
+
+    values = get_template(values_template_path)
+
+    for e in env:
+        specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
+                                            f'values-template-{e}.yaml')
+        if os.path.exists(specific_template_path):
+            logging.info(
+                "Specific environment values template found: " + specific_template_path)
+            with open(specific_template_path) as f:
+                values_env_specific = yaml.safe_load(f)
+            values = dict_merge(values, values_env_specific)
+    return values
+
+
+def init_app_values(deployment_root, exclude, values=None):
+    values = values if values is not None else {}
+    app_base_path = os.path.join(deployment_root, APPS_PATH)
+    overridden_template_path = os.path.join(
+        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+    default_values_path = os.path.join(
+        CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+
+    for app_path in get_sub_paths(app_base_path):
+
+        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+
+        if app_name in exclude:
+            continue
+        app_key = app_name.replace('-', '_')
+        if app_key not in values:
+            default_values = get_template(default_values_path)
+            values[app_key] = default_values
+        overridden_defaults = get_template(overridden_template_path)
+        values[app_key] = dict_merge(values[app_key], overridden_defaults)
+
+    return values
+
+
+def values_from_legacy(values):
+    if KEY_HARNESS not in values:
+        values[KEY_HARNESS] = {}
+    harness = values[KEY_HARNESS]
+    if KEY_SERVICE not in harness:
+        harness[KEY_SERVICE] = {}
+    if KEY_DEPLOYMENT not in harness:
+        harness[KEY_DEPLOYMENT] = {}
+    if KEY_DATABASE not in harness:
+        harness[KEY_DATABASE] = {}
+
+    if 'subdomain' in values:
+        harness['subdomain'] = values['subdomain']
+    if 'autodeploy' in values:
+        harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
+    if 'autoservice' in values:
+        harness[KEY_SERVICE]['auto'] = values['autoservice']
+    if 'secureme' in values:
+        harness['secured'] = values['secureme']
+    if 'resources' in values:
+        harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
+    if 'replicas' in values:
+        harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
+    if 'image' in values:
+        harness[KEY_DEPLOYMENT]['image'] = values['image']
+    if 'port' in values:
+        harness[KEY_DEPLOYMENT]['port'] = values['port']
+        harness[KEY_SERVICE]['port'] = values['port']
+
+
+def values_set_legacy(values):
+    harness = values[KEY_HARNESS]
+    if 'image' in harness[KEY_DEPLOYMENT]:
+        values['image'] = harness[KEY_DEPLOYMENT]['image']
+
+    values['name'] = harness['name']
+    if harness[KEY_DEPLOYMENT].get('port', None):
+        values['port'] = harness[KEY_DEPLOYMENT]['port']
+    if 'resources' in harness[KEY_DEPLOYMENT]:
+        values['resources'] = harness[KEY_DEPLOYMENT]['resources']
+
+
+def generate_tag_from_content(content_path, ignore=()):
+    from dirhash import dirhash
+    return dirhash(content_path, 'sha1', ignore=ignore)
+
+
+def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
+    if isinstance(values, dict):
+        newenvs = list(envs)
+        for key, value in values.items():
+            v = extract_env_variables_from_values(
+                value, envs, f"{prefix}_{key}".replace('-', '_').upper())
+            if key in ('name', 'port', 'subdomain'):
+                newenvs.extend(v)
+        return newenvs
+    else:
+        return [env_variable(prefix, values)]
+
+
+def create_env_variables(values):
+    for app_name, value in values[KEY_APPS].items():
+        if KEY_HARNESS in value:
+            values['env'].extend(extract_env_variables_from_values(
+                value[KEY_HARNESS], prefix='CH_' + app_name))
+    values['env'].append(env_variable('CH_DOMAIN', values['domain']))
+    values['env'].append(env_variable(
+        'CH_IMAGE_REGISTRY', values['registry']['name']))
+    values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
+
+
+def hosts_info(values):
+    domain = values['domain']
+    namespace = values['namespace']
+    subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
+                  KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
+                                                                           KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
+    try:
+        ip = get_cluster_ip()
+    except:
+        logging.warning('Cannot get cluster ip')
+        return
+    logging.info(
+        "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
+
+    deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
+                   for app in values[KEY_APPS].values() if KEY_HARNESS in app)
+
+    logging.info(
+        "\nTo run locally some apps, also those references may be needed")
+    for appname in values[KEY_APPS]:
+        app = values[KEY_APPS][appname]['harness']
+        if 'deployment' not in app:
+            continue
+        print(
+            "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
+                app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
+
+    print(
+        f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
+
+
+class ValuesValidationException(Exception):
+    pass
+
+
+def validate_helm_values(values):
+    validate_dependencies(values)
+
+
+def validate_dependencies(values):
+    all_apps = {a for a in values["apps"]}
+    for app in all_apps:
+        app_values = values["apps"][app]
+        if 'dependencies' in app_values[KEY_HARNESS]:
+            soft_dependencies = {
+                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
+            not_found = {d for d in soft_dependencies if d not in all_apps}
+            if not_found:
+                logging.warning(
+                    f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
+            hard_dependencies = {
+                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
+            not_found = {d for d in hard_dependencies if d not in all_apps}
+            if not_found:
+                raise ValuesValidationException(
+                    f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
+
+            build_dependencies = {
+                d for d in app_values[KEY_HARNESS]['dependencies']['build']}
+
+            not_found = {
+                d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
+            not_found = {d for d in not_found if d not in all_apps}
+            if not_found:
+                raise ValuesValidationException(
+                    f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
+
+        if 'use_services' in app_values[KEY_HARNESS]:
+            service_dependencies = {d['name'].replace(
+                "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
+
+            not_found = {d for d in service_dependencies if d not in all_apps}
+            if not_found:
+                raise ValuesValidationException(
+                    f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
+
+
+def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_path=HELM_PATH, exclude=(), include=None):
+    """
+    Searches recursively for helm templates inside the applications and collects the templates in the destination
+
+    :param search_root:
+    :param dest_helm_chart_path: collected helm templates destination folder
+    :param exclude:
+    :return:
+    """
+    app_base_path = search_root / APPS_PATH
+
+    for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
+        app_name = app_name_from_path(os.path.relpath(f"{app_path}", app_base_path))
+        if app_name in exclude or (include and not any(inc in app_name for inc in include)):
+            continue
+        if templates_path == HELM_PATH:
+            template_dir = app_path / 'deploy' / 'templates'
+        else:
+            template_dir = app_path / 'deploy' / f'templates-{templates_path}'
+        if template_dir.exists():
+            dest_dir = dest_helm_chart_path / 'templates' / app_name
+
+            logging.info(
+                "Collecting templates for application %s to %s", app_name, dest_dir)
+            if dest_dir.exists():
+                logging.warning(
+                    "Merging/overriding all files in directory %s", dest_dir)
+                merge_configuration_directories(f"{template_dir}", f"{dest_dir}")
+            else:
+                shutil.copytree(template_dir, dest_dir)
+        resources_dir = app_path / 'deploy' / 'resources'
+        if resources_dir.exists():
+            dest_dir = dest_helm_chart_path / 'resources' / app_name
+
+            logging.info(
+                "Collecting resources for application  %s to %s", app_name, dest_dir)
+
+            merge_configuration_directories(f"{resources_dir}", f"{dest_dir}")
+
+        if templates_path == HELM_PATH:
+            subchart_dir = app_path / 'deploy/charts'
+            if subchart_dir.exists():
+                dest_dir = dest_helm_chart_path / 'charts' / app_name
+
+                logging.info(
+                    "Collecting templates for application %s to %s", app_name, dest_dir)
+                if dest_dir.exists():
+                    logging.warning(
+                        "Merging/overriding all files in directory %s", dest_dir)
+                    merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
+                else:
+                    shutil.copytree(subchart_dir, dest_dir)
+
+
+# def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_path=None, exclude=(), include=None):
+#     """
+#     Searches recursively for helm templates inside the applications and collects the templates in the destination
+
+#     :param search_root:
+#     :param dest_helm_chart_path: collected helm templates destination folder
+#     :param exclude:
+#     :return:
+#     """
+#     app_base_path = os.path.join(search_root, APPS_PATH)
+
+#     import ipdb; ipdb.set_trace()  # fmt: skip
+
+#     for app_path in get_sub_paths(app_base_path):
+#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+#         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
+#             continue
+#         template_dir = os.path.join(app_path, 'deploy', 'templates')
+#         if os.path.exists(template_dir):
+#             dest_dir = os.path.join(
+#                 dest_helm_chart_path, 'templates', app_name)
+
+#             logging.info(
+#                 "Collecting templates for application %s to %s", app_name, dest_dir)
+#             if os.path.exists(dest_dir):
+#                 logging.warning(
+#                     "Merging/overriding all files in directory %s", dest_dir)
+#                 merge_configuration_directories(template_dir, dest_dir)
+#             else:
+#                 shutil.copytree(template_dir, dest_dir)
+#         resources_dir = os.path.join(app_path, 'deploy/resources')
+#         if os.path.exists(resources_dir):
+#             dest_dir = os.path.join(
+#                 dest_helm_chart_path, 'resources', app_name)
+
+#             logging.info(
+#                 "Collecting resources for application  %s to %s", app_name, dest_dir)
+
+#             merge_configuration_directories(resources_dir, dest_dir)
+
+#         subchart_dir = os.path.join(app_path, 'deploy/charts')
+#         if os.path.exists(subchart_dir):
+#             dest_dir = os.path.join(dest_helm_chart_path, 'charts', app_name)
+
+#             logging.info(
+#                 "Collecting templates for application %s to %s", app_name, dest_dir)
+#             if os.path.exists(dest_dir):
+#                 logging.warning(
+#                     "Merging/overriding all files in directory %s", dest_dir)
+#                 merge_configuration_directories(subchart_dir, dest_dir)
+#             else:
+#                 shutil.copytree(subchart_dir, dest_dir)
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index bafe5a00..0e75ed7e 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -24,89 +24,81 @@
 
 from .models import HarnessMainConfig
 
-KEY_HARNESS = 'harness'
-KEY_SERVICE = 'service'
-KEY_DATABASE = 'database'
-KEY_DEPLOYMENT = 'deployment'
-KEY_APPS = 'apps'
-KEY_TASK_IMAGES = 'task-images'
-# KEY_TASK_IMAGES_BUILD = f"{KEY_TASK_IMAGES}-build"
-KEY_TEST_IMAGES = 'test-images'
+from .configurationgenerator import ConfigurationGenerator, validate_helm_values, KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates
 
-DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
 
 def create_docker_compose_configuration(root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                       namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:
         env = [env]
-    return CloudHarnessHelm(root_paths, tag=tag, registry=registry, local=local, domain=domain, exclude=exclude, secured=secured,
+    return CloudHarnessDockerCompose(root_paths, tag=tag, registry=registry, local=local, domain=domain, exclude=exclude, secured=secured,
                             output_path=output_path, include=include, registry_secret=registry_secret, tls=tls, env=env,
                             namespace=namespace, templates_path=COMPOSE).process_values()
 
 
-class CloudHarnessHelm:
-    def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
-                 output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-                 namespace=None, templates_path=HELM_PATH):
-        assert domain, 'A domain must be specified'
-        self.root_paths = [Path(r) for r in root_paths]
-        self.tag = tag
-        if registry and not registry.endswith('/'):
-            self.registry = f'{registry}/'
-        else:
-            self.registry = registry
-        self.local = local
-        self.domain = domain
-        self.exclude = exclude
-        self.secured = secured
-        self.output_path = Path(output_path)
-        self.include = include
-        self.registry_secret = registry_secret
-        self.tls = tls
-        self.env = env
-        self.namespace = namespace
-
-        self.templates_path = templates_path
-        self.dest_deployment_path = self.output_path / templates_path
-        self.helm_chart_path = self.dest_deployment_path / 'Chart.yaml'
-        self.__init_deployment()
-
-        self.static_images = set()
-        self.base_images = {}
-        self.all_images = {}
-
-    def __init_deployment(self):
-        """
-        Create the base helm chart
-        """
-        if self.dest_deployment_path.exists():
-            shutil.rmtree(self.dest_deployment_path)
-        # Initialize with default
-        copy_merge_base_deployment(self.dest_deployment_path, Path(CH_ROOT) / DEPLOYMENT_CONFIGURATION_PATH / self.templates_path)
-
-        # Override for every cloudharness scaffolding
-        for root_path in self.root_paths:
-            copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
-                                       base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH /self.templates_path)
-            collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
-                                        dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
-
-    def __adjust_missing_values(self, helm_values):
-        if 'name' not in helm_values:
-            with open(self.helm_chart_path) as f:
-                chart_idx_content = yaml.safe_load(f)
-            helm_values['name'] = chart_idx_content['name'].lower()
+class CloudHarnessDockerCompose(ConfigurationGenerator):
+    # def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+    #              output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
+    #              namespace=None, templates_path=HELM_PATH):
+    #     assert domain, 'A domain must be specified'
+    #     self.root_paths = [Path(r) for r in root_paths]
+    #     self.tag = tag
+    #     if registry and not registry.endswith('/'):
+    #         self.registry = f'{registry}/'
+    #     else:
+    #         self.registry = registry
+    #     self.local = local
+    #     self.domain = domain
+    #     self.exclude = exclude
+    #     self.secured = secured
+    #     self.output_path = Path(output_path)
+    #     self.include = include
+    #     self.registry_secret = registry_secret
+    #     self.tls = tls
+    #     self.env = env
+    #     self.namespace = namespace
+
+    #     self.templates_path = templates_path
+    #     self.dest_deployment_path = self.output_path / templates_path
+    #     self.helm_chart_path = self.dest_deployment_path / 'Chart.yaml'
+    #     self.__init_deployment()
+
+    #     self.static_images = set()
+    #     self.base_images = {}
+    #     self.all_images = {}
+
+    # def __init_deployment(self):
+    #     """
+    #     Create the base helm chart
+    #     """
+    #     if self.dest_deployment_path.exists():
+    #         shutil.rmtree(self.dest_deployment_path)
+    #     # Initialize with default
+    #     copy_merge_base_deployment(self.dest_deployment_path, Path(CH_ROOT) / DEPLOYMENT_CONFIGURATION_PATH / self.templates_path)
+
+    #     # Override for every cloudharness scaffolding
+    #     for root_path in self.root_paths:
+    #         copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
+    #                                    base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH /self.templates_path)
+    #         collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
+    #                                     dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
+
+    # def __adjust_missing_values(self, helm_values):
+    #     if 'name' not in helm_values:
+    #         with open(self.helm_chart_path) as f:
+    #             chart_idx_content = yaml.safe_load(f)
+    #         helm_values['name'] = chart_idx_content['name'].lower()
 
     def process_values(self) -> HarnessMainConfig:
         """
         Creates values file for the helm chart
         """
-        helm_values = self.__get_default_helm_values()
+        helm_values = self._get_default_helm_values()
 
-        self.__adjust_missing_values(helm_values)
+        self._adjust_missing_values(helm_values)
 
-        helm_values = self.__merge_base_helm_values(helm_values)
+        helm_values = self._merge_base_helm_values(helm_values)
 
         helm_values[KEY_APPS] = {}
 
@@ -114,18 +106,18 @@ def process_values(self) -> HarnessMainConfig:
 
         helm_values[KEY_TASK_IMAGES] = {}
 
-        self.__init_base_images(base_image_name)
-        self.__init_static_images(base_image_name)
-        helm_values[KEY_TEST_IMAGES] = self.__init_test_images(base_image_name)
+        self._init_base_images(base_image_name)
+        self._init_static_images(base_image_name)
+        helm_values[KEY_TEST_IMAGES] = self._init_test_images(base_image_name)
 
-        self.__process_applications(helm_values, base_image_name)
+        self._process_applications(helm_values, base_image_name)
 
         # self.create_tls_certificate(helm_values)
 
         values, include = self.__finish_helm_values(values=helm_values)
 
         # Adjust dependencies from static (common) images
-        self.__assign_static_build_dependencies(helm_values)
+        self._assign_static_build_dependencies(helm_values)
 
         for root_path in self.root_paths:
             collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
@@ -184,132 +176,132 @@ def __post_process_multiple_document_docker_compose(self, yaml_document):
                 main_document = document  # we need to save the main document later
         yaml_handler.dump(main_document, yaml_document)
 
-    def __process_applications(self, helm_values, base_image_name):
-        for root_path in self.root_paths:
-            app_values = init_app_values(
-                root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
-            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-                                               app_values)
-
-            app_base_path = root_path / APPS_PATH
-            app_values = self.collect_app_values(
-                app_base_path, base_image_name=base_image_name)
-            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-                                               app_values)
-
-    def collect_app_values(self, app_base_path, base_image_name=None):
-        values = {}
-
-        for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
-            app_name = app_name_from_path(f"{app_path.relative_to(app_base_path)}")
-
-            if app_name in self.exclude:
-                continue
-            app_key = app_name.replace('-', '_')
-
-            app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
-
-            # dockerfile_path = next(app_path.rglob('**/Dockerfile'), None)
-            # # for dockerfile_path in app_path.rglob('**/Dockerfile'):
-            # #     parent_name = dockerfile_path.parent.name.replace("-", "_")
-            # #     if parent_name == app_key:
-            # #         app_values['build'] = {
-            # #             # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
-            # #             'dockerfile': "Dockerfile",
-            # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
-            # #         }
-            # #     elif "tasks/" in f"{dockerfile_path}":
-            # #         parent_name = parent_name.upper()
-            # #         values.setdefault("task-images-build", {})[parent_name] = {
-            # #             'dockerfile': "Dockerfile",
-            # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
-            # #         }
-            # #         import ipdb; ipdb.set_trace()  # fmt: skip
-
-            # if dockerfile_path:
-            #     app_values['build'] = {
-            #         # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
-            #         'dockerfile': "Dockerfile",
-            #         'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
-            #     }
-
-            values[app_key] = dict_merge(
-                values[app_key], app_values) if app_key in values else app_values
-
-        return values
-
-    def __init_static_images(self, base_image_name):
-        for static_img_dockerfile in self.static_images:
-            img_name = image_name_from_dockerfile_path(os.path.basename(
-                static_img_dockerfile), base_name=base_image_name)
-            self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
-                img_name, build_context_path=static_img_dockerfile)
-
-    def __assign_static_build_dependencies(self, helm_values):
-        for static_img_dockerfile in self.static_images:
-            key = os.path.basename(static_img_dockerfile)
-            if key in helm_values[KEY_TASK_IMAGES]:
-                dependencies = guess_build_dependencies_from_dockerfile(
-                    static_img_dockerfile)
-                for dep in dependencies:
-                    if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
-                        helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
-                        # helm_values.setdefault(KEY_TASK_IMAGES_BUILD, {})[dep] = {
-                        #     'context': os.path.relpath(static_img_dockerfile, self.dest_deployment_path.parent),
-                        #     'dockerfile': 'Dockerfile',
-                        # }
-
-        for image_name in helm_values[KEY_TASK_IMAGES].keys():
-            if image_name in self.exclude:
-                del helm_values[KEY_TASK_IMAGES][image_name]
-                # del helm_values[KEY_TASK_IMAGES_BUILD][image_name]
-
-    def __init_base_images(self, base_image_name):
-
-        for root_path in self.root_paths:
-            for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
-                img_name = image_name_from_dockerfile_path(
-                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
-                self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-                    img_name, build_context_path=root_path)
-
-            self.static_images.update(find_dockerfiles_paths(
-                os.path.join(root_path, STATIC_IMAGES_PATH)))
-        return self.base_images
-
-    def __init_test_images(self, base_image_name):
-        test_images = {}
-        for root_path in self.root_paths:
-            for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
-                img_name = image_name_from_dockerfile_path(
-                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
-                test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-                    img_name, build_context_path=base_img_dockerfile)
-
-        return test_images
-
-
-    def __find_static_dockerfile_paths(self, root_path):
-        return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
-
-    def __merge_base_helm_values(self, helm_values):
-        # Override for every cloudharness scaffolding
-        for root_path in self.root_paths:
-            helm_values = dict_merge(
-                helm_values,
-                collect_helm_values(root_path, env=self.env)
-            )
-
-        return helm_values
-
-    def __get_default_helm_values(self):
-        ch_root_path = Path(CH_ROOT)
-        values_yaml_path = ch_root_path / DEPLOYMENT_CONFIGURATION_PATH / HELM_PATH / 'values.yaml'
-        helm_values = get_template(values_yaml_path)
-        helm_values = dict_merge(helm_values,
-                                 collect_helm_values(ch_root_path, env=self.env))
-
-        return helm_values
+    # def __process_applications(self, helm_values, base_image_name):
+    #     for root_path in self.root_paths:
+    #         app_values = init_app_values(
+    #             root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
+    #         helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+    #                                            app_values)
+
+    #         app_base_path = root_path / APPS_PATH
+    #         app_values = self.collect_app_values(
+    #             app_base_path, base_image_name=base_image_name)
+    #         helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+    #                                            app_values)
+
+    # def collect_app_values(self, app_base_path, base_image_name=None):
+    #     values = {}
+
+    #     for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
+    #         app_name = app_name_from_path(f"{app_path.relative_to(app_base_path)}")
+
+    #         if app_name in self.exclude:
+    #             continue
+    #         app_key = app_name.replace('-', '_')
+
+    #         app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
+
+    #         # dockerfile_path = next(app_path.rglob('**/Dockerfile'), None)
+    #         # # for dockerfile_path in app_path.rglob('**/Dockerfile'):
+    #         # #     parent_name = dockerfile_path.parent.name.replace("-", "_")
+    #         # #     if parent_name == app_key:
+    #         # #         app_values['build'] = {
+    #         # #             # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
+    #         # #             'dockerfile': "Dockerfile",
+    #         # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+    #         # #         }
+    #         # #     elif "tasks/" in f"{dockerfile_path}":
+    #         # #         parent_name = parent_name.upper()
+    #         # #         values.setdefault("task-images-build", {})[parent_name] = {
+    #         # #             'dockerfile': "Dockerfile",
+    #         # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+    #         # #         }
+    #         # #         import ipdb; ipdb.set_trace()  # fmt: skip
+
+    #         # if dockerfile_path:
+    #         #     app_values['build'] = {
+    #         #         # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
+    #         #         'dockerfile': "Dockerfile",
+    #         #         'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
+    #         #     }
+
+    #         values[app_key] = dict_merge(
+    #             values[app_key], app_values) if app_key in values else app_values
+
+    #     return values
+
+    # def __init_static_images(self, base_image_name):
+    #     for static_img_dockerfile in self.static_images:
+    #         img_name = image_name_from_dockerfile_path(os.path.basename(
+    #             static_img_dockerfile), base_name=base_image_name)
+    #         self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
+    #             img_name, build_context_path=static_img_dockerfile)
+
+    # def __assign_static_build_dependencies(self, helm_values):
+    #     for static_img_dockerfile in self.static_images:
+    #         key = os.path.basename(static_img_dockerfile)
+    #         if key in helm_values[KEY_TASK_IMAGES]:
+    #             dependencies = guess_build_dependencies_from_dockerfile(
+    #                 static_img_dockerfile)
+    #             for dep in dependencies:
+    #                 if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
+    #                     helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
+    #                     # helm_values.setdefault(KEY_TASK_IMAGES_BUILD, {})[dep] = {
+    #                     #     'context': os.path.relpath(static_img_dockerfile, self.dest_deployment_path.parent),
+    #                     #     'dockerfile': 'Dockerfile',
+    #                     # }
+
+    #     for image_name in helm_values[KEY_TASK_IMAGES].keys():
+    #         if image_name in self.exclude:
+    #             del helm_values[KEY_TASK_IMAGES][image_name]
+    #             # del helm_values[KEY_TASK_IMAGES_BUILD][image_name]
+
+    # def __init_base_images(self, base_image_name):
+
+    #     for root_path in self.root_paths:
+    #         for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
+    #             img_name = image_name_from_dockerfile_path(
+    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
+    #             self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+    #                 img_name, build_context_path=root_path)
+
+    #         self.static_images.update(find_dockerfiles_paths(
+    #             os.path.join(root_path, STATIC_IMAGES_PATH)))
+    #     return self.base_images
+
+    # def __init_test_images(self, base_image_name):
+    #     test_images = {}
+    #     for root_path in self.root_paths:
+    #         for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
+    #             img_name = image_name_from_dockerfile_path(
+    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
+    #             test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+    #                 img_name, build_context_path=base_img_dockerfile)
+
+    #     return test_images
+
+
+    # def __find_static_dockerfile_paths(self, root_path):
+    #     return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
+
+    # def __merge_base_helm_values(self, helm_values):
+    #     # Override for every cloudharness scaffolding
+    #     for root_path in self.root_paths:
+    #         helm_values = dict_merge(
+    #             helm_values,
+    #             collect_helm_values(root_path, env=self.env)
+    #         )
+
+    #     return helm_values
+
+    # def __get_default_helm_values(self):
+    #     ch_root_path = Path(CH_ROOT)
+    #     values_yaml_path = ch_root_path / DEPLOYMENT_CONFIGURATION_PATH / HELM_PATH / 'values.yaml'
+    #     helm_values = get_template(values_yaml_path)
+    #     helm_values = dict_merge(helm_values,
+    #                              collect_helm_values(ch_root_path, env=self.env))
+
+    #     return helm_values
 
     def __get_default_helm_values_with_secrets(self, helm_values):
         helm_values = copy.deepcopy(helm_values)
@@ -323,76 +315,76 @@ def __get_default_helm_values_with_secrets(self, helm_values):
             helm_values['apps'][key]['harness']['secrets'] = {}
         return helm_values
 
-    def create_tls_certificate(self, helm_values):
-        if not self.tls:
-            helm_values['tls'] = None
-            return
-        if not self.local:
-            return
-        helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
-
-        bootstrap_file = 'bootstrap.sh'
-        certs_parent_folder_path = self.output_path / 'helm' / 'resources'
-        certs_folder_path = certs_parent_folder_path / 'certs'
-
-        # if os.path.exists(os.path.join(certs_folder_path)):
-        if certs_folder_path.exists():
-            # don't overwrite the certificate if it exists
-            return
-
-        try:
-            client = DockerClient()
-            client.ping()
-        except:
-            raise ConnectionRefusedError(
-                '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
-
-        # Create CA and sign cert for domain
-        container = client.containers.run(image='frapsoft/openssl',
-                                          command=f'sleep 60',
-                                          entrypoint="",
-                                          detach=True,
-                                          environment=[
-                                              f"DOMAIN={self.domain}"],
-                                          )
-
-        container.exec_run('mkdir -p /mnt/vol1')
-        container.exec_run('mkdir -p /mnt/certs')
-
-        # copy bootstrap file
-        cur_dir = os.getcwd()
-        os.chdir(Path(HERE) / 'scripts')
-        tar = tarfile.open(bootstrap_file + '.tar', mode='w')
-        try:
-            tar.add(bootstrap_file)
-        finally:
-            tar.close()
-        data = open(bootstrap_file + '.tar', 'rb').read()
-        container.put_archive('/mnt/vol1', data)
-        os.chdir(cur_dir)
-        container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
-
-        # exec bootstrap file
-        container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
-
-        # retrieve the certs from the container
-        bits, stat = container.get_archive('/mnt/certs')
-        if not certs_folder_path.exists():
-            certs_folder_path.mkdir(parents=True)
-        certs_tar = certs_parent_folder_path / 'certs.tar'
-        with open(certs_tar, 'wb') as f:
-            for chunk in bits:
-                f.write(chunk)
-        cf = tarfile.open(certs_tar)
-        cf.extractall(path=certs_parent_folder_path)
-
-        logs = container.logs()
-        logging.info(f'openssl container logs: {logs}')
-
-        # stop the container
-        container.kill()
-
-        logging.info("Created certificates for local deployment")
+    # def create_tls_certificate(self, helm_values):
+    #     if not self.tls:
+    #         helm_values['tls'] = None
+    #         return
+    #     if not self.local:
+    #         return
+    #     helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
+
+    #     bootstrap_file = 'bootstrap.sh'
+    #     certs_parent_folder_path = self.output_path / 'helm' / 'resources'
+    #     certs_folder_path = certs_parent_folder_path / 'certs'
+
+    #     # if os.path.exists(os.path.join(certs_folder_path)):
+    #     if certs_folder_path.exists():
+    #         # don't overwrite the certificate if it exists
+    #         return
+
+    #     try:
+    #         client = DockerClient()
+    #         client.ping()
+    #     except:
+    #         raise ConnectionRefusedError(
+    #             '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
+
+    #     # Create CA and sign cert for domain
+    #     container = client.containers.run(image='frapsoft/openssl',
+    #                                       command=f'sleep 60',
+    #                                       entrypoint="",
+    #                                       detach=True,
+    #                                       environment=[
+    #                                           f"DOMAIN={self.domain}"],
+    #                                       )
+
+    #     container.exec_run('mkdir -p /mnt/vol1')
+    #     container.exec_run('mkdir -p /mnt/certs')
+
+    #     # copy bootstrap file
+    #     cur_dir = os.getcwd()
+    #     os.chdir(Path(HERE) / 'scripts')
+    #     tar = tarfile.open(bootstrap_file + '.tar', mode='w')
+    #     try:
+    #         tar.add(bootstrap_file)
+    #     finally:
+    #         tar.close()
+    #     data = open(bootstrap_file + '.tar', 'rb').read()
+    #     container.put_archive('/mnt/vol1', data)
+    #     os.chdir(cur_dir)
+    #     container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
+
+    #     # exec bootstrap file
+    #     container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
+
+    #     # retrieve the certs from the container
+    #     bits, stat = container.get_archive('/mnt/certs')
+    #     if not certs_folder_path.exists():
+    #         certs_folder_path.mkdir(parents=True)
+    #     certs_tar = certs_parent_folder_path / 'certs.tar'
+    #     with open(certs_tar, 'wb') as f:
+    #         for chunk in bits:
+    #             f.write(chunk)
+    #     cf = tarfile.open(certs_tar)
+    #     cf.extractall(path=certs_parent_folder_path)
+
+    #     logs = container.logs()
+    #     logging.info(f'openssl container logs: {logs}')
+
+    #     # stop the container
+    #     container.kill()
+
+    #     logging.info("Created certificates for local deployment")
 
     def __finish_helm_values(self, values):
         """
@@ -444,7 +436,7 @@ def __finish_helm_values(self, values):
             if harness[KEY_DATABASE] and not harness[KEY_DATABASE].get('name', None):
                 harness[KEY_DATABASE]['name'] = app_name.strip() + '-db'
 
-            self.__clear_unused_db_configuration(harness)
+            self._clear_unused_db_configuration(harness)
             values_set_legacy(v)
 
         if self.include:
@@ -464,36 +456,36 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    def __clear_unused_db_configuration(self, harness_config):
-        database_config = harness_config[KEY_DATABASE]
-        database_type = database_config.get('type', None)
-        if database_type is None:
-            del harness_config[KEY_DATABASE]
-            return
-        db_specific_keys = [k for k, v in database_config.items()
-                            if isinstance(v, dict) and 'image' in v and 'ports' in v]
-        for db in db_specific_keys:
-            if database_type != db:
-                del database_config[db]
-
-    def image_tag(self, image_name, build_context_path=None, dependencies=()):
-        tag = self.tag
-        if tag is None and not self.local:
-            logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
-            ignore_path = os.path.join(build_context_path, '.dockerignore')
-            ignore = set(DEFAULT_IGNORE)
-            if os.path.exists(ignore_path):
-                with open(ignore_path) as f:
-                    ignore = ignore.union({line.strip() for line in f})
-            logging.info(f"Ignoring {ignore}")
-            tag = generate_tag_from_content(build_context_path, ignore)
-            logging.info(f"Content hash: {tag}")
-            dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-            tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
-            logging.info(f"Generated tag: {tag}")
-            app_name = image_name.split("/")[-1] # the image name can have a prefix
-            self.all_images[app_name] = tag
-        return self.registry + image_name + (f':{tag}' if tag else '')
+    # def __clear_unused_db_configuration(self, harness_config):
+    #     database_config = harness_config[KEY_DATABASE]
+    #     database_type = database_config.get('type', None)
+    #     if database_type is None:
+    #         del harness_config[KEY_DATABASE]
+    #         return
+    #     db_specific_keys = [k for k, v in database_config.items()
+    #                         if isinstance(v, dict) and 'image' in v and 'ports' in v]
+    #     for db in db_specific_keys:
+    #         if database_type != db:
+    #             del database_config[db]
+
+    # def image_tag(self, image_name, build_context_path=None, dependencies=()):
+    #     tag = self.tag
+    #     if tag is None and not self.local:
+    #         logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
+    #         ignore_path = os.path.join(build_context_path, '.dockerignore')
+    #         ignore = set(DEFAULT_IGNORE)
+    #         if os.path.exists(ignore_path):
+    #             with open(ignore_path) as f:
+    #                 ignore = ignore.union({line.strip() for line in f})
+    #         logging.info(f"Ignoring {ignore}")
+    #         tag = generate_tag_from_content(build_context_path, ignore)
+    #         logging.info(f"Content hash: {tag}")
+    #         dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
+    #         tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
+    #         logging.info(f"Generated tag: {tag}")
+    #         app_name = image_name.split("/")[-1] # the image name can have a prefix
+    #         self.all_images[app_name] = tag
+    #     return self.registry + image_name + (f':{tag}' if tag else '')
 
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
@@ -559,8 +551,6 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
                 task_path, app_path.parent))
             img_name = image_name_from_dockerfile_path(task_name, base_image_name)
 
-            # import ipdb; ipdb.set_trace()  # fmt: skip
-
             # values[KEY_TASK_IMAGES][task_name] = self.image_tag(
             #     img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys())
             # values.setdefault(KEY_TASK_IMAGES_BUILD, {})[task_name] = {
@@ -591,281 +581,281 @@ def inject_entry_points_commands(self, helm_values, image_path, app_path):
             helm_values[KEY_HARNESS]['deployment']['args'] = f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py'
 
 
-def get_included_with_dependencies(values, include):
-    app_values = values['apps'].values()
-    directly_included = [app for app in app_values if any(
-        inc == app[KEY_HARNESS]['name'] for inc in include)]
-
-    dependent = set(include)
-    for app in directly_included:
-        if app['harness']['dependencies'].get('hard', None):
-            dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
-        if app['harness']['dependencies'].get('soft', None):
-            dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
-        if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
-            dependent.add('accounts')
-    if len(dependent) == len(include):
-        return dependent
-    return get_included_with_dependencies(values, dependent)
-
-
-def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
-    pass
-
-
-def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_path, exclude=(), include=None):
-    """
-    Searches recursively for helm templates inside the applications and collects the templates in the destination
-
-    :param search_root:
-    :param dest_helm_chart_path: collected helm templates destination folder
-    :param exclude:
-    :return:
-    """
-    app_base_path = search_root / APPS_PATH
-
-    for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
-        app_name = app_name_from_path(os.path.relpath(f"{app_path}", app_base_path))
-        if app_name in exclude or (include and not any(inc in app_name for inc in include)):
-            continue
-        template_dir = app_path / 'deploy' / f'templates-{templates_path}'
-        if template_dir.exists():
-            dest_dir = dest_helm_chart_path / 'templates' / app_name
-
-            logging.info(
-                "Collecting templates for application %s to %s", app_name, dest_dir)
-            if dest_dir.exists():
-                logging.warning(
-                    "Merging/overriding all files in directory %s", dest_dir)
-                merge_configuration_directories(f"{template_dir}", f"{dest_dir}")
-            else:
-                shutil.copytree(template_dir, dest_dir)
-        resources_dir = app_path / 'deploy' / 'resources'
-        if resources_dir.exists():
-            dest_dir = dest_helm_chart_path / 'resources' / app_name
-
-            logging.info(
-                "Collecting resources for application  %s to %s", app_name, dest_dir)
-
-            merge_configuration_directories(f"{resources_dir}", f"{dest_dir}")
-
-        # subchart_dir = app_path / 'deploy/charts'
-        # if subchart_dir.exists():
-        #     dest_dir = dest_helm_chart_path / 'charts' / app_name
-
-        #     logging.info(
-        #         "Collecting templates for application %s to %s", app_name, dest_dir)
-        #     if dest_dir.exists():
-        #         logging.warning(
-        #             "Merging/overriding all files in directory %s", dest_dir)
-        #         merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
-        #     else:
-        #         shutil.copytree(subchart_dir, dest_dir)
-
-
-def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
-    if not base_helm_chart.exists():
-        return
-    if dest_helm_chart_path.exists():
-        logging.info("Merging/overriding all files in directory %s",
-                     dest_helm_chart_path)
-        merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
-    else:
-        logging.info("Copying base deployment chart from %s to %s",
-                     base_helm_chart, dest_helm_chart_path)
-        shutil.copytree(base_helm_chart, dest_helm_chart_path)
-
-
-def collect_helm_values(deployment_root, env=()):
-    """
-    Creates helm values from a cloudharness deployment scaffolding
-    """
-    values_template_path = deployment_root / DEPLOYMENT_CONFIGURATION_PATH / 'values-template.yaml'
-
-    values = get_template(values_template_path)
-
-    for e in env:
-        specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
-                                              f'values-template-{e}.yaml')
-        if os.path.exists(specific_template_path):
-            logging.info(
-                "Specific environment values template found: " + specific_template_path)
-            with open(specific_template_path) as f:
-                values_env_specific = yaml.safe_load(f)
-            values = dict_merge(values, values_env_specific)
-    return values
-
-
-def init_app_values(deployment_root, exclude, values=None):
-    values = values if values is not None else {}
-    app_base_path = os.path.join(deployment_root, APPS_PATH)
-    overridden_template_path = os.path.join(
-        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-    default_values_path = os.path.join(
-        CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-
-    for app_path in get_sub_paths(app_base_path):
-
-        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
-
-        if app_name in exclude:
-            continue
-        app_key = app_name.replace('-', '_')
-        if app_key not in values:
-            default_values = get_template(default_values_path)
-            values[app_key] = default_values
-        overridden_defaults = get_template(overridden_template_path)
-        values[app_key] = dict_merge(values[app_key], overridden_defaults)
-
-    return values
-
-
-def values_from_legacy(values):
-    if KEY_HARNESS not in values:
-        values[KEY_HARNESS] = {}
-    harness = values[KEY_HARNESS]
-    if KEY_SERVICE not in harness:
-        harness[KEY_SERVICE] = {}
-    if KEY_DEPLOYMENT not in harness:
-        harness[KEY_DEPLOYMENT] = {}
-    if KEY_DATABASE not in harness:
-        harness[KEY_DATABASE] = {}
-
-    if 'subdomain' in values:
-        harness['subdomain'] = values['subdomain']
-    if 'autodeploy' in values:
-        harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
-    if 'autoservice' in values:
-        harness[KEY_SERVICE]['auto'] = values['autoservice']
-    if 'secureme' in values:
-        harness['secured'] = values['secureme']
-    if 'resources' in values:
-        harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
-    if 'replicas' in values:
-        harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
-    if 'image' in values:
-        harness[KEY_DEPLOYMENT]['image'] = values['image']
-    if 'port' in values:
-        harness[KEY_DEPLOYMENT]['port'] = values['port']
-        harness[KEY_SERVICE]['port'] = values['port']
-
-
-def values_set_legacy(values):
-    harness = values[KEY_HARNESS]
-    if 'image' in harness[KEY_DEPLOYMENT]:
-        values['image'] = harness[KEY_DEPLOYMENT]['image']
-
-    values['name'] = harness['name']
-    if harness[KEY_DEPLOYMENT].get('port', None):
-        values['port'] = harness[KEY_DEPLOYMENT]['port']
-    if 'resources' in harness[KEY_DEPLOYMENT]:
-        values['resources'] = harness[KEY_DEPLOYMENT]['resources']
-
-
-def generate_tag_from_content(content_path, ignore=()):
-    from dirhash import dirhash
-    return dirhash(content_path, 'sha1', ignore=ignore)
-
-
-def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
-    if isinstance(values, dict):
-        newenvs = list(envs)
-        for key, value in values.items():
-            v = extract_env_variables_from_values(
-                value, envs, f"{prefix}_{key}".replace('-', '_').upper())
-            if key in ('name', 'port', 'subdomain'):
-                newenvs.extend(v)
-        return newenvs
-    else:
-        return [env_variable(prefix, values)]
-
-
-def create_env_variables(values):
-    for app_name, value in values[KEY_APPS].items():
-        if KEY_HARNESS in value:
-            values['env'].extend(extract_env_variables_from_values(
-                value[KEY_HARNESS], prefix='CH_' + app_name))
-    values['env'].append(env_variable('CH_DOMAIN', values['domain']))
-    values['env'].append(env_variable(
-        'CH_IMAGE_REGISTRY', values['registry']['name']))
-    values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
-
-
-def hosts_info(values):
-    domain = values['domain']
-    namespace = values['namespace']
-    subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
-                  KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
-                                                                           KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
-    try:
-        ip = get_cluster_ip()
-    except:
-        logging.warning('Cannot get cluster ip')
-        return
-    logging.info(
-        "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
-
-    deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
-                   for app in values[KEY_APPS].values() if KEY_HARNESS in app)
-
-    logging.info(
-        "\nTo run locally some apps, also those references may be needed")
-    for appname in values[KEY_APPS]:
-        app = values[KEY_APPS][appname]['harness']
-        if 'deployment' not in app:
-            continue
-        print(
-            "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
-                app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
-
-    print(
-        f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
-
-
-class ValuesValidationException(Exception):
-    pass
-
-
-def validate_helm_values(values):
-    validate_dependencies(values)
-
-
-def validate_dependencies(values):
-    all_apps = {a for a in values["apps"]}
-    for app in all_apps:
-        app_values = values["apps"][app]
-        if 'dependencies' in app_values[KEY_HARNESS]:
-            soft_dependencies = {
-                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
-            not_found = {d for d in soft_dependencies if d not in all_apps}
-            if not_found:
-                logging.warning(
-                    f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
-            hard_dependencies = {
-                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
-            not_found = {d for d in hard_dependencies if d not in all_apps}
-            if not_found:
-                raise ValuesValidationException(
-                    f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
-
-            build_dependencies = {
-                d for d in app_values[KEY_HARNESS]['dependencies']['build']}
-
-            not_found = {
-                d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
-            not_found = {d for d in not_found if d not in all_apps}
-            if not_found:
-                raise ValuesValidationException(
-                    f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
-
-        if 'use_services' in app_values[KEY_HARNESS]:
-            service_dependencies = {d['name'].replace(
-                "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
-
-            not_found = {d for d in service_dependencies if d not in all_apps}
-            if not_found:
-                raise ValuesValidationException(
-                    f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
+# def get_included_with_dependencies(values, include):
+#     app_values = values['apps'].values()
+#     directly_included = [app for app in app_values if any(
+#         inc == app[KEY_HARNESS]['name'] for inc in include)]
+
+#     dependent = set(include)
+#     for app in directly_included:
+#         if app['harness']['dependencies'].get('hard', None):
+#             dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
+#         if app['harness']['dependencies'].get('soft', None):
+#             dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
+#         if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
+#             dependent.add('accounts')
+#     if len(dependent) == len(include):
+#         return dependent
+#     return get_included_with_dependencies(values, dependent)
+
+
+# def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
+#     pass
+
+
+# def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_path, exclude=(), include=None):
+#     """
+#     Searches recursively for helm templates inside the applications and collects the templates in the destination
+
+#     :param search_root:
+#     :param dest_helm_chart_path: collected helm templates destination folder
+#     :param exclude:
+#     :return:
+#     """
+#     app_base_path = search_root / APPS_PATH
+
+#     for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
+#         app_name = app_name_from_path(os.path.relpath(f"{app_path}", app_base_path))
+#         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
+#             continue
+#         template_dir = app_path / 'deploy' / f'templates-{templates_path}'
+#         if template_dir.exists():
+#             dest_dir = dest_helm_chart_path / 'templates' / app_name
+
+#             logging.info(
+#                 "Collecting templates for application %s to %s", app_name, dest_dir)
+#             if dest_dir.exists():
+#                 logging.warning(
+#                     "Merging/overriding all files in directory %s", dest_dir)
+#                 merge_configuration_directories(f"{template_dir}", f"{dest_dir}")
+#             else:
+#                 shutil.copytree(template_dir, dest_dir)
+#         resources_dir = app_path / 'deploy' / 'resources'
+#         if resources_dir.exists():
+#             dest_dir = dest_helm_chart_path / 'resources' / app_name
+
+#             logging.info(
+#                 "Collecting resources for application  %s to %s", app_name, dest_dir)
+
+#             merge_configuration_directories(f"{resources_dir}", f"{dest_dir}")
+
+#         # subchart_dir = app_path / 'deploy/charts'
+#         # if subchart_dir.exists():
+#         #     dest_dir = dest_helm_chart_path / 'charts' / app_name
+
+#         #     logging.info(
+#         #         "Collecting templates for application %s to %s", app_name, dest_dir)
+#         #     if dest_dir.exists():
+#         #         logging.warning(
+#         #             "Merging/overriding all files in directory %s", dest_dir)
+#         #         merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
+#         #     else:
+#         #         shutil.copytree(subchart_dir, dest_dir)
+
+
+# def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
+#     if not base_helm_chart.exists():
+#         return
+#     if dest_helm_chart_path.exists():
+#         logging.info("Merging/overriding all files in directory %s",
+#                      dest_helm_chart_path)
+#         merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
+#     else:
+#         logging.info("Copying base deployment chart from %s to %s",
+#                      base_helm_chart, dest_helm_chart_path)
+#         shutil.copytree(base_helm_chart, dest_helm_chart_path)
+
+
+# def collect_helm_values(deployment_root, env=()):
+#     """
+#     Creates helm values from a cloudharness deployment scaffolding
+#     """
+#     values_template_path = deployment_root / DEPLOYMENT_CONFIGURATION_PATH / 'values-template.yaml'
+
+#     values = get_template(values_template_path)
+
+#     for e in env:
+#         specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
+#                                               f'values-template-{e}.yaml')
+#         if os.path.exists(specific_template_path):
+#             logging.info(
+#                 "Specific environment values template found: " + specific_template_path)
+#             with open(specific_template_path) as f:
+#                 values_env_specific = yaml.safe_load(f)
+#             values = dict_merge(values, values_env_specific)
+#     return values
+
+
+# def init_app_values(deployment_root, exclude, values=None):
+#     values = values if values is not None else {}
+#     app_base_path = os.path.join(deployment_root, APPS_PATH)
+#     overridden_template_path = os.path.join(
+#         deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+#     default_values_path = os.path.join(
+#         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+
+#     for app_path in get_sub_paths(app_base_path):
+
+#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+
+#         if app_name in exclude:
+#             continue
+#         app_key = app_name.replace('-', '_')
+#         if app_key not in values:
+#             default_values = get_template(default_values_path)
+#             values[app_key] = default_values
+#         overridden_defaults = get_template(overridden_template_path)
+#         values[app_key] = dict_merge(values[app_key], overridden_defaults)
+
+#     return values
+
+
+# def values_from_legacy(values):
+#     if KEY_HARNESS not in values:
+#         values[KEY_HARNESS] = {}
+#     harness = values[KEY_HARNESS]
+#     if KEY_SERVICE not in harness:
+#         harness[KEY_SERVICE] = {}
+#     if KEY_DEPLOYMENT not in harness:
+#         harness[KEY_DEPLOYMENT] = {}
+#     if KEY_DATABASE not in harness:
+#         harness[KEY_DATABASE] = {}
+
+#     if 'subdomain' in values:
+#         harness['subdomain'] = values['subdomain']
+#     if 'autodeploy' in values:
+#         harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
+#     if 'autoservice' in values:
+#         harness[KEY_SERVICE]['auto'] = values['autoservice']
+#     if 'secureme' in values:
+#         harness['secured'] = values['secureme']
+#     if 'resources' in values:
+#         harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
+#     if 'replicas' in values:
+#         harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
+#     if 'image' in values:
+#         harness[KEY_DEPLOYMENT]['image'] = values['image']
+#     if 'port' in values:
+#         harness[KEY_DEPLOYMENT]['port'] = values['port']
+#         harness[KEY_SERVICE]['port'] = values['port']
+
+
+# def values_set_legacy(values):
+#     harness = values[KEY_HARNESS]
+#     if 'image' in harness[KEY_DEPLOYMENT]:
+#         values['image'] = harness[KEY_DEPLOYMENT]['image']
+
+#     values['name'] = harness['name']
+#     if harness[KEY_DEPLOYMENT].get('port', None):
+#         values['port'] = harness[KEY_DEPLOYMENT]['port']
+#     if 'resources' in harness[KEY_DEPLOYMENT]:
+#         values['resources'] = harness[KEY_DEPLOYMENT]['resources']
+
+
+# def generate_tag_from_content(content_path, ignore=()):
+#     from dirhash import dirhash
+#     return dirhash(content_path, 'sha1', ignore=ignore)
+
+
+# def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
+#     if isinstance(values, dict):
+#         newenvs = list(envs)
+#         for key, value in values.items():
+#             v = extract_env_variables_from_values(
+#                 value, envs, f"{prefix}_{key}".replace('-', '_').upper())
+#             if key in ('name', 'port', 'subdomain'):
+#                 newenvs.extend(v)
+#         return newenvs
+#     else:
+#         return [env_variable(prefix, values)]
+
+
+# def create_env_variables(values):
+#     for app_name, value in values[KEY_APPS].items():
+#         if KEY_HARNESS in value:
+#             values['env'].extend(extract_env_variables_from_values(
+#                 value[KEY_HARNESS], prefix='CH_' + app_name))
+#     values['env'].append(env_variable('CH_DOMAIN', values['domain']))
+#     values['env'].append(env_variable(
+#         'CH_IMAGE_REGISTRY', values['registry']['name']))
+#     values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
+
+
+# def hosts_info(values):
+#     domain = values['domain']
+#     namespace = values['namespace']
+#     subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
+#                   KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
+#                                                                            KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
+#     try:
+#         ip = get_cluster_ip()
+#     except:
+#         logging.warning('Cannot get cluster ip')
+#         return
+#     logging.info(
+#         "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
+
+#     deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
+#                    for app in values[KEY_APPS].values() if KEY_HARNESS in app)
+
+#     logging.info(
+#         "\nTo run locally some apps, also those references may be needed")
+#     for appname in values[KEY_APPS]:
+#         app = values[KEY_APPS][appname]['harness']
+#         if 'deployment' not in app:
+#             continue
+#         print(
+#             "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
+#                 app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
+
+#     print(
+#         f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
+
+
+# class ValuesValidationException(Exception):
+#     pass
+
+
+# def validate_helm_values(values):
+#     validate_dependencies(values)
+
+
+# def validate_dependencies(values):
+#     all_apps = {a for a in values["apps"]}
+#     for app in all_apps:
+#         app_values = values["apps"][app]
+#         if 'dependencies' in app_values[KEY_HARNESS]:
+#             soft_dependencies = {
+#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
+#             not_found = {d for d in soft_dependencies if d not in all_apps}
+#             if not_found:
+#                 logging.warning(
+#                     f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
+#             hard_dependencies = {
+#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
+#             not_found = {d for d in hard_dependencies if d not in all_apps}
+#             if not_found:
+#                 raise ValuesValidationException(
+#                     f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
+
+#             build_dependencies = {
+#                 d for d in app_values[KEY_HARNESS]['dependencies']['build']}
+
+#             not_found = {
+#                 d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
+#             not_found = {d for d in not_found if d not in all_apps}
+#             if not_found:
+#                 raise ValuesValidationException(
+#                     f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
+
+#         if 'use_services' in app_values[KEY_HARNESS]:
+#             service_dependencies = {d['name'].replace(
+#                 "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
+
+#             not_found = {d for d in service_dependencies if d not in all_apps}
+#             if not_found:
+#                 raise ValuesValidationException(
+#                     f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
 
 
 def identify_unicorn_based_main(candidates, app_path):
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index f5eb560f..bd49f8ee 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -21,15 +21,8 @@
 
 from .models import HarnessMainConfig
 
-KEY_HARNESS = 'harness'
-KEY_SERVICE = 'service'
-KEY_DATABASE = 'database'
-KEY_DEPLOYMENT = 'deployment'
-KEY_APPS = 'apps'
-KEY_TASK_IMAGES = 'task-images'
-KEY_TEST_IMAGES = 'test-images'
+from .configurationgenerator import ConfigurationGenerator, validate_helm_values, KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates
 
-DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
 
 
 def deploy(namespace, output_path='./deployment'):
@@ -51,70 +44,70 @@ def create_helm_chart(root_paths, tag='latest', registry='', local=True, domain=
                             namespace=namespace).process_values()
 
 
-class CloudHarnessHelm:
-    def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
-                 output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-                 namespace=None):
-        assert domain, 'A domain must be specified'
-        self.root_paths = root_paths
-        self.tag = tag
-        if registry and registry[-1] != '/':
-            self.registry = registry + '/'
-        else:
-            self.registry = registry
-        self.local = local
-        self.domain = domain
-        self.exclude = exclude
-        self.secured = secured
-        self.output_path = output_path
-        self.include = include
-        self.registry_secret = registry_secret
-        self.tls = tls
-        self.env = env
-        self.namespace = namespace
-
-        self.dest_deployment_path = os.path.join(
-            self.output_path, HELM_CHART_PATH)
-        self.helm_chart_path = os.path.join(
-            self.dest_deployment_path, 'Chart.yaml')
-        self.__init_deployment()
-
-        self.static_images = set()
-        self.base_images = {}
-        self.all_images = {}
-
-    def __init_deployment(self):
-        """
-        Create the base helm chart
-        """
-        if os.path.exists(self.dest_deployment_path):
-            shutil.rmtree(self.dest_deployment_path)
-        # Initialize with default
-        copy_merge_base_deployment(self.dest_deployment_path, os.path.join(
-            CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH))
-
-        # Override for every cloudharness scaffolding
-        for root_path in self.root_paths:
-            copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
-                                       base_helm_chart=os.path.join(root_path, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH))
-            collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
-                                        dest_helm_chart_path=self.dest_deployment_path)
-
-    def __adjust_missing_values(self, helm_values):
-        if 'name' not in helm_values:
-            with open(self.helm_chart_path) as f:
-                chart_idx_content = yaml.safe_load(f)
-            helm_values['name'] = chart_idx_content['name'].lower()
+class CloudHarnessHelm(ConfigurationGenerator):
+    # def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+    #              output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
+    #              namespace=None):
+    #     assert domain, 'A domain must be specified'
+    #     self.root_paths = root_paths
+    #     self.tag = tag
+    #     if registry and registry[-1] != '/':
+    #         self.registry = registry + '/'
+    #     else:
+    #         self.registry = registry
+    #     self.local = local
+    #     self.domain = domain
+    #     self.exclude = exclude
+    #     self.secured = secured
+    #     self.output_path = output_path
+    #     self.include = include
+    #     self.registry_secret = registry_secret
+    #     self.tls = tls
+    #     self.env = env
+    #     self.namespace = namespace
+
+    #     self.dest_deployment_path = os.path.join(
+    #         self.output_path, HELM_CHART_PATH)
+    #     self.helm_chart_path = os.path.join(
+    #         self.dest_deployment_path, 'Chart.yaml')
+    #     self.__init_deployment()
+
+    #     self.static_images = set()
+    #     self.base_images = {}
+    #     self.all_images = {}
+
+    # def __init_deployment(self):
+    #     """
+    #     Create the base helm chart
+    #     """
+    #     if os.path.exists(self.dest_deployment_path):
+    #         shutil.rmtree(self.dest_deployment_path)
+    #     # Initialize with default
+    #     copy_merge_base_deployment(self.dest_deployment_path, os.path.join(
+    #         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH))
+
+    #     # Override for every cloudharness scaffolding
+    #     for root_path in self.root_paths:
+    #         copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
+    #                                    base_helm_chart=os.path.join(root_path, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH))
+    #         collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
+    #                                     dest_helm_chart_path=self.dest_deployment_path)
+
+    # def __adjust_missing_values(self, helm_values):
+    #     if 'name' not in helm_values:
+    #         with open(self.helm_chart_path) as f:
+    #             chart_idx_content = yaml.safe_load(f)
+    #         helm_values['name'] = chart_idx_content['name'].lower()
 
     def process_values(self) -> HarnessMainConfig:
         """
         Creates values file for the helm chart
         """
-        helm_values = self.__get_default_helm_values()
+        helm_values = self._get_default_helm_values()
 
-        self.__adjust_missing_values(helm_values)
+        self._adjust_missing_values(helm_values)
 
-        helm_values = self.__merge_base_helm_values(helm_values)
+        helm_values = self._merge_base_helm_values(helm_values)
 
         helm_values[KEY_APPS] = {}
 
@@ -122,18 +115,18 @@ def process_values(self) -> HarnessMainConfig:
 
         helm_values[KEY_TASK_IMAGES] = {}
 
-        self.__init_base_images(base_image_name)
-        self.__init_static_images(base_image_name)
-        helm_values[KEY_TEST_IMAGES] = self.__init_test_images(base_image_name)
+        self._init_base_images(base_image_name)
+        self._init_static_images(base_image_name)
+        helm_values[KEY_TEST_IMAGES] = self._init_test_images(base_image_name)
 
-        self.__process_applications(helm_values, base_image_name)
+        self._process_applications(helm_values, base_image_name)
 
         self.create_tls_certificate(helm_values)
 
         values, include = self.__finish_helm_values(values=helm_values)
 
         # Adjust dependencies from static (common) images
-        self.__assign_static_build_dependencies(helm_values)
+        self._assign_static_build_dependencies(helm_values)
 
         for root_path in self.root_paths:
             collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
@@ -148,174 +141,174 @@ def process_values(self) -> HarnessMainConfig:
         validate_helm_values(merged_values)
         return HarnessMainConfig.from_dict(merged_values)
 
-    def __process_applications(self, helm_values, base_image_name):
-        for root_path in self.root_paths:
-            app_values = init_app_values(
-                root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
-            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-                                               app_values)
-
-            app_base_path = os.path.join(root_path, APPS_PATH)
-            app_values = self.collect_app_values(
-                app_base_path, base_image_name=base_image_name)
-            helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-                                               app_values)
-
-    def collect_app_values(self, app_base_path, base_image_name=None):
-        values = {}
-
-        for app_path in get_sub_paths(app_base_path):
-            app_name = app_name_from_path(
-                os.path.relpath(app_path, app_base_path))
-
-            if app_name in self.exclude:
-                continue
-            app_key = app_name.replace('-', '_')
-
-            app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
-
-            values[app_key] = dict_merge(
-                values[app_key], app_values) if app_key in values else app_values
-
-        return values
-
-    def __init_static_images(self, base_image_name):
-        for static_img_dockerfile in self.static_images:
-            img_name = image_name_from_dockerfile_path(os.path.basename(
-                static_img_dockerfile), base_name=base_image_name)
-            self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
-                img_name, build_context_path=static_img_dockerfile)
-
-    def __assign_static_build_dependencies(self, helm_values):
-        for static_img_dockerfile in self.static_images:
-            key = os.path.basename(static_img_dockerfile)
-            if key in helm_values[KEY_TASK_IMAGES]:
-                dependencies = guess_build_dependencies_from_dockerfile(
-                    static_img_dockerfile)
-                for dep in dependencies:
-                    if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
-                        helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
-
-        for image_name in list(helm_values[KEY_TASK_IMAGES].keys()):
-            if image_name in self.exclude:
-                del helm_values[KEY_TASK_IMAGES][image_name]
-
-    def __init_base_images(self, base_image_name):
-
-        for root_path in self.root_paths:
-            for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
-                img_name = image_name_from_dockerfile_path(
-                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
-                self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-                    img_name, build_context_path=root_path)
-
-            self.static_images.update(find_dockerfiles_paths(
-                os.path.join(root_path, STATIC_IMAGES_PATH)))
-        return self.base_images
-
-    def __init_test_images(self, base_image_name):
-        test_images = {}
-        for root_path in self.root_paths:
-            for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
-                img_name = image_name_from_dockerfile_path(
-                    os.path.basename(base_img_dockerfile), base_name=base_image_name)
-                test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-                    img_name, build_context_path=base_img_dockerfile)
-
-        return test_images
-
-
-    def __find_static_dockerfile_paths(self, root_path):
-        return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
-
-    def __merge_base_helm_values(self, helm_values):
-        # Override for every cloudharness scaffolding
-        for root_path in self.root_paths:
-            helm_values = dict_merge(
-                helm_values,
-                collect_helm_values(root_path, env=self.env)
-            )
-
-        return helm_values
-
-    def __get_default_helm_values(self):
-        helm_values = get_template(os.path.join(
-            CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH, 'values.yaml'))
-        helm_values = dict_merge(helm_values,
-                                 collect_helm_values(CH_ROOT, env=self.env))
-
-        return helm_values
-
-    def create_tls_certificate(self, helm_values):
-        if not self.tls:
-            helm_values['tls'] = None
-            return
-        if not self.local:
-            return
-        helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
-
-        bootstrap_file = 'bootstrap.sh'
-        certs_parent_folder_path = os.path.join(
-            self.output_path, 'helm', 'resources')
-        certs_folder_path = os.path.join(certs_parent_folder_path, 'certs')
-
-        if os.path.exists(os.path.join(certs_folder_path)):
-            # don't overwrite the certificate if it exists
-            return
-
-        try:
-            client = DockerClient()
-            client.ping()
-        except:
-            raise ConnectionRefusedError(
-                '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
-
-        # Create CA and sign cert for domain
-        container = client.containers.run(image='frapsoft/openssl',
-                                          command=f'sleep 60',
-                                          entrypoint="",
-                                          detach=True,
-                                          environment=[
-                                              f"DOMAIN={self.domain}"],
-                                          )
-
-        container.exec_run('mkdir -p /mnt/vol1')
-        container.exec_run('mkdir -p /mnt/certs')
-
-        # copy bootstrap file
-        cur_dir = os.getcwd()
-        os.chdir(os.path.join(HERE, 'scripts'))
-        tar = tarfile.open(bootstrap_file + '.tar', mode='w')
-        try:
-            tar.add(bootstrap_file)
-        finally:
-            tar.close()
-        data = open(bootstrap_file + '.tar', 'rb').read()
-        container.put_archive('/mnt/vol1', data)
-        os.chdir(cur_dir)
-        container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
-
-        # exec bootstrap file
-        container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
-
-        # retrieve the certs from the container
-        bits, stat = container.get_archive('/mnt/certs')
-        if not os.path.exists(certs_folder_path):
-            os.makedirs(certs_folder_path)
-        f = open(f'{certs_parent_folder_path}/certs.tar', 'wb')
-        for chunk in bits:
-            f.write(chunk)
-        f.close()
-        cf = tarfile.open(f'{certs_parent_folder_path}/certs.tar')
-        cf.extractall(path=certs_parent_folder_path)
-
-        logs = container.logs()
-        logging.info(f'openssl container logs: {logs}')
-
-        # stop the container
-        container.kill()
-
-        logging.info("Created certificates for local deployment")
+    # def __process_applications(self, helm_values, base_image_name):
+        # for root_path in self.root_paths:
+        #     app_values = init_app_values(
+        #         root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
+        #     helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+        #                                        app_values)
+
+        #     app_base_path = os.path.join(root_path, APPS_PATH)
+        #     app_values = self.collect_app_values(
+        #         app_base_path, base_image_name=base_image_name)
+        #     helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
+        #                                        app_values)
+
+    # def collect_app_values(self, app_base_path, base_image_name=None):
+    #     values = {}
+
+    #     for app_path in get_sub_paths(app_base_path):
+    #         app_name = app_name_from_path(
+    #             os.path.relpath(app_path, app_base_path))
+
+    #         if app_name in self.exclude:
+    #             continue
+    #         app_key = app_name.replace('-', '_')
+
+    #         app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
+
+    #         values[app_key] = dict_merge(
+    #             values[app_key], app_values) if app_key in values else app_values
+
+    #     return values
+
+    # def __init_static_images(self, base_image_name):
+    #     for static_img_dockerfile in self.static_images:
+    #         img_name = image_name_from_dockerfile_path(os.path.basename(
+    #             static_img_dockerfile), base_name=base_image_name)
+    #         self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
+    #             img_name, build_context_path=static_img_dockerfile)
+
+    # def __assign_static_build_dependencies(self, helm_values):
+    #     for static_img_dockerfile in self.static_images:
+    #         key = os.path.basename(static_img_dockerfile)
+    #         if key in helm_values[KEY_TASK_IMAGES]:
+    #             dependencies = guess_build_dependencies_from_dockerfile(
+    #                 static_img_dockerfile)
+    #             for dep in dependencies:
+    #                 if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
+    #                     helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
+
+    #     for image_name in list(helm_values[KEY_TASK_IMAGES].keys()):
+    #         if image_name in self.exclude:
+    #             del helm_values[KEY_TASK_IMAGES][image_name]
+
+    # def __init_base_images(self, base_image_name):
+
+    #     for root_path in self.root_paths:
+    #         for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
+    #             img_name = image_name_from_dockerfile_path(
+    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
+    #             self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+    #                 img_name, build_context_path=root_path)
+
+    #         self.static_images.update(find_dockerfiles_paths(
+    #             os.path.join(root_path, STATIC_IMAGES_PATH)))
+    #     return self.base_images
+
+    # def __init_test_images(self, base_image_name):
+    #     test_images = {}
+    #     for root_path in self.root_paths:
+    #         for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
+    #             img_name = image_name_from_dockerfile_path(
+    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
+    #             test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
+    #                 img_name, build_context_path=base_img_dockerfile)
+
+    #     return test_images
+
+
+    # def __find_static_dockerfile_paths(self, root_path):
+    #     return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
+
+    # def __merge_base_helm_values(self, helm_values):
+    #     # Override for every cloudharness scaffolding
+    #     for root_path in self.root_paths:
+    #         helm_values = dict_merge(
+    #             helm_values,
+    #             collect_helm_values(root_path, env=self.env)
+    #         )
+
+    #     return helm_values
+
+    # def __get_default_helm_values(self):
+    #     helm_values = get_template(os.path.join(
+    #         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH, 'values.yaml'))
+    #     helm_values = dict_merge(helm_values,
+    #                              collect_helm_values(CH_ROOT, env=self.env))
+
+        # return helm_values
+
+    # def create_tls_certificate(self, helm_values):
+    #     if not self.tls:
+    #         helm_values['tls'] = None
+    #         return
+    #     if not self.local:
+    #         return
+    #     helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
+
+    #     bootstrap_file = 'bootstrap.sh'
+    #     certs_parent_folder_path = os.path.join(
+    #         self.output_path, 'helm', 'resources')
+    #     certs_folder_path = os.path.join(certs_parent_folder_path, 'certs')
+
+    #     if os.path.exists(os.path.join(certs_folder_path)):
+    #         # don't overwrite the certificate if it exists
+    #         return
+
+    #     try:
+    #         client = DockerClient()
+    #         client.ping()
+    #     except:
+    #         raise ConnectionRefusedError(
+    #             '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
+
+    #     # Create CA and sign cert for domain
+    #     container = client.containers.run(image='frapsoft/openssl',
+    #                                       command=f'sleep 60',
+    #                                       entrypoint="",
+    #                                       detach=True,
+    #                                       environment=[
+    #                                           f"DOMAIN={self.domain}"],
+    #                                       )
+
+    #     container.exec_run('mkdir -p /mnt/vol1')
+    #     container.exec_run('mkdir -p /mnt/certs')
+
+    #     # copy bootstrap file
+    #     cur_dir = os.getcwd()
+    #     os.chdir(os.path.join(HERE, 'scripts'))
+    #     tar = tarfile.open(bootstrap_file + '.tar', mode='w')
+    #     try:
+    #         tar.add(bootstrap_file)
+    #     finally:
+    #         tar.close()
+    #     data = open(bootstrap_file + '.tar', 'rb').read()
+    #     container.put_archive('/mnt/vol1', data)
+    #     os.chdir(cur_dir)
+    #     container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
+
+    #     # exec bootstrap file
+    #     container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
+
+    #     # retrieve the certs from the container
+    #     bits, stat = container.get_archive('/mnt/certs')
+    #     if not os.path.exists(certs_folder_path):
+    #         os.makedirs(certs_folder_path)
+    #     f = open(f'{certs_parent_folder_path}/certs.tar', 'wb')
+    #     for chunk in bits:
+    #         f.write(chunk)
+    #     f.close()
+    #     cf = tarfile.open(f'{certs_parent_folder_path}/certs.tar')
+    #     cf.extractall(path=certs_parent_folder_path)
+
+    #     logs = container.logs()
+    #     logging.info(f'openssl container logs: {logs}')
+
+    #     # stop the container
+    #     container.kill()
+
+    #     logging.info("Created certificates for local deployment")
 
     def __finish_helm_values(self, values):
         """
@@ -370,7 +363,7 @@ def __finish_helm_values(self, values):
             if harness[KEY_DATABASE] and not harness[KEY_DATABASE].get('name', None):
                 harness[KEY_DATABASE]['name'] = app_name.strip() + '-db'
 
-            self.__clear_unused_db_configuration(harness)
+            self._clear_unused_db_configuration(harness)
             values_set_legacy(v)
 
         if self.include:
@@ -390,36 +383,36 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    def __clear_unused_db_configuration(self, harness_config):
-        database_config = harness_config[KEY_DATABASE]
-        database_type = database_config.get('type', None)
-        if database_type is None:
-            del harness_config[KEY_DATABASE]
-            return
-        db_specific_keys = [k for k, v in database_config.items()
-                            if isinstance(v, dict) and 'image' in v and 'ports' in v]
-        for db in db_specific_keys:
-            if database_type != db:
-                del database_config[db]
-
-    def image_tag(self, image_name, build_context_path=None, dependencies=()):
-        tag = self.tag
-        if tag is None and not self.local:
-            logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
-            ignore_path = os.path.join(build_context_path, '.dockerignore')
-            ignore = set(DEFAULT_IGNORE)
-            if os.path.exists(ignore_path):
-                with open(ignore_path) as f:
-                    ignore = ignore.union({line.strip() for line in f})
-            logging.info(f"Ignoring {ignore}")
-            tag = generate_tag_from_content(build_context_path, ignore)
-            logging.info(f"Content hash: {tag}")
-            dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-            tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
-            logging.info(f"Generated tag: {tag}")
-            app_name = image_name.split("/")[-1] # the image name can have a prefix
-            self.all_images[app_name] = tag
-        return self.registry + image_name + (f':{tag}' if tag else '')
+    # def __clear_unused_db_configuration(self, harness_config):
+    #     database_config = harness_config[KEY_DATABASE]
+    #     database_type = database_config.get('type', None)
+    #     if database_type is None:
+    #         del harness_config[KEY_DATABASE]
+    #         return
+    #     db_specific_keys = [k for k, v in database_config.items()
+    #                         if isinstance(v, dict) and 'image' in v and 'ports' in v]
+    #     for db in db_specific_keys:
+    #         if database_type != db:
+    #             del database_config[db]
+
+    # def image_tag(self, image_name, build_context_path=None, dependencies=()):
+    #     tag = self.tag
+    #     if tag is None and not self.local:
+    #         logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
+    #         ignore_path = os.path.join(build_context_path, '.dockerignore')
+    #         ignore = set(DEFAULT_IGNORE)
+    #         if os.path.exists(ignore_path):
+    #             with open(ignore_path) as f:
+    #                 ignore = ignore.union({line.strip() for line in f})
+    #         logging.info(f"Ignoring {ignore}")
+    #         tag = generate_tag_from_content(build_context_path, ignore)
+    #         logging.info(f"Content hash: {tag}")
+    #         dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
+    #         tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
+    #         logging.info(f"Generated tag: {tag}")
+    #         app_name = image_name.split("/")[-1] # the image name can have a prefix
+    #         self.all_images[app_name] = tag
+    #     return self.registry + image_name + (f':{tag}' if tag else '')
 
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
@@ -487,282 +480,282 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         return values
 
 
-def get_included_with_dependencies(values, include):
-    app_values = values['apps'].values()
-    directly_included = [app for app in app_values if any(
-        inc == app[KEY_HARNESS]['name'] for inc in include)]
-
-    dependent = set(include)
-    for app in directly_included:
-        if app['harness']['dependencies'].get('hard', None):
-            dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
-        if app['harness']['dependencies'].get('soft', None):
-            dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
-        if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
-            dependent.add('accounts')
-    if len(dependent) == len(include):
-        return dependent
-    return get_included_with_dependencies(values, dependent)
-
-
-def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
-    pass
-
-
-def collect_apps_helm_templates(search_root, dest_helm_chart_path, exclude=(), include=None):
-    """
-    Searches recursively for helm templates inside the applications and collects the templates in the destination
-
-    :param search_root:
-    :param dest_helm_chart_path: collected helm templates destination folder
-    :param exclude:
-    :return:
-    """
-    app_base_path = os.path.join(search_root, APPS_PATH)
-
-    for app_path in get_sub_paths(app_base_path):
-        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
-        if app_name in exclude or (include and not any(inc in app_name for inc in include)):
-            continue
-        template_dir = os.path.join(app_path, 'deploy', 'templates')
-        if os.path.exists(template_dir):
-            dest_dir = os.path.join(
-                dest_helm_chart_path, 'templates', app_name)
-
-            logging.info(
-                "Collecting templates for application %s to %s", app_name, dest_dir)
-            if os.path.exists(dest_dir):
-                logging.warning(
-                    "Merging/overriding all files in directory %s", dest_dir)
-                merge_configuration_directories(template_dir, dest_dir)
-            else:
-                shutil.copytree(template_dir, dest_dir)
-        resources_dir = os.path.join(app_path, 'deploy/resources')
-        if os.path.exists(resources_dir):
-            dest_dir = os.path.join(
-                dest_helm_chart_path, 'resources', app_name)
-
-            logging.info(
-                "Collecting resources for application  %s to %s", app_name, dest_dir)
-
-            merge_configuration_directories(resources_dir, dest_dir)
-
-        subchart_dir = os.path.join(app_path, 'deploy/charts')
-        if os.path.exists(subchart_dir):
-            dest_dir = os.path.join(dest_helm_chart_path, 'charts', app_name)
-
-            logging.info(
-                "Collecting templates for application %s to %s", app_name, dest_dir)
-            if os.path.exists(dest_dir):
-                logging.warning(
-                    "Merging/overriding all files in directory %s", dest_dir)
-                merge_configuration_directories(subchart_dir, dest_dir)
-            else:
-                shutil.copytree(subchart_dir, dest_dir)
-
-
-def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
-    if not os.path.exists(base_helm_chart):
-        return
-    if os.path.exists(dest_helm_chart_path):
-        logging.info("Merging/overriding all files in directory %s",
-                     dest_helm_chart_path)
-        merge_configuration_directories(base_helm_chart, dest_helm_chart_path)
-    else:
-        logging.info("Copying base deployment chart from %s to %s",
-                     base_helm_chart, dest_helm_chart_path)
-        shutil.copytree(base_helm_chart, dest_helm_chart_path)
-
-
-def collect_helm_values(deployment_root, env=()):
-    """
-    Creates helm values from a cloudharness deployment scaffolding
-    """
-
-    values_template_path = os.path.join(
-        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'values-template.yaml')
-
-    values = get_template(values_template_path)
-
-    for e in env:
-        specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
-                                              f'values-template-{e}.yaml')
-        if os.path.exists(specific_template_path):
-            logging.info(
-                "Specific environment values template found: " + specific_template_path)
-            with open(specific_template_path) as f:
-                values_env_specific = yaml.safe_load(f)
-            values = dict_merge(values, values_env_specific)
-    return values
-
-
-def init_app_values(deployment_root, exclude, values=None):
-    values = values if values is not None else {}
-    app_base_path = os.path.join(deployment_root, APPS_PATH)
-    overridden_template_path = os.path.join(
-        deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-    default_values_path = os.path.join(
-        CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-
-    for app_path in get_sub_paths(app_base_path):
-
-        app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
-
-        if app_name in exclude:
-            continue
-        app_key = app_name.replace('-', '_')
-        if app_key not in values:
-            default_values = get_template(default_values_path)
-            values[app_key] = default_values
-        overridden_defaults = get_template(overridden_template_path)
-        values[app_key] = dict_merge(values[app_key], overridden_defaults)
-
-    return values
-
-
-def values_from_legacy(values):
-    if KEY_HARNESS not in values:
-        values[KEY_HARNESS] = {}
-    harness = values[KEY_HARNESS]
-    if KEY_SERVICE not in harness:
-        harness[KEY_SERVICE] = {}
-    if KEY_DEPLOYMENT not in harness:
-        harness[KEY_DEPLOYMENT] = {}
-    if KEY_DATABASE not in harness:
-        harness[KEY_DATABASE] = {}
-
-    if 'subdomain' in values:
-        harness['subdomain'] = values['subdomain']
-    if 'autodeploy' in values:
-        harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
-    if 'autoservice' in values:
-        harness[KEY_SERVICE]['auto'] = values['autoservice']
-    if 'secureme' in values:
-        harness['secured'] = values['secureme']
-    if 'resources' in values:
-        harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
-    if 'replicas' in values:
-        harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
-    if 'image' in values:
-        harness[KEY_DEPLOYMENT]['image'] = values['image']
-    if 'port' in values:
-        harness[KEY_DEPLOYMENT]['port'] = values['port']
-        harness[KEY_SERVICE]['port'] = values['port']
-
-
-def values_set_legacy(values):
-    harness = values[KEY_HARNESS]
-    if 'image' in harness[KEY_DEPLOYMENT]:
-        values['image'] = harness[KEY_DEPLOYMENT]['image']
-
-    values['name'] = harness['name']
-    if harness[KEY_DEPLOYMENT].get('port', None):
-        values['port'] = harness[KEY_DEPLOYMENT]['port']
-    if 'resources' in harness[KEY_DEPLOYMENT]:
-        values['resources'] = harness[KEY_DEPLOYMENT]['resources']
-
-
-def generate_tag_from_content(content_path, ignore=()):
-    from dirhash import dirhash
-    return dirhash(content_path, 'sha1', ignore=ignore)
-
-
-def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
-    if isinstance(values, dict):
-        newenvs = list(envs)
-        for key, value in values.items():
-            v = extract_env_variables_from_values(
-                value, envs, f"{prefix}_{key}".replace('-', '_').upper())
-            if key in ('name', 'port', 'subdomain'):
-                newenvs.extend(v)
-        return newenvs
-    else:
-        return [env_variable(prefix, values)]
-
-
-def create_env_variables(values):
-    for app_name, value in values[KEY_APPS].items():
-        if KEY_HARNESS in value:
-            values['env'].extend(extract_env_variables_from_values(
-                value[KEY_HARNESS], prefix='CH_' + app_name))
-    values['env'].append(env_variable('CH_DOMAIN', values['domain']))
-    values['env'].append(env_variable(
-        'CH_IMAGE_REGISTRY', values['registry']['name']))
-    values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
-
-
-def hosts_info(values):
-    domain = values['domain']
-    namespace = values['namespace']
-    subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
-                  KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
-                                                                           KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
-    try:
-        ip = get_cluster_ip()
-    except:
-        logging.warning('Cannot get cluster ip')
-        return
-    logging.info(
-        "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
-
-    deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
-                   for app in values[KEY_APPS].values() if KEY_HARNESS in app)
-
-    logging.info(
-        "\nTo run locally some apps, also those references may be needed")
-    for appname in values[KEY_APPS]:
-        app = values[KEY_APPS][appname]['harness']
-        if 'deployment' not in app:
-            continue
-        print(
-            "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
-                app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
-
-    print(
-        f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
-
-
-class ValuesValidationException(Exception):
-    pass
-
-
-def validate_helm_values(values):
-    validate_dependencies(values)
-
-
-def validate_dependencies(values):
-    all_apps = {a for a in values["apps"]}
-    for app in all_apps:
-        app_values = values["apps"][app]
-        if 'dependencies' in app_values[KEY_HARNESS]:
-            soft_dependencies = {
-                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
-            not_found = {d for d in soft_dependencies if d not in all_apps}
-            if not_found:
-                logging.warning(
-                    f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
-            hard_dependencies = {
-                d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
-            not_found = {d for d in hard_dependencies if d not in all_apps}
-            if not_found:
-                raise ValuesValidationException(
-                    f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
-
-            build_dependencies = {
-                d for d in app_values[KEY_HARNESS]['dependencies']['build']}
-
-            not_found = {
-                d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
-            not_found = {d for d in not_found if d not in all_apps}
-            if not_found:
-                raise ValuesValidationException(
-                    f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
-
-        if 'use_services' in app_values[KEY_HARNESS]:
-            service_dependencies = {d['name'].replace(
-                "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
-
-            not_found = {d for d in service_dependencies if d not in all_apps}
-            if not_found:
-                raise ValuesValidationException(
-                    f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
+# def get_included_with_dependencies(values, include):
+#     app_values = values['apps'].values()
+#     directly_included = [app for app in app_values if any(
+#         inc == app[KEY_HARNESS]['name'] for inc in include)]
+
+#     dependent = set(include)
+#     for app in directly_included:
+#         if app['harness']['dependencies'].get('hard', None):
+#             dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
+#         if app['harness']['dependencies'].get('soft', None):
+#             dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
+#         if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
+#             dependent.add('accounts')
+#     if len(dependent) == len(include):
+#         return dependent
+#     return get_included_with_dependencies(values, dependent)
+
+
+# def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
+#     pass
+
+
+# def collect_apps_helm_templates(search_root, dest_helm_chart_path, exclude=(), include=None):
+#     """
+#     Searches recursively for helm templates inside the applications and collects the templates in the destination
+
+#     :param search_root:
+#     :param dest_helm_chart_path: collected helm templates destination folder
+#     :param exclude:
+#     :return:
+#     """
+#     app_base_path = os.path.join(search_root, APPS_PATH)
+
+#     for app_path in get_sub_paths(app_base_path):
+#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+#         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
+#             continue
+#         template_dir = os.path.join(app_path, 'deploy', 'templates')
+#         if os.path.exists(template_dir):
+#             dest_dir = os.path.join(
+#                 dest_helm_chart_path, 'templates', app_name)
+
+#             logging.info(
+#                 "Collecting templates for application %s to %s", app_name, dest_dir)
+#             if os.path.exists(dest_dir):
+#                 logging.warning(
+#                     "Merging/overriding all files in directory %s", dest_dir)
+#                 merge_configuration_directories(template_dir, dest_dir)
+#             else:
+#                 shutil.copytree(template_dir, dest_dir)
+#         resources_dir = os.path.join(app_path, 'deploy/resources')
+#         if os.path.exists(resources_dir):
+#             dest_dir = os.path.join(
+#                 dest_helm_chart_path, 'resources', app_name)
+
+#             logging.info(
+#                 "Collecting resources for application  %s to %s", app_name, dest_dir)
+
+#             merge_configuration_directories(resources_dir, dest_dir)
+
+#         subchart_dir = os.path.join(app_path, 'deploy/charts')
+#         if os.path.exists(subchart_dir):
+#             dest_dir = os.path.join(dest_helm_chart_path, 'charts', app_name)
+
+#             logging.info(
+#                 "Collecting templates for application %s to %s", app_name, dest_dir)
+#             if os.path.exists(dest_dir):
+#                 logging.warning(
+#                     "Merging/overriding all files in directory %s", dest_dir)
+#                 merge_configuration_directories(subchart_dir, dest_dir)
+#             else:
+#                 shutil.copytree(subchart_dir, dest_dir)
+
+
+# def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
+#     if not os.path.exists(base_helm_chart):
+#         return
+#     if os.path.exists(dest_helm_chart_path):
+#         logging.info("Merging/overriding all files in directory %s",
+#                      dest_helm_chart_path)
+#         merge_configuration_directories(base_helm_chart, dest_helm_chart_path)
+#     else:
+#         logging.info("Copying base deployment chart from %s to %s",
+#                      base_helm_chart, dest_helm_chart_path)
+#         shutil.copytree(base_helm_chart, dest_helm_chart_path)
+
+
+# def collect_helm_values(deployment_root, env=()):
+#     """
+#     Creates helm values from a cloudharness deployment scaffolding
+#     """
+
+#     values_template_path = os.path.join(
+#         deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'values-template.yaml')
+
+#     values = get_template(values_template_path)
+
+#     for e in env:
+#         specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
+#                                               f'values-template-{e}.yaml')
+#         if os.path.exists(specific_template_path):
+#             logging.info(
+#                 "Specific environment values template found: " + specific_template_path)
+#             with open(specific_template_path) as f:
+#                 values_env_specific = yaml.safe_load(f)
+#             values = dict_merge(values, values_env_specific)
+#     return values
+
+
+# def init_app_values(deployment_root, exclude, values=None):
+#     values = values if values is not None else {}
+#     app_base_path = os.path.join(deployment_root, APPS_PATH)
+#     overridden_template_path = os.path.join(
+#         deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+#     default_values_path = os.path.join(
+#         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
+
+#     for app_path in get_sub_paths(app_base_path):
+
+#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
+
+#         if app_name in exclude:
+#             continue
+#         app_key = app_name.replace('-', '_')
+#         if app_key not in values:
+#             default_values = get_template(default_values_path)
+#             values[app_key] = default_values
+#         overridden_defaults = get_template(overridden_template_path)
+#         values[app_key] = dict_merge(values[app_key], overridden_defaults)
+
+#     return values
+
+
+# def values_from_legacy(values):
+#     if KEY_HARNESS not in values:
+#         values[KEY_HARNESS] = {}
+#     harness = values[KEY_HARNESS]
+#     if KEY_SERVICE not in harness:
+#         harness[KEY_SERVICE] = {}
+#     if KEY_DEPLOYMENT not in harness:
+#         harness[KEY_DEPLOYMENT] = {}
+#     if KEY_DATABASE not in harness:
+#         harness[KEY_DATABASE] = {}
+
+#     if 'subdomain' in values:
+#         harness['subdomain'] = values['subdomain']
+#     if 'autodeploy' in values:
+#         harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
+#     if 'autoservice' in values:
+#         harness[KEY_SERVICE]['auto'] = values['autoservice']
+#     if 'secureme' in values:
+#         harness['secured'] = values['secureme']
+#     if 'resources' in values:
+#         harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
+#     if 'replicas' in values:
+#         harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
+#     if 'image' in values:
+#         harness[KEY_DEPLOYMENT]['image'] = values['image']
+#     if 'port' in values:
+#         harness[KEY_DEPLOYMENT]['port'] = values['port']
+#         harness[KEY_SERVICE]['port'] = values['port']
+
+
+# def values_set_legacy(values):
+#     harness = values[KEY_HARNESS]
+#     if 'image' in harness[KEY_DEPLOYMENT]:
+#         values['image'] = harness[KEY_DEPLOYMENT]['image']
+
+#     values['name'] = harness['name']
+#     if harness[KEY_DEPLOYMENT].get('port', None):
+#         values['port'] = harness[KEY_DEPLOYMENT]['port']
+#     if 'resources' in harness[KEY_DEPLOYMENT]:
+#         values['resources'] = harness[KEY_DEPLOYMENT]['resources']
+
+
+# def generate_tag_from_content(content_path, ignore=()):
+#     from dirhash import dirhash
+#     return dirhash(content_path, 'sha1', ignore=ignore)
+
+
+# def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
+#     if isinstance(values, dict):
+#         newenvs = list(envs)
+#         for key, value in values.items():
+#             v = extract_env_variables_from_values(
+#                 value, envs, f"{prefix}_{key}".replace('-', '_').upper())
+#             if key in ('name', 'port', 'subdomain'):
+#                 newenvs.extend(v)
+#         return newenvs
+#     else:
+#         return [env_variable(prefix, values)]
+
+
+# def create_env_variables(values):
+#     for app_name, value in values[KEY_APPS].items():
+#         if KEY_HARNESS in value:
+#             values['env'].extend(extract_env_variables_from_values(
+#                 value[KEY_HARNESS], prefix='CH_' + app_name))
+#     values['env'].append(env_variable('CH_DOMAIN', values['domain']))
+#     values['env'].append(env_variable(
+#         'CH_IMAGE_REGISTRY', values['registry']['name']))
+#     values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
+
+
+# def hosts_info(values):
+#     domain = values['domain']
+#     namespace = values['namespace']
+#     subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
+#                   KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
+#                                                                            KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
+#     try:
+#         ip = get_cluster_ip()
+#     except:
+#         logging.warning('Cannot get cluster ip')
+#         return
+#     logging.info(
+#         "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
+
+#     deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
+#                    for app in values[KEY_APPS].values() if KEY_HARNESS in app)
+
+#     logging.info(
+#         "\nTo run locally some apps, also those references may be needed")
+#     for appname in values[KEY_APPS]:
+#         app = values[KEY_APPS][appname]['harness']
+#         if 'deployment' not in app:
+#             continue
+#         print(
+#             "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
+#                 app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
+
+#     print(
+#         f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
+
+
+# class ValuesValidationException(Exception):
+#     pass
+
+
+# def validate_helm_values(values):
+#     validate_dependencies(values)
+
+
+# def validate_dependencies(values):
+#     all_apps = {a for a in values["apps"]}
+#     for app in all_apps:
+#         app_values = values["apps"][app]
+#         if 'dependencies' in app_values[KEY_HARNESS]:
+#             soft_dependencies = {
+#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
+#             not_found = {d for d in soft_dependencies if d not in all_apps}
+#             if not_found:
+#                 logging.warning(
+#                     f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
+#             hard_dependencies = {
+#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
+#             not_found = {d for d in hard_dependencies if d not in all_apps}
+#             if not_found:
+#                 raise ValuesValidationException(
+#                     f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
+
+#             build_dependencies = {
+#                 d for d in app_values[KEY_HARNESS]['dependencies']['build']}
+
+#             not_found = {
+#                 d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
+#             not_found = {d for d in not_found if d not in all_apps}
+#             if not_found:
+#                 raise ValuesValidationException(
+#                     f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
+
+#         if 'use_services' in app_values[KEY_HARNESS]:
+#             service_dependencies = {d['name'].replace(
+#                 "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
+
+#             not_found = {d for d in service_dependencies if d not in all_apps}
+#             if not_found:
+#                 raise ValuesValidationException(
+#                     f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
diff --git a/tools/deployment-cli-tools/tests/test_codefresh.py b/tools/deployment-cli-tools/tests/test_codefresh.py
index 7e3abd4d..e4505a9f 100644
--- a/tools/deployment-cli-tools/tests/test_codefresh.py
+++ b/tools/deployment-cli-tools/tests/test_codefresh.py
@@ -1,6 +1,7 @@
 from ch_cli_tools.preprocessing import preprocess_build_overrides
 
 from ch_cli_tools.helm import *
+from ch_cli_tools.configurationgenerator import *
 from ch_cli_tools.codefresh import *
 
 HERE = os.path.dirname(os.path.realpath(__file__))
@@ -126,7 +127,7 @@ def test_create_codefresh_configuration():
         assert len(
             tstep['commands']) == 2, "Unit test commands are not properly loaded from the unit test configuration file"
         assert tstep['commands'][0] == "tox", "Unit test commands are not properly loaded from the unit test configuration file"
-    
+
         assert len(l1_steps[CD_BUILD_STEP_DEPENDENCIES]['steps']) == 3, "3 clone steps should be included as we have 2 dependencies from myapp, plus cloudharness"
     finally:
         shutil.rmtree(BUILD_MERGE_DIR)
@@ -213,7 +214,7 @@ def test_create_codefresh_configuration_tests():
 
         assert "test-api" in st_build_test_steps["test-api"]["dockerfile"], "test-api image must be built from root context"
 
-        
+
 
         e2e_steps = l1_steps[CD_E2E_TEST_STEP]['scale']
 
@@ -251,7 +252,7 @@ def test_create_codefresh_configuration_tests():
 
     finally:
         shutil.rmtree(BUILD_MERGE_DIR)
-    
+
     values = create_helm_chart(
         [CLOUDHARNESS_ROOT, RESOURCES],
         output_path=OUT,
diff --git a/tools/deployment-cli-tools/tests/test_helm.py b/tools/deployment-cli-tools/tests/test_helm.py
index ed53ab86..5fa269d6 100644
--- a/tools/deployment-cli-tools/tests/test_helm.py
+++ b/tools/deployment-cli-tools/tests/test_helm.py
@@ -1,6 +1,7 @@
 import shutil
 
 from ch_cli_tools.helm import *
+from ch_cli_tools.configurationgenerator import *
 
 HERE = os.path.dirname(os.path.realpath(__file__))
 RESOURCES = os.path.join(HERE, 'resources')
@@ -80,8 +81,9 @@ def exists(*args):
     shutil.rmtree(OUT)
 
 
-def test_collect_helm_values_noreg_noinclude():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+def test_collect_helm_values_noreg_noinclude(tmp_path):
+    out_path = tmp_path / 'test_collect_helm_values_noreg_noinclude'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_path, domain="my.local",
                                namespace='test', env='dev', local=False, tag=1)
 
     # Auto values
@@ -119,7 +121,7 @@ def test_collect_helm_values_noreg_noinclude():
     assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] == True
     assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] == False
 
-    helm_path = os.path.join(OUT, HELM_CHART_PATH)
+    helm_path = out_path / HELM_CHART_PATH
 
     def exists(*args):
         return os.path.exists(os.path.join(*args))
@@ -137,8 +139,6 @@ def exists(*args):
     assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'cloudharness/cloudharness-base:1'
     assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'cloudharness/myapp-mytask:1'
 
-    shutil.rmtree(OUT)
-
 
 def test_collect_helm_values_precedence():
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
@@ -302,13 +302,13 @@ def create():
         return create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, include=['samples', 'myapp'],
                                exclude=['events'], domain="my.local",
                                namespace='test', env='dev', local=False, tag=None, registry='reg')
-    
+
     BASE_KEY = "cloudharness-base"
     values = create()
 
     # Auto values are set by using the directory hash
     assert 'reg/cloudharness/myapp:' in values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image']
-    assert 'reg/cloudharness/myapp:' in values.apps['myapp'].harness.deployment.image 
+    assert 'reg/cloudharness/myapp:' in values.apps['myapp'].harness.deployment.image
     assert 'cloudharness/myapp-mytask' in values[KEY_TASK_IMAGES]['myapp-mytask']
     assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == values.apps['myapp'].harness.deployment.image
     v1 = values.apps['myapp'].harness.deployment.image
@@ -320,7 +320,7 @@ def create():
     assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing changed the hash value"
     assert values["task-images"][BASE_KEY] == b1, "Base image should not change following the root .dockerignore"
 
-        
+
     try:
         fname = os.path.join(RESOURCES, 'applications', 'myapp', 'afile.txt')
         with open(fname, 'w') as f:
@@ -355,7 +355,7 @@ def create():
         assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing should change the hash value as the file is ignored in the .dockerignore"
     finally:
         os.remove(fname)
-    
+
 
 
     # Dependencies test: if a dependency is changed, the hash should change
@@ -366,7 +366,7 @@ def create():
             f.write('a')
 
         values = create()
-        
+
         assert c1 != values["task-images"]["my-common"], "If content of a static image is changed, the hash should change"
         assert v1 != values.apps['myapp'].harness.deployment.image, "If a static image dependency is changed, the hash should change"
     finally:
@@ -379,12 +379,9 @@ def create():
             f.write('a')
 
         values = create()
-        
+
         assert b1 != values["task-images"][BASE_KEY], "Content for base image is changed, the hash should change"
         assert d1 != values["task-images"]["cloudharness-flask"], "Content for base image is changed, the static image should change"
         assert v1 != values.apps['myapp'].harness.deployment.image, "2 levels dependency: If a base image dependency is changed, the hash should change"
     finally:
         os.remove(fname)
-
-
-

From 368725aa5af146a1fcdaff219fd1cfbb5aa4d4c7 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 07:37:54 -0600
Subject: [PATCH 067/210] CH-100 Clean imports/comments

---
 .../ch_cli_tools/dockercompose.py             | 572 +-----------------
 .../deployment-cli-tools/ch_cli_tools/helm.py | 547 +----------------
 2 files changed, 6 insertions(+), 1113 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 0e75ed7e..f65e352b 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -4,23 +4,14 @@
 import yaml
 from ruamel.yaml import YAML
 import os
-import shutil
 import logging
-from hashlib import sha1
 import subprocess
-from functools import cache
-import tarfile
-from docker import from_env as DockerClient
-from pathlib import Path
 import copy
 
 
-from . import HERE, CH_ROOT
-from cloudharness_utils.constants import TEST_IMAGES_PATH, VALUES_MANUAL_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
-    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH, COMPOSE
-from .utils import get_cluster_ip, get_image_name, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
-    get_template, merge_configuration_directories, merge_to_yaml_file, dict_merge, app_name_from_path, \
-    find_dockerfiles_paths, find_file_paths
+from cloudharness_utils.constants import VALUES_MANUAL_PATH, COMPOSE
+from .utils import get_cluster_ip, image_name_from_dockerfile_path, get_template, \
+    merge_to_yaml_file, dict_merge, app_name_from_path, find_dockerfiles_paths, find_file_paths
 
 from .models import HarnessMainConfig
 
@@ -38,57 +29,6 @@ def create_docker_compose_configuration(root_paths, tag='latest', registry='', l
 
 
 class CloudHarnessDockerCompose(ConfigurationGenerator):
-    # def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
-    #              output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-    #              namespace=None, templates_path=HELM_PATH):
-    #     assert domain, 'A domain must be specified'
-    #     self.root_paths = [Path(r) for r in root_paths]
-    #     self.tag = tag
-    #     if registry and not registry.endswith('/'):
-    #         self.registry = f'{registry}/'
-    #     else:
-    #         self.registry = registry
-    #     self.local = local
-    #     self.domain = domain
-    #     self.exclude = exclude
-    #     self.secured = secured
-    #     self.output_path = Path(output_path)
-    #     self.include = include
-    #     self.registry_secret = registry_secret
-    #     self.tls = tls
-    #     self.env = env
-    #     self.namespace = namespace
-
-    #     self.templates_path = templates_path
-    #     self.dest_deployment_path = self.output_path / templates_path
-    #     self.helm_chart_path = self.dest_deployment_path / 'Chart.yaml'
-    #     self.__init_deployment()
-
-    #     self.static_images = set()
-    #     self.base_images = {}
-    #     self.all_images = {}
-
-    # def __init_deployment(self):
-    #     """
-    #     Create the base helm chart
-    #     """
-    #     if self.dest_deployment_path.exists():
-    #         shutil.rmtree(self.dest_deployment_path)
-    #     # Initialize with default
-    #     copy_merge_base_deployment(self.dest_deployment_path, Path(CH_ROOT) / DEPLOYMENT_CONFIGURATION_PATH / self.templates_path)
-
-    #     # Override for every cloudharness scaffolding
-    #     for root_path in self.root_paths:
-    #         copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
-    #                                    base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH /self.templates_path)
-    #         collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
-    #                                     dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
-
-    # def __adjust_missing_values(self, helm_values):
-    #     if 'name' not in helm_values:
-    #         with open(self.helm_chart_path) as f:
-    #             chart_idx_content = yaml.safe_load(f)
-    #         helm_values['name'] = chart_idx_content['name'].lower()
 
     def process_values(self) -> HarnessMainConfig:
         """
@@ -176,133 +116,6 @@ def __post_process_multiple_document_docker_compose(self, yaml_document):
                 main_document = document  # we need to save the main document later
         yaml_handler.dump(main_document, yaml_document)
 
-    # def __process_applications(self, helm_values, base_image_name):
-    #     for root_path in self.root_paths:
-    #         app_values = init_app_values(
-    #             root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
-    #         helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-    #                                            app_values)
-
-    #         app_base_path = root_path / APPS_PATH
-    #         app_values = self.collect_app_values(
-    #             app_base_path, base_image_name=base_image_name)
-    #         helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-    #                                            app_values)
-
-    # def collect_app_values(self, app_base_path, base_image_name=None):
-    #     values = {}
-
-    #     for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
-    #         app_name = app_name_from_path(f"{app_path.relative_to(app_base_path)}")
-
-    #         if app_name in self.exclude:
-    #             continue
-    #         app_key = app_name.replace('-', '_')
-
-    #         app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
-
-    #         # dockerfile_path = next(app_path.rglob('**/Dockerfile'), None)
-    #         # # for dockerfile_path in app_path.rglob('**/Dockerfile'):
-    #         # #     parent_name = dockerfile_path.parent.name.replace("-", "_")
-    #         # #     if parent_name == app_key:
-    #         # #         app_values['build'] = {
-    #         # #             # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
-    #         # #             'dockerfile': "Dockerfile",
-    #         # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
-    #         # #         }
-    #         # #     elif "tasks/" in f"{dockerfile_path}":
-    #         # #         parent_name = parent_name.upper()
-    #         # #         values.setdefault("task-images-build", {})[parent_name] = {
-    #         # #             'dockerfile': "Dockerfile",
-    #         # #             'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
-    #         # #         }
-    #         # #         import ipdb; ipdb.set_trace()  # fmt: skip
-
-    #         # if dockerfile_path:
-    #         #     app_values['build'] = {
-    #         #         # 'dockerfile': f"{dockerfile_path.relative_to(app_path)}",
-    #         #         'dockerfile': "Dockerfile",
-    #         #         'context': os.path.relpath(dockerfile_path.parent, self.dest_deployment_path.parent),
-    #         #     }
-
-    #         values[app_key] = dict_merge(
-    #             values[app_key], app_values) if app_key in values else app_values
-
-    #     return values
-
-    # def __init_static_images(self, base_image_name):
-    #     for static_img_dockerfile in self.static_images:
-    #         img_name = image_name_from_dockerfile_path(os.path.basename(
-    #             static_img_dockerfile), base_name=base_image_name)
-    #         self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
-    #             img_name, build_context_path=static_img_dockerfile)
-
-    # def __assign_static_build_dependencies(self, helm_values):
-    #     for static_img_dockerfile in self.static_images:
-    #         key = os.path.basename(static_img_dockerfile)
-    #         if key in helm_values[KEY_TASK_IMAGES]:
-    #             dependencies = guess_build_dependencies_from_dockerfile(
-    #                 static_img_dockerfile)
-    #             for dep in dependencies:
-    #                 if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
-    #                     helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
-    #                     # helm_values.setdefault(KEY_TASK_IMAGES_BUILD, {})[dep] = {
-    #                     #     'context': os.path.relpath(static_img_dockerfile, self.dest_deployment_path.parent),
-    #                     #     'dockerfile': 'Dockerfile',
-    #                     # }
-
-    #     for image_name in helm_values[KEY_TASK_IMAGES].keys():
-    #         if image_name in self.exclude:
-    #             del helm_values[KEY_TASK_IMAGES][image_name]
-    #             # del helm_values[KEY_TASK_IMAGES_BUILD][image_name]
-
-    # def __init_base_images(self, base_image_name):
-
-    #     for root_path in self.root_paths:
-    #         for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
-    #             img_name = image_name_from_dockerfile_path(
-    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
-    #             self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-    #                 img_name, build_context_path=root_path)
-
-    #         self.static_images.update(find_dockerfiles_paths(
-    #             os.path.join(root_path, STATIC_IMAGES_PATH)))
-    #     return self.base_images
-
-    # def __init_test_images(self, base_image_name):
-    #     test_images = {}
-    #     for root_path in self.root_paths:
-    #         for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
-    #             img_name = image_name_from_dockerfile_path(
-    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
-    #             test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-    #                 img_name, build_context_path=base_img_dockerfile)
-
-    #     return test_images
-
-
-    # def __find_static_dockerfile_paths(self, root_path):
-    #     return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
-
-    # def __merge_base_helm_values(self, helm_values):
-    #     # Override for every cloudharness scaffolding
-    #     for root_path in self.root_paths:
-    #         helm_values = dict_merge(
-    #             helm_values,
-    #             collect_helm_values(root_path, env=self.env)
-    #         )
-
-    #     return helm_values
-
-    # def __get_default_helm_values(self):
-    #     ch_root_path = Path(CH_ROOT)
-    #     values_yaml_path = ch_root_path / DEPLOYMENT_CONFIGURATION_PATH / HELM_PATH / 'values.yaml'
-    #     helm_values = get_template(values_yaml_path)
-    #     helm_values = dict_merge(helm_values,
-    #                              collect_helm_values(ch_root_path, env=self.env))
-
-    #     return helm_values
-
     def __get_default_helm_values_with_secrets(self, helm_values):
         helm_values = copy.deepcopy(helm_values)
         # {{- $values_copy := deepCopy .Values }}
@@ -315,77 +128,6 @@ def __get_default_helm_values_with_secrets(self, helm_values):
             helm_values['apps'][key]['harness']['secrets'] = {}
         return helm_values
 
-    # def create_tls_certificate(self, helm_values):
-    #     if not self.tls:
-    #         helm_values['tls'] = None
-    #         return
-    #     if not self.local:
-    #         return
-    #     helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
-
-    #     bootstrap_file = 'bootstrap.sh'
-    #     certs_parent_folder_path = self.output_path / 'helm' / 'resources'
-    #     certs_folder_path = certs_parent_folder_path / 'certs'
-
-    #     # if os.path.exists(os.path.join(certs_folder_path)):
-    #     if certs_folder_path.exists():
-    #         # don't overwrite the certificate if it exists
-    #         return
-
-    #     try:
-    #         client = DockerClient()
-    #         client.ping()
-    #     except:
-    #         raise ConnectionRefusedError(
-    #             '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
-
-    #     # Create CA and sign cert for domain
-    #     container = client.containers.run(image='frapsoft/openssl',
-    #                                       command=f'sleep 60',
-    #                                       entrypoint="",
-    #                                       detach=True,
-    #                                       environment=[
-    #                                           f"DOMAIN={self.domain}"],
-    #                                       )
-
-    #     container.exec_run('mkdir -p /mnt/vol1')
-    #     container.exec_run('mkdir -p /mnt/certs')
-
-    #     # copy bootstrap file
-    #     cur_dir = os.getcwd()
-    #     os.chdir(Path(HERE) / 'scripts')
-    #     tar = tarfile.open(bootstrap_file + '.tar', mode='w')
-    #     try:
-    #         tar.add(bootstrap_file)
-    #     finally:
-    #         tar.close()
-    #     data = open(bootstrap_file + '.tar', 'rb').read()
-    #     container.put_archive('/mnt/vol1', data)
-    #     os.chdir(cur_dir)
-    #     container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
-
-    #     # exec bootstrap file
-    #     container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
-
-    #     # retrieve the certs from the container
-    #     bits, stat = container.get_archive('/mnt/certs')
-    #     if not certs_folder_path.exists():
-    #         certs_folder_path.mkdir(parents=True)
-    #     certs_tar = certs_parent_folder_path / 'certs.tar'
-    #     with open(certs_tar, 'wb') as f:
-    #         for chunk in bits:
-    #             f.write(chunk)
-    #     cf = tarfile.open(certs_tar)
-    #     cf.extractall(path=certs_parent_folder_path)
-
-    #     logs = container.logs()
-    #     logging.info(f'openssl container logs: {logs}')
-
-    #     # stop the container
-    #     container.kill()
-
-    #     logging.info("Created certificates for local deployment")
-
     def __finish_helm_values(self, values):
         """
         Sets default overridden values
@@ -456,37 +198,6 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    # def __clear_unused_db_configuration(self, harness_config):
-    #     database_config = harness_config[KEY_DATABASE]
-    #     database_type = database_config.get('type', None)
-    #     if database_type is None:
-    #         del harness_config[KEY_DATABASE]
-    #         return
-    #     db_specific_keys = [k for k, v in database_config.items()
-    #                         if isinstance(v, dict) and 'image' in v and 'ports' in v]
-    #     for db in db_specific_keys:
-    #         if database_type != db:
-    #             del database_config[db]
-
-    # def image_tag(self, image_name, build_context_path=None, dependencies=()):
-    #     tag = self.tag
-    #     if tag is None and not self.local:
-    #         logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
-    #         ignore_path = os.path.join(build_context_path, '.dockerignore')
-    #         ignore = set(DEFAULT_IGNORE)
-    #         if os.path.exists(ignore_path):
-    #             with open(ignore_path) as f:
-    #                 ignore = ignore.union({line.strip() for line in f})
-    #         logging.info(f"Ignoring {ignore}")
-    #         tag = generate_tag_from_content(build_context_path, ignore)
-    #         logging.info(f"Content hash: {tag}")
-    #         dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-    #         tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
-    #         logging.info(f"Generated tag: {tag}")
-    #         app_name = image_name.split("/")[-1] # the image name can have a prefix
-    #         self.all_images[app_name] = tag
-    #     return self.registry + image_name + (f':{tag}' if tag else '')
-
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
 
@@ -581,283 +292,6 @@ def inject_entry_points_commands(self, helm_values, image_path, app_path):
             helm_values[KEY_HARNESS]['deployment']['args'] = f'/usr/src/app/{os.path.basename(task_main_file)}/__main__.py'
 
 
-# def get_included_with_dependencies(values, include):
-#     app_values = values['apps'].values()
-#     directly_included = [app for app in app_values if any(
-#         inc == app[KEY_HARNESS]['name'] for inc in include)]
-
-#     dependent = set(include)
-#     for app in directly_included:
-#         if app['harness']['dependencies'].get('hard', None):
-#             dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
-#         if app['harness']['dependencies'].get('soft', None):
-#             dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
-#         if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
-#             dependent.add('accounts')
-#     if len(dependent) == len(include):
-#         return dependent
-#     return get_included_with_dependencies(values, dependent)
-
-
-# def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
-#     pass
-
-
-# def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_path, exclude=(), include=None):
-#     """
-#     Searches recursively for helm templates inside the applications and collects the templates in the destination
-
-#     :param search_root:
-#     :param dest_helm_chart_path: collected helm templates destination folder
-#     :param exclude:
-#     :return:
-#     """
-#     app_base_path = search_root / APPS_PATH
-
-#     for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
-#         app_name = app_name_from_path(os.path.relpath(f"{app_path}", app_base_path))
-#         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
-#             continue
-#         template_dir = app_path / 'deploy' / f'templates-{templates_path}'
-#         if template_dir.exists():
-#             dest_dir = dest_helm_chart_path / 'templates' / app_name
-
-#             logging.info(
-#                 "Collecting templates for application %s to %s", app_name, dest_dir)
-#             if dest_dir.exists():
-#                 logging.warning(
-#                     "Merging/overriding all files in directory %s", dest_dir)
-#                 merge_configuration_directories(f"{template_dir}", f"{dest_dir}")
-#             else:
-#                 shutil.copytree(template_dir, dest_dir)
-#         resources_dir = app_path / 'deploy' / 'resources'
-#         if resources_dir.exists():
-#             dest_dir = dest_helm_chart_path / 'resources' / app_name
-
-#             logging.info(
-#                 "Collecting resources for application  %s to %s", app_name, dest_dir)
-
-#             merge_configuration_directories(f"{resources_dir}", f"{dest_dir}")
-
-#         # subchart_dir = app_path / 'deploy/charts'
-#         # if subchart_dir.exists():
-#         #     dest_dir = dest_helm_chart_path / 'charts' / app_name
-
-#         #     logging.info(
-#         #         "Collecting templates for application %s to %s", app_name, dest_dir)
-#         #     if dest_dir.exists():
-#         #         logging.warning(
-#         #             "Merging/overriding all files in directory %s", dest_dir)
-#         #         merge_configuration_directories(f"{subchart_dir}", f"{dest_dir}")
-#         #     else:
-#         #         shutil.copytree(subchart_dir, dest_dir)
-
-
-# def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
-#     if not base_helm_chart.exists():
-#         return
-#     if dest_helm_chart_path.exists():
-#         logging.info("Merging/overriding all files in directory %s",
-#                      dest_helm_chart_path)
-#         merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
-#     else:
-#         logging.info("Copying base deployment chart from %s to %s",
-#                      base_helm_chart, dest_helm_chart_path)
-#         shutil.copytree(base_helm_chart, dest_helm_chart_path)
-
-
-# def collect_helm_values(deployment_root, env=()):
-#     """
-#     Creates helm values from a cloudharness deployment scaffolding
-#     """
-#     values_template_path = deployment_root / DEPLOYMENT_CONFIGURATION_PATH / 'values-template.yaml'
-
-#     values = get_template(values_template_path)
-
-#     for e in env:
-#         specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
-#                                               f'values-template-{e}.yaml')
-#         if os.path.exists(specific_template_path):
-#             logging.info(
-#                 "Specific environment values template found: " + specific_template_path)
-#             with open(specific_template_path) as f:
-#                 values_env_specific = yaml.safe_load(f)
-#             values = dict_merge(values, values_env_specific)
-#     return values
-
-
-# def init_app_values(deployment_root, exclude, values=None):
-#     values = values if values is not None else {}
-#     app_base_path = os.path.join(deployment_root, APPS_PATH)
-#     overridden_template_path = os.path.join(
-#         deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-#     default_values_path = os.path.join(
-#         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-
-#     for app_path in get_sub_paths(app_base_path):
-
-#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
-
-#         if app_name in exclude:
-#             continue
-#         app_key = app_name.replace('-', '_')
-#         if app_key not in values:
-#             default_values = get_template(default_values_path)
-#             values[app_key] = default_values
-#         overridden_defaults = get_template(overridden_template_path)
-#         values[app_key] = dict_merge(values[app_key], overridden_defaults)
-
-#     return values
-
-
-# def values_from_legacy(values):
-#     if KEY_HARNESS not in values:
-#         values[KEY_HARNESS] = {}
-#     harness = values[KEY_HARNESS]
-#     if KEY_SERVICE not in harness:
-#         harness[KEY_SERVICE] = {}
-#     if KEY_DEPLOYMENT not in harness:
-#         harness[KEY_DEPLOYMENT] = {}
-#     if KEY_DATABASE not in harness:
-#         harness[KEY_DATABASE] = {}
-
-#     if 'subdomain' in values:
-#         harness['subdomain'] = values['subdomain']
-#     if 'autodeploy' in values:
-#         harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
-#     if 'autoservice' in values:
-#         harness[KEY_SERVICE]['auto'] = values['autoservice']
-#     if 'secureme' in values:
-#         harness['secured'] = values['secureme']
-#     if 'resources' in values:
-#         harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
-#     if 'replicas' in values:
-#         harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
-#     if 'image' in values:
-#         harness[KEY_DEPLOYMENT]['image'] = values['image']
-#     if 'port' in values:
-#         harness[KEY_DEPLOYMENT]['port'] = values['port']
-#         harness[KEY_SERVICE]['port'] = values['port']
-
-
-# def values_set_legacy(values):
-#     harness = values[KEY_HARNESS]
-#     if 'image' in harness[KEY_DEPLOYMENT]:
-#         values['image'] = harness[KEY_DEPLOYMENT]['image']
-
-#     values['name'] = harness['name']
-#     if harness[KEY_DEPLOYMENT].get('port', None):
-#         values['port'] = harness[KEY_DEPLOYMENT]['port']
-#     if 'resources' in harness[KEY_DEPLOYMENT]:
-#         values['resources'] = harness[KEY_DEPLOYMENT]['resources']
-
-
-# def generate_tag_from_content(content_path, ignore=()):
-#     from dirhash import dirhash
-#     return dirhash(content_path, 'sha1', ignore=ignore)
-
-
-# def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
-#     if isinstance(values, dict):
-#         newenvs = list(envs)
-#         for key, value in values.items():
-#             v = extract_env_variables_from_values(
-#                 value, envs, f"{prefix}_{key}".replace('-', '_').upper())
-#             if key in ('name', 'port', 'subdomain'):
-#                 newenvs.extend(v)
-#         return newenvs
-#     else:
-#         return [env_variable(prefix, values)]
-
-
-# def create_env_variables(values):
-#     for app_name, value in values[KEY_APPS].items():
-#         if KEY_HARNESS in value:
-#             values['env'].extend(extract_env_variables_from_values(
-#                 value[KEY_HARNESS], prefix='CH_' + app_name))
-#     values['env'].append(env_variable('CH_DOMAIN', values['domain']))
-#     values['env'].append(env_variable(
-#         'CH_IMAGE_REGISTRY', values['registry']['name']))
-#     values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
-
-
-# def hosts_info(values):
-#     domain = values['domain']
-#     namespace = values['namespace']
-#     subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
-#                   KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
-#                                                                            KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
-#     try:
-#         ip = get_cluster_ip()
-#     except:
-#         logging.warning('Cannot get cluster ip')
-#         return
-#     logging.info(
-#         "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
-
-#     deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
-#                    for app in values[KEY_APPS].values() if KEY_HARNESS in app)
-
-#     logging.info(
-#         "\nTo run locally some apps, also those references may be needed")
-#     for appname in values[KEY_APPS]:
-#         app = values[KEY_APPS][appname]['harness']
-#         if 'deployment' not in app:
-#             continue
-#         print(
-#             "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
-#                 app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
-
-#     print(
-#         f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
-
-
-# class ValuesValidationException(Exception):
-#     pass
-
-
-# def validate_helm_values(values):
-#     validate_dependencies(values)
-
-
-# def validate_dependencies(values):
-#     all_apps = {a for a in values["apps"]}
-#     for app in all_apps:
-#         app_values = values["apps"][app]
-#         if 'dependencies' in app_values[KEY_HARNESS]:
-#             soft_dependencies = {
-#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
-#             not_found = {d for d in soft_dependencies if d not in all_apps}
-#             if not_found:
-#                 logging.warning(
-#                     f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
-#             hard_dependencies = {
-#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
-#             not_found = {d for d in hard_dependencies if d not in all_apps}
-#             if not_found:
-#                 raise ValuesValidationException(
-#                     f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
-
-#             build_dependencies = {
-#                 d for d in app_values[KEY_HARNESS]['dependencies']['build']}
-
-#             not_found = {
-#                 d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
-#             not_found = {d for d in not_found if d not in all_apps}
-#             if not_found:
-#                 raise ValuesValidationException(
-#                     f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
-
-#         if 'use_services' in app_values[KEY_HARNESS]:
-#             service_dependencies = {d['name'].replace(
-#                 "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
-
-#             not_found = {d for d in service_dependencies if d not in all_apps}
-#             if not_found:
-#                 raise ValuesValidationException(
-#                     f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")
-
-
 def identify_unicorn_based_main(candidates, app_path):
         import re
         gunicorn_pattern = re.compile(r"gunicorn")
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index bd49f8ee..1f7408f1 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -3,20 +3,12 @@
 """
 import yaml
 import os
-import shutil
 import logging
-from hashlib import sha1
 import subprocess
-from functools import cache
-import tarfile
-from docker import from_env as DockerClient
 
-
-from . import HERE, CH_ROOT
-from cloudharness_utils.constants import TEST_IMAGES_PATH, VALUES_MANUAL_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
-    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH
-from .utils import get_cluster_ip, get_git_commit_hash, get_image_name, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
-    get_template, merge_configuration_directories, merge_to_yaml_file, dict_merge, app_name_from_path, \
+from cloudharness_utils.constants import  VALUES_MANUAL_PATH, HELM_CHART_PATH
+from .utils import get_cluster_ip, get_git_commit_hash, image_name_from_dockerfile_path, \
+    get_template, merge_to_yaml_file, dict_merge, app_name_from_path, \
     find_dockerfiles_paths
 
 from .models import HarnessMainConfig
@@ -45,59 +37,6 @@ def create_helm_chart(root_paths, tag='latest', registry='', local=True, domain=
 
 
 class CloudHarnessHelm(ConfigurationGenerator):
-    # def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
-    #              output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-    #              namespace=None):
-    #     assert domain, 'A domain must be specified'
-    #     self.root_paths = root_paths
-    #     self.tag = tag
-    #     if registry and registry[-1] != '/':
-    #         self.registry = registry + '/'
-    #     else:
-    #         self.registry = registry
-    #     self.local = local
-    #     self.domain = domain
-    #     self.exclude = exclude
-    #     self.secured = secured
-    #     self.output_path = output_path
-    #     self.include = include
-    #     self.registry_secret = registry_secret
-    #     self.tls = tls
-    #     self.env = env
-    #     self.namespace = namespace
-
-    #     self.dest_deployment_path = os.path.join(
-    #         self.output_path, HELM_CHART_PATH)
-    #     self.helm_chart_path = os.path.join(
-    #         self.dest_deployment_path, 'Chart.yaml')
-    #     self.__init_deployment()
-
-    #     self.static_images = set()
-    #     self.base_images = {}
-    #     self.all_images = {}
-
-    # def __init_deployment(self):
-    #     """
-    #     Create the base helm chart
-    #     """
-    #     if os.path.exists(self.dest_deployment_path):
-    #         shutil.rmtree(self.dest_deployment_path)
-    #     # Initialize with default
-    #     copy_merge_base_deployment(self.dest_deployment_path, os.path.join(
-    #         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH))
-
-    #     # Override for every cloudharness scaffolding
-    #     for root_path in self.root_paths:
-    #         copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
-    #                                    base_helm_chart=os.path.join(root_path, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH))
-    #         collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
-    #                                     dest_helm_chart_path=self.dest_deployment_path)
-
-    # def __adjust_missing_values(self, helm_values):
-    #     if 'name' not in helm_values:
-    #         with open(self.helm_chart_path) as f:
-    #             chart_idx_content = yaml.safe_load(f)
-    #         helm_values['name'] = chart_idx_content['name'].lower()
 
     def process_values(self) -> HarnessMainConfig:
         """
@@ -141,174 +80,6 @@ def process_values(self) -> HarnessMainConfig:
         validate_helm_values(merged_values)
         return HarnessMainConfig.from_dict(merged_values)
 
-    # def __process_applications(self, helm_values, base_image_name):
-        # for root_path in self.root_paths:
-        #     app_values = init_app_values(
-        #         root_path, exclude=self.exclude, values=helm_values[KEY_APPS])
-        #     helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-        #                                        app_values)
-
-        #     app_base_path = os.path.join(root_path, APPS_PATH)
-        #     app_values = self.collect_app_values(
-        #         app_base_path, base_image_name=base_image_name)
-        #     helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
-        #                                        app_values)
-
-    # def collect_app_values(self, app_base_path, base_image_name=None):
-    #     values = {}
-
-    #     for app_path in get_sub_paths(app_base_path):
-    #         app_name = app_name_from_path(
-    #             os.path.relpath(app_path, app_base_path))
-
-    #         if app_name in self.exclude:
-    #             continue
-    #         app_key = app_name.replace('-', '_')
-
-    #         app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
-
-    #         values[app_key] = dict_merge(
-    #             values[app_key], app_values) if app_key in values else app_values
-
-    #     return values
-
-    # def __init_static_images(self, base_image_name):
-    #     for static_img_dockerfile in self.static_images:
-    #         img_name = image_name_from_dockerfile_path(os.path.basename(
-    #             static_img_dockerfile), base_name=base_image_name)
-    #         self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
-    #             img_name, build_context_path=static_img_dockerfile)
-
-    # def __assign_static_build_dependencies(self, helm_values):
-    #     for static_img_dockerfile in self.static_images:
-    #         key = os.path.basename(static_img_dockerfile)
-    #         if key in helm_values[KEY_TASK_IMAGES]:
-    #             dependencies = guess_build_dependencies_from_dockerfile(
-    #                 static_img_dockerfile)
-    #             for dep in dependencies:
-    #                 if dep in self.base_images and dep not in helm_values[KEY_TASK_IMAGES]:
-    #                     helm_values[KEY_TASK_IMAGES][dep] = self.base_images[dep]
-
-    #     for image_name in list(helm_values[KEY_TASK_IMAGES].keys()):
-    #         if image_name in self.exclude:
-    #             del helm_values[KEY_TASK_IMAGES][image_name]
-
-    # def __init_base_images(self, base_image_name):
-
-    #     for root_path in self.root_paths:
-    #         for base_img_dockerfile in self.__find_static_dockerfile_paths(root_path):
-    #             img_name = image_name_from_dockerfile_path(
-    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
-    #             self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-    #                 img_name, build_context_path=root_path)
-
-    #         self.static_images.update(find_dockerfiles_paths(
-    #             os.path.join(root_path, STATIC_IMAGES_PATH)))
-    #     return self.base_images
-
-    # def __init_test_images(self, base_image_name):
-    #     test_images = {}
-    #     for root_path in self.root_paths:
-    #         for base_img_dockerfile in find_dockerfiles_paths(os.path.join(root_path, TEST_IMAGES_PATH)):
-    #             img_name = image_name_from_dockerfile_path(
-    #                 os.path.basename(base_img_dockerfile), base_name=base_image_name)
-    #             test_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-    #                 img_name, build_context_path=base_img_dockerfile)
-
-    #     return test_images
-
-
-    # def __find_static_dockerfile_paths(self, root_path):
-    #     return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
-
-    # def __merge_base_helm_values(self, helm_values):
-    #     # Override for every cloudharness scaffolding
-    #     for root_path in self.root_paths:
-    #         helm_values = dict_merge(
-    #             helm_values,
-    #             collect_helm_values(root_path, env=self.env)
-    #         )
-
-    #     return helm_values
-
-    # def __get_default_helm_values(self):
-    #     helm_values = get_template(os.path.join(
-    #         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, HELM_PATH, 'values.yaml'))
-    #     helm_values = dict_merge(helm_values,
-    #                              collect_helm_values(CH_ROOT, env=self.env))
-
-        # return helm_values
-
-    # def create_tls_certificate(self, helm_values):
-    #     if not self.tls:
-    #         helm_values['tls'] = None
-    #         return
-    #     if not self.local:
-    #         return
-    #     helm_values['tls'] = self.domain.replace(".", "-") + "-tls"
-
-    #     bootstrap_file = 'bootstrap.sh'
-    #     certs_parent_folder_path = os.path.join(
-    #         self.output_path, 'helm', 'resources')
-    #     certs_folder_path = os.path.join(certs_parent_folder_path, 'certs')
-
-    #     if os.path.exists(os.path.join(certs_folder_path)):
-    #         # don't overwrite the certificate if it exists
-    #         return
-
-    #     try:
-    #         client = DockerClient()
-    #         client.ping()
-    #     except:
-    #         raise ConnectionRefusedError(
-    #             '\n\nIs docker running? Run "eval(minikube docker-env)" if you are using minikube...')
-
-    #     # Create CA and sign cert for domain
-    #     container = client.containers.run(image='frapsoft/openssl',
-    #                                       command=f'sleep 60',
-    #                                       entrypoint="",
-    #                                       detach=True,
-    #                                       environment=[
-    #                                           f"DOMAIN={self.domain}"],
-    #                                       )
-
-    #     container.exec_run('mkdir -p /mnt/vol1')
-    #     container.exec_run('mkdir -p /mnt/certs')
-
-    #     # copy bootstrap file
-    #     cur_dir = os.getcwd()
-    #     os.chdir(os.path.join(HERE, 'scripts'))
-    #     tar = tarfile.open(bootstrap_file + '.tar', mode='w')
-    #     try:
-    #         tar.add(bootstrap_file)
-    #     finally:
-    #         tar.close()
-    #     data = open(bootstrap_file + '.tar', 'rb').read()
-    #     container.put_archive('/mnt/vol1', data)
-    #     os.chdir(cur_dir)
-    #     container.exec_run(f'tar x {bootstrap_file}.tar', workdir='/mnt/vol1')
-
-    #     # exec bootstrap file
-    #     container.exec_run(f'/bin/ash /mnt/vol1/{bootstrap_file}')
-
-    #     # retrieve the certs from the container
-    #     bits, stat = container.get_archive('/mnt/certs')
-    #     if not os.path.exists(certs_folder_path):
-    #         os.makedirs(certs_folder_path)
-    #     f = open(f'{certs_parent_folder_path}/certs.tar', 'wb')
-    #     for chunk in bits:
-    #         f.write(chunk)
-    #     f.close()
-    #     cf = tarfile.open(f'{certs_parent_folder_path}/certs.tar')
-    #     cf.extractall(path=certs_parent_folder_path)
-
-    #     logs = container.logs()
-    #     logging.info(f'openssl container logs: {logs}')
-
-    #     # stop the container
-    #     container.kill()
-
-    #     logging.info("Created certificates for local deployment")
 
     def __finish_helm_values(self, values):
         """
@@ -383,37 +154,6 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    # def __clear_unused_db_configuration(self, harness_config):
-    #     database_config = harness_config[KEY_DATABASE]
-    #     database_type = database_config.get('type', None)
-    #     if database_type is None:
-    #         del harness_config[KEY_DATABASE]
-    #         return
-    #     db_specific_keys = [k for k, v in database_config.items()
-    #                         if isinstance(v, dict) and 'image' in v and 'ports' in v]
-    #     for db in db_specific_keys:
-    #         if database_type != db:
-    #             del database_config[db]
-
-    # def image_tag(self, image_name, build_context_path=None, dependencies=()):
-    #     tag = self.tag
-    #     if tag is None and not self.local:
-    #         logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
-    #         ignore_path = os.path.join(build_context_path, '.dockerignore')
-    #         ignore = set(DEFAULT_IGNORE)
-    #         if os.path.exists(ignore_path):
-    #             with open(ignore_path) as f:
-    #                 ignore = ignore.union({line.strip() for line in f})
-    #         logging.info(f"Ignoring {ignore}")
-    #         tag = generate_tag_from_content(build_context_path, ignore)
-    #         logging.info(f"Content hash: {tag}")
-    #         dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-    #         tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
-    #         logging.info(f"Generated tag: {tag}")
-    #         app_name = image_name.split("/")[-1] # the image name can have a prefix
-    #         self.all_images[app_name] = tag
-    #     return self.registry + image_name + (f':{tag}' if tag else '')
-
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
 
@@ -478,284 +218,3 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
                 img_name, build_context_path=task_path, dependencies=values[KEY_TASK_IMAGES].keys())
 
         return values
-
-
-# def get_included_with_dependencies(values, include):
-#     app_values = values['apps'].values()
-#     directly_included = [app for app in app_values if any(
-#         inc == app[KEY_HARNESS]['name'] for inc in include)]
-
-#     dependent = set(include)
-#     for app in directly_included:
-#         if app['harness']['dependencies'].get('hard', None):
-#             dependent.update(set(app[KEY_HARNESS]['dependencies']['hard']))
-#         if app['harness']['dependencies'].get('soft', None):
-#             dependent.update(set(app[KEY_HARNESS]['dependencies']['soft']))
-#         if values['secured_gatekeepers'] and app[KEY_HARNESS]['secured']:
-#             dependent.add('accounts')
-#     if len(dependent) == len(include):
-#         return dependent
-#     return get_included_with_dependencies(values, dependent)
-
-
-# def merge_helm_chart(source_templates_path, dest_helm_chart_path=HELM_CHART_PATH):
-#     pass
-
-
-# def collect_apps_helm_templates(search_root, dest_helm_chart_path, exclude=(), include=None):
-#     """
-#     Searches recursively for helm templates inside the applications and collects the templates in the destination
-
-#     :param search_root:
-#     :param dest_helm_chart_path: collected helm templates destination folder
-#     :param exclude:
-#     :return:
-#     """
-#     app_base_path = os.path.join(search_root, APPS_PATH)
-
-#     for app_path in get_sub_paths(app_base_path):
-#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
-#         if app_name in exclude or (include and not any(inc in app_name for inc in include)):
-#             continue
-#         template_dir = os.path.join(app_path, 'deploy', 'templates')
-#         if os.path.exists(template_dir):
-#             dest_dir = os.path.join(
-#                 dest_helm_chart_path, 'templates', app_name)
-
-#             logging.info(
-#                 "Collecting templates for application %s to %s", app_name, dest_dir)
-#             if os.path.exists(dest_dir):
-#                 logging.warning(
-#                     "Merging/overriding all files in directory %s", dest_dir)
-#                 merge_configuration_directories(template_dir, dest_dir)
-#             else:
-#                 shutil.copytree(template_dir, dest_dir)
-#         resources_dir = os.path.join(app_path, 'deploy/resources')
-#         if os.path.exists(resources_dir):
-#             dest_dir = os.path.join(
-#                 dest_helm_chart_path, 'resources', app_name)
-
-#             logging.info(
-#                 "Collecting resources for application  %s to %s", app_name, dest_dir)
-
-#             merge_configuration_directories(resources_dir, dest_dir)
-
-#         subchart_dir = os.path.join(app_path, 'deploy/charts')
-#         if os.path.exists(subchart_dir):
-#             dest_dir = os.path.join(dest_helm_chart_path, 'charts', app_name)
-
-#             logging.info(
-#                 "Collecting templates for application %s to %s", app_name, dest_dir)
-#             if os.path.exists(dest_dir):
-#                 logging.warning(
-#                     "Merging/overriding all files in directory %s", dest_dir)
-#                 merge_configuration_directories(subchart_dir, dest_dir)
-#             else:
-#                 shutil.copytree(subchart_dir, dest_dir)
-
-
-# def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
-#     if not os.path.exists(base_helm_chart):
-#         return
-#     if os.path.exists(dest_helm_chart_path):
-#         logging.info("Merging/overriding all files in directory %s",
-#                      dest_helm_chart_path)
-#         merge_configuration_directories(base_helm_chart, dest_helm_chart_path)
-#     else:
-#         logging.info("Copying base deployment chart from %s to %s",
-#                      base_helm_chart, dest_helm_chart_path)
-#         shutil.copytree(base_helm_chart, dest_helm_chart_path)
-
-
-# def collect_helm_values(deployment_root, env=()):
-#     """
-#     Creates helm values from a cloudharness deployment scaffolding
-#     """
-
-#     values_template_path = os.path.join(
-#         deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'values-template.yaml')
-
-#     values = get_template(values_template_path)
-
-#     for e in env:
-#         specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
-#                                               f'values-template-{e}.yaml')
-#         if os.path.exists(specific_template_path):
-#             logging.info(
-#                 "Specific environment values template found: " + specific_template_path)
-#             with open(specific_template_path) as f:
-#                 values_env_specific = yaml.safe_load(f)
-#             values = dict_merge(values, values_env_specific)
-#     return values
-
-
-# def init_app_values(deployment_root, exclude, values=None):
-#     values = values if values is not None else {}
-#     app_base_path = os.path.join(deployment_root, APPS_PATH)
-#     overridden_template_path = os.path.join(
-#         deployment_root, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-#     default_values_path = os.path.join(
-#         CH_ROOT, DEPLOYMENT_CONFIGURATION_PATH, 'value-template.yaml')
-
-#     for app_path in get_sub_paths(app_base_path):
-
-#         app_name = app_name_from_path(os.path.relpath(app_path, app_base_path))
-
-#         if app_name in exclude:
-#             continue
-#         app_key = app_name.replace('-', '_')
-#         if app_key not in values:
-#             default_values = get_template(default_values_path)
-#             values[app_key] = default_values
-#         overridden_defaults = get_template(overridden_template_path)
-#         values[app_key] = dict_merge(values[app_key], overridden_defaults)
-
-#     return values
-
-
-# def values_from_legacy(values):
-#     if KEY_HARNESS not in values:
-#         values[KEY_HARNESS] = {}
-#     harness = values[KEY_HARNESS]
-#     if KEY_SERVICE not in harness:
-#         harness[KEY_SERVICE] = {}
-#     if KEY_DEPLOYMENT not in harness:
-#         harness[KEY_DEPLOYMENT] = {}
-#     if KEY_DATABASE not in harness:
-#         harness[KEY_DATABASE] = {}
-
-#     if 'subdomain' in values:
-#         harness['subdomain'] = values['subdomain']
-#     if 'autodeploy' in values:
-#         harness[KEY_DEPLOYMENT]['auto'] = values['autodeploy']
-#     if 'autoservice' in values:
-#         harness[KEY_SERVICE]['auto'] = values['autoservice']
-#     if 'secureme' in values:
-#         harness['secured'] = values['secureme']
-#     if 'resources' in values:
-#         harness[KEY_DEPLOYMENT]['resources'].update(values['resources'])
-#     if 'replicas' in values:
-#         harness[KEY_DEPLOYMENT]['replicas'] = values['replicas']
-#     if 'image' in values:
-#         harness[KEY_DEPLOYMENT]['image'] = values['image']
-#     if 'port' in values:
-#         harness[KEY_DEPLOYMENT]['port'] = values['port']
-#         harness[KEY_SERVICE]['port'] = values['port']
-
-
-# def values_set_legacy(values):
-#     harness = values[KEY_HARNESS]
-#     if 'image' in harness[KEY_DEPLOYMENT]:
-#         values['image'] = harness[KEY_DEPLOYMENT]['image']
-
-#     values['name'] = harness['name']
-#     if harness[KEY_DEPLOYMENT].get('port', None):
-#         values['port'] = harness[KEY_DEPLOYMENT]['port']
-#     if 'resources' in harness[KEY_DEPLOYMENT]:
-#         values['resources'] = harness[KEY_DEPLOYMENT]['resources']
-
-
-# def generate_tag_from_content(content_path, ignore=()):
-#     from dirhash import dirhash
-#     return dirhash(content_path, 'sha1', ignore=ignore)
-
-
-# def extract_env_variables_from_values(values, envs=tuple(), prefix=''):
-#     if isinstance(values, dict):
-#         newenvs = list(envs)
-#         for key, value in values.items():
-#             v = extract_env_variables_from_values(
-#                 value, envs, f"{prefix}_{key}".replace('-', '_').upper())
-#             if key in ('name', 'port', 'subdomain'):
-#                 newenvs.extend(v)
-#         return newenvs
-#     else:
-#         return [env_variable(prefix, values)]
-
-
-# def create_env_variables(values):
-#     for app_name, value in values[KEY_APPS].items():
-#         if KEY_HARNESS in value:
-#             values['env'].extend(extract_env_variables_from_values(
-#                 value[KEY_HARNESS], prefix='CH_' + app_name))
-#     values['env'].append(env_variable('CH_DOMAIN', values['domain']))
-#     values['env'].append(env_variable(
-#         'CH_IMAGE_REGISTRY', values['registry']['name']))
-#     values['env'].append(env_variable('CH_IMAGE_TAG', values['tag']))
-
-
-# def hosts_info(values):
-#     domain = values['domain']
-#     namespace = values['namespace']
-#     subdomains = [app[KEY_HARNESS]['subdomain'] for app in values[KEY_APPS].values() if
-#                   KEY_HARNESS in app and app[KEY_HARNESS]['subdomain']] + [alias for app in values[KEY_APPS].values() if
-#                                                                            KEY_HARNESS in app and app[KEY_HARNESS]['aliases'] for alias in app[KEY_HARNESS]['aliases']]
-#     try:
-#         ip = get_cluster_ip()
-#     except:
-#         logging.warning('Cannot get cluster ip')
-#         return
-#     logging.info(
-#         "\nTo test locally, update your hosts file" + f"\n{ip}\t{domain + ' ' + ' '.join(sd + '.' + domain for sd in subdomains)}")
-
-#     deployments = (app[KEY_HARNESS][KEY_DEPLOYMENT]['name']
-#                    for app in values[KEY_APPS].values() if KEY_HARNESS in app)
-
-#     logging.info(
-#         "\nTo run locally some apps, also those references may be needed")
-#     for appname in values[KEY_APPS]:
-#         app = values[KEY_APPS][appname]['harness']
-#         if 'deployment' not in app:
-#             continue
-#         print(
-#             "kubectl port-forward -n {namespace} deployment/{app} {port}:{port}".format(
-#                 app=app['deployment']['name'], port=app['deployment']['port'], namespace=namespace))
-
-#     print(
-#         f"127.0.0.1\t{' '.join('%s.%s' % (s, values['namespace']) for s in deployments)}")
-
-
-# class ValuesValidationException(Exception):
-#     pass
-
-
-# def validate_helm_values(values):
-#     validate_dependencies(values)
-
-
-# def validate_dependencies(values):
-#     all_apps = {a for a in values["apps"]}
-#     for app in all_apps:
-#         app_values = values["apps"][app]
-#         if 'dependencies' in app_values[KEY_HARNESS]:
-#             soft_dependencies = {
-#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['soft']}
-#             not_found = {d for d in soft_dependencies if d not in all_apps}
-#             if not_found:
-#                 logging.warning(
-#                     f"Soft dependencies specified for application {app} not found: {','.join(not_found)}")
-#             hard_dependencies = {
-#                 d.replace("-", "_") for d in app_values[KEY_HARNESS]['dependencies']['hard']}
-#             not_found = {d for d in hard_dependencies if d not in all_apps}
-#             if not_found:
-#                 raise ValuesValidationException(
-#                     f"Bad application dependencies specified for application {app}: {','.join(not_found)}")
-
-#             build_dependencies = {
-#                 d for d in app_values[KEY_HARNESS]['dependencies']['build']}
-
-#             not_found = {
-#                 d for d in build_dependencies if d not in values[KEY_TASK_IMAGES]}
-#             not_found = {d for d in not_found if d not in all_apps}
-#             if not_found:
-#                 raise ValuesValidationException(
-#                     f"Bad build dependencies specified for application {app}: {','.join(not_found)} not found as built image")
-
-#         if 'use_services' in app_values[KEY_HARNESS]:
-#             service_dependencies = {d['name'].replace(
-#                 "-", "_") for d in app_values[KEY_HARNESS]['use_services']}
-
-#             not_found = {d for d in service_dependencies if d not in all_apps}
-#             if not_found:
-#                 raise ValuesValidationException(
-#                     f"Bad service application dependencies specified for application {app}: {','.join(not_found)}")

From a4cd813718e35efebab29586431661fcfccc83be Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 08:21:21 -0600
Subject: [PATCH 068/210] CH-100 Refactor helm test

---
 .../cloudharness_utils/testing/util.py        |   6 +-
 .../ch_cli_tools/configurationgenerator.py    |   4 +-
 .../deployment-cli-tools/ch_cli_tools/helm.py |   2 +-
 tools/deployment-cli-tools/tests/test_helm.py | 189 ++++++++----------
 4 files changed, 89 insertions(+), 112 deletions(-)

diff --git a/libraries/cloudharness-utils/cloudharness_utils/testing/util.py b/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
index b0e98624..6f11adcc 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
@@ -1,7 +1,7 @@
 
-from cgi import test
+# from cgi import test
 import os
-from os.path import dirname as dn
+# from os.path import dirname as dn
 
 from cloudharness_model.models import ApplicationUser, ApplicationTestConfig, ApplicationHarnessConfig, E2ETestsConfig
 
@@ -11,7 +11,7 @@ def get_user_password(main_user: ApplicationUser):
 def get_app_environment(app_config: ApplicationHarnessConfig, app_domain, use_local_env=True):
     my_env = os.environ.copy() if use_local_env else {}
     my_env["APP_URL"] = app_domain
-    
+
 
     if app_config.accounts and app_config.accounts.users:
         main_user: ApplicationUser = app_config.accounts.users[0]
diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
index 9a445456..ba974dfc 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
@@ -38,7 +38,7 @@
 
 
 class ConfigurationGenerator(object):
-    def __init__(self, root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+    def __init__(self, root_paths, tag: str | int | None='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                  output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                  namespace=None, templates_path=HELM_PATH):
         assert domain, 'A domain must be specified'
@@ -56,7 +56,7 @@ def __init__(self, root_paths, tag='latest', registry='', local=True, domain=Non
         self.include = include
         self.registry_secret = registry_secret
         self.tls = tls
-        self.env = env
+        self.env = env or {}
         self.namespace = namespace
 
         self.templates_path = templates_path
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index 1f7408f1..daae2d16 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -26,7 +26,7 @@ def deploy(namespace, output_path='./deployment'):
         f"helm upgrade {namespace} {helm_path} -n {namespace} --install --reset-values".split())
 
 
-def create_helm_chart(root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+def create_helm_chart(root_paths, tag: str | None | int ='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                       namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:
diff --git a/tools/deployment-cli-tools/tests/test_helm.py b/tools/deployment-cli-tools/tests/test_helm.py
index 5fa269d6..9a773442 100644
--- a/tools/deployment-cli-tools/tests/test_helm.py
+++ b/tools/deployment-cli-tools/tests/test_helm.py
@@ -1,16 +1,19 @@
-import shutil
-
 from ch_cli_tools.helm import *
 from ch_cli_tools.configurationgenerator import *
+import pytest
 
 HERE = os.path.dirname(os.path.realpath(__file__))
 RESOURCES = os.path.join(HERE, 'resources')
-OUT = '/tmp/deployment'
 CLOUDHARNESS_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
 
 
-def test_collect_helm_values():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, include=['samples', 'myapp'],
+def exists(path):
+        return path.exists()
+
+
+def test_collect_helm_values(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
                                exclude=['events'], domain="my.local",
                                namespace='test', env='dev', local=False, tag=1, registry='reg')
 
@@ -51,24 +54,21 @@ def test_collect_helm_values():
     # Environment specific overriding
     assert values[KEY_APPS]['accounts']['a'] == 'dev'
     assert values['a'] == 'dev'
-    assert values['database']['auto'] == False
+    assert values['database']['auto'] is False
 
     # legacy reading
-    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] == True
-    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] == False
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] is True
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] is False
 
-    helm_path = os.path.join(OUT, HELM_CHART_PATH)
-
-    def exists(*args):
-        return os.path.exists(os.path.join(*args))
+    helm_path = out_folder / HELM_CHART_PATH
 
     # Check files
     assert exists(helm_path)
-    assert exists(helm_path, 'values.yaml')
-    assert exists(helm_path, 'resources/accounts/realm.json')
-    assert exists(helm_path, 'resources/accounts/aresource.txt')
-    assert exists(helm_path, 'resources/myapp/aresource.txt')
-    assert exists(helm_path, 'templates/myapp/mytemplate.yaml')
+    assert exists(helm_path / 'values.yaml')
+    assert exists(helm_path / 'resources' / 'accounts' / 'realm.json')
+    assert exists(helm_path / 'resources' / 'accounts' / 'aresource.txt')
+    assert exists(helm_path / 'resources' / 'myapp' / 'aresource.txt')
+    assert exists(helm_path / 'templates' / 'myapp' / 'mytemplate.yaml')
 
     # Checl base and task images
     assert values[KEY_TASK_IMAGES]
@@ -78,8 +78,6 @@ def exists(*args):
     # Not indicated as a build dependency
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES]
 
-    shutil.rmtree(OUT)
-
 
 def test_collect_helm_values_noreg_noinclude(tmp_path):
     out_path = tmp_path / 'test_collect_helm_values_noreg_noinclude'
@@ -115,24 +113,21 @@ def test_collect_helm_values_noreg_noinclude(tmp_path):
     # Environment specific overriding
     assert values[KEY_APPS]['accounts']['a'] == 'dev'
     assert values['a'] == 'dev'
-    assert values['database']['auto'] == False
+    assert values['database']['auto'] is False
 
     # legacy reading
-    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] == True
-    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] == False
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] is True
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] is False
 
     helm_path = out_path / HELM_CHART_PATH
 
-    def exists(*args):
-        return os.path.exists(os.path.join(*args))
-
     # Check files
     assert exists(helm_path)
-    assert exists(helm_path, 'values.yaml')
-    assert exists(helm_path, 'resources/accounts/realm.json')
-    assert exists(helm_path, 'resources/accounts/aresource.txt')
-    assert exists(helm_path, 'resources/myapp/aresource.txt')
-    assert exists(helm_path, 'templates/myapp/mytemplate.yaml')
+    assert exists(helm_path / 'values.yaml')
+    assert exists(helm_path / 'resources' / 'accounts' / 'realm.json')
+    assert exists(helm_path / 'resources' / 'accounts' / 'aresource.txt')
+    assert exists(helm_path / 'resources' / 'myapp' / 'aresource.txt')
+    assert exists(helm_path / 'templates' / 'myapp' / 'mytemplate.yaml')
 
     assert values[KEY_TASK_IMAGES]
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES]
@@ -140,68 +135,50 @@ def exists(*args):
     assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'cloudharness/myapp-mytask:1'
 
 
-def test_collect_helm_values_precedence():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+def test_collect_helm_values_precedence(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_precedence'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["events"])
 
     # Values.yaml from current app must override values-prod.yaml from cloudharness
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['memory'] == 'overridden'
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['cpu'] == 'overridden-prod'
 
-def test_collect_helm_values_multiple_envs():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+def test_collect_helm_values_multiple_envs(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_multiple_envs'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env=['dev', 'test'], local=False, tag=1, include=["myapp"])
 
 
-    assert values[KEY_APPS]['myapp']['test'] == True, 'values-test not loaded'
-    assert values[KEY_APPS]['myapp']['dev'] == True, 'values-dev not loaded'
+    assert values[KEY_APPS]['myapp']['test'] is True, 'values-test not loaded'
+    assert values[KEY_APPS]['myapp']['dev'] is True, 'values-dev not loaded'
     assert values[KEY_APPS]['myapp']['a'] == 'test', 'values-test not overriding'
 
 
 
-def test_collect_helm_values_wrong_dependencies_validate():
-    try:
-        values = create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=OUT, domain="my.local",
+def test_collect_helm_values_wrong_dependencies_validate(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_wrong_dependencies_validate'
+    with pytest.raises(ValuesValidationException):
+        create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
                                    namespace='test', env='prod', local=False, tag=1, include=["wrong-hard"])
-
-    except ValuesValidationException as e:
-        logging.info("Exception correctly raised %s", e.args)
-        assert True
-    else:
-        assert False, "Should error because of wrong hard dependency"
-
     try:
-        values = create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=OUT, domain="my.local",
+        create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
                                    namespace='test', env='prod', local=False, tag=1, include=["wrong-soft"])
 
     except ValuesValidationException as e:
-        assert False, "Should not error because of wrong soft dependency"
-    else:
-        assert True, "No error for wrong soft dependencies"
+        pytest.fail("Should not error because of wrong soft dependency")
 
-    try:
-        values = create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=OUT, domain="my.local",
+    with pytest.raises(ValuesValidationException):
+        create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
                                    namespace='test', env='prod', local=False, tag=1, include=["wrong-build"])
-
-    except ValuesValidationException as e:
-        logging.info("Exception correctly raised %s", e.args)
-        assert True
-    else:
-        assert False, "Should error because of wrong build dependency"
-
-    try:
-        values = create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=OUT, domain="my.local",
+    with pytest.raises(ValuesValidationException):
+        create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
                                    namespace='test', env='prod', local=False, tag=1, include=["wrong-services"])
 
-    except ValuesValidationException as e:
-        logging.info("Exception correctly raised %s", e.args)
-        assert True
-    else:
-        assert False, "Should error because of wrong service dependency"
-
 
-def test_collect_helm_values_build_dependencies():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+def test_collect_helm_values_build_dependencies(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_build_dependencies'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["myapp"])
 
     assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
@@ -209,8 +186,9 @@ def test_collect_helm_values_build_dependencies():
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
     assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
 
-def test_collect_helm_values_build_dependencies_nodeps():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+def test_collect_helm_values_build_dependencies_nodeps(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_build_dependencies_nodeps'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["events"])
 
 
@@ -219,8 +197,10 @@ def test_collect_helm_values_build_dependencies_nodeps():
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
     assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
 
-def test_collect_helm_values_build_dependencies_exclude():
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+
+def test_collect_helm_values_build_dependencies_exclude(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_build_dependencies_exclude'
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["workflows"], exclude=["workflows-extract-download"])
 
 
@@ -229,9 +209,10 @@ def test_collect_helm_values_build_dependencies_exclude():
     assert 'workflows-extract-download' not in values[KEY_TASK_IMAGES], "workflows-extract-download has been explicitly excluded"
 
 
-def test_clear_unused_dbconfig():
+def test_clear_unused_dbconfig(tmp_path):
+    out_folder = tmp_path / 'test_clear_unused_dbconfig'
 
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                env='withpostgres', local=False, include=["myapp"], exclude=["legacy"])
 
     # There is a DB config
@@ -248,7 +229,7 @@ def test_clear_unused_dbconfig():
     assert db_config['mongo'] is None
     assert db_config['neo4j'] is None
 
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                env='withmongo', local=False, include=["myapp"], exclude=["legacy"])
 
     assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
@@ -262,9 +243,10 @@ def test_clear_unused_dbconfig():
     assert db_config['postgres'] is None
 
 
-def test_clear_all_dbconfig_if_nodb():
+def test_clear_all_dbconfig_if_nodb(tmp_path):
+    out_folder = tmp_path / 'test_clear_all_dbconfig_if_nodb'
 
-    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
+    values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                env='withoutdb', local=False, include=["myapp"], exclude=["legacy"])
 
     # There is a DB config
@@ -274,6 +256,7 @@ def test_clear_all_dbconfig_if_nodb():
     db_config = values[KEY_APPS]['myapp'][KEY_HARNESS][KEY_DATABASE]
     assert db_config is None
 
+
 def test_tag_hash_generation():
     v1 = generate_tag_from_content(RESOURCES)
     v2 = generate_tag_from_content(RESOURCES, ignore=['myapp'])
@@ -285,21 +268,22 @@ def test_tag_hash_generation():
     v5 = generate_tag_from_content(RESOURCES, ignore=['/applications/myapp/*'])
     assert v5 == v4
 
+    fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.txt'
     try:
-        fname = os.path.join(RESOURCES, 'applications', 'myapp', 'afile.txt')
-        with open(fname, 'w') as f:
-            f.write('a')
+        fname.write_text('a')
 
         v6 = generate_tag_from_content(RESOURCES, ignore=['/applications/myapp/*'])
         assert v6 == v5
         v7 = generate_tag_from_content(RESOURCES)
         assert v7 != v1
     finally:
-        os.remove(fname)
+        fname.unlink()
+
 
-def test_collect_helm_values_auto_tag():
+def test_collect_helm_values_auto_tag(tmp_path):
+    out_folder = tmp_path / 'test_collect_helm_values_auto_tag'
     def create():
-        return create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, include=['samples', 'myapp'],
+        return create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
                                exclude=['events'], domain="my.local",
                                namespace='test', env='dev', local=False, tag=None, registry='reg')
 
@@ -321,62 +305,55 @@ def create():
     assert values["task-images"][BASE_KEY] == b1, "Base image should not change following the root .dockerignore"
 
 
+    fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.txt'
     try:
-        fname = os.path.join(RESOURCES, 'applications', 'myapp', 'afile.txt')
-        with open(fname, 'w') as f:
-            f.write('a')
+        fname.write_text('a')
 
         values = create()
         assert v1 != values.apps['myapp'].harness.deployment.image, "Adding the file changed the hash value"
         v2 = values.apps['myapp'].harness.deployment.image
         assert values["task-images"][BASE_KEY] == b1, "Application files should be ignored for base image following the root .dockerignore"
     finally:
-        os.remove(fname)
-
+        fname.unlink()
 
     try:
-        with open(fname, 'w') as f:
-            f.write('a')
+        fname.write_text('a')
 
         values = create()
         assert v2 == values.apps['myapp'].harness.deployment.image, "Recreated an identical file, the hash value should be the same"
     finally:
-        os.remove(fname)
+        fname.unlink()
 
 
-    fname = os.path.join(RESOURCES, 'applications', 'myapp', 'afile.ignored')
+    fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.ignored'
     try:
-        with open(fname, 'w') as f:
-            f.write('a')
+        fname.write_text('a')
+
 
         values = create()
         assert values["task-images"][BASE_KEY] == b1, "2: Application files should be ignored for base image following the root .dockerignore"
 
         assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing should change the hash value as the file is ignored in the .dockerignore"
     finally:
-        os.remove(fname)
-
-
+        fname.unlink()
 
     # Dependencies test: if a dependency is changed, the hash should change
-    fname = os.path.join(RESOURCES, 'infrastructure/common-images', 'my-common', 'afile')
+    fname = Path(RESOURCES) / 'infrastructure' / 'common-images' / 'my-common' / 'afile'
 
     try:
-        with open(fname, 'w') as f:
-            f.write('a')
+        fname.write_text('a')
 
         values = create()
 
         assert c1 != values["task-images"]["my-common"], "If content of a static image is changed, the hash should change"
         assert v1 != values.apps['myapp'].harness.deployment.image, "If a static image dependency is changed, the hash should change"
     finally:
-        os.remove(fname)
+        fname.unlink()
 
 
-    fname = os.path.join(CLOUDHARNESS_ROOT, 'atestfile')
+    fname = Path(CLOUDHARNESS_ROOT) / 'atestfile'
     try:
-        with open(fname, 'w') as f:
-            f.write('a')
+        fname.write_text('a')
 
         values = create()
 
@@ -384,4 +361,4 @@ def create():
         assert d1 != values["task-images"]["cloudharness-flask"], "Content for base image is changed, the static image should change"
         assert v1 != values.apps['myapp'].harness.deployment.image, "2 levels dependency: If a base image dependency is changed, the hash should change"
     finally:
-        os.remove(fname)
+        fname.unlink()

From 1d63bc4f139fe3edef85d2bce3713ca10e1f97a3 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 08:37:34 -0600
Subject: [PATCH 069/210] CH-100 Add tests for docker compose target

---
 .../cloudharness_utils/constants.py           |   1 +
 .../ch_cli_tools/dockercompose.py             |   2 +-
 .../deploy/templates-compose/mytemplate.yaml  |   0
 .../tests/test_dockercompose.py               | 365 ++++++++++++++++++
 4 files changed, 367 insertions(+), 1 deletion(-)
 create mode 100644 tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml
 create mode 100644 tools/deployment-cli-tools/tests/test_dockercompose.py

diff --git a/libraries/cloudharness-utils/cloudharness_utils/constants.py b/libraries/cloudharness-utils/cloudharness_utils/constants.py
index d989cff9..1cd12a7d 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/constants.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/constants.py
@@ -12,6 +12,7 @@
 HELM_ENGINE = HELM_PATH
 
 COMPOSE = 'compose'
+COMPOSE_PATH = COMPOSE
 COMPOSE_ENGINE = 'docker-compose'
 
 INFRASTRUCTURE_PATH = 'infrastructure'
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index f65e352b..1a96e562 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -18,7 +18,7 @@
 from .configurationgenerator import ConfigurationGenerator, validate_helm_values, KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates
 
 
-def create_docker_compose_configuration(root_paths, tag='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+def create_docker_compose_configuration(root_paths, tag: str | int | None='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                       namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:
diff --git a/tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml b/tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml
new file mode 100644
index 00000000..e69de29b
diff --git a/tools/deployment-cli-tools/tests/test_dockercompose.py b/tools/deployment-cli-tools/tests/test_dockercompose.py
new file mode 100644
index 00000000..c59d552f
--- /dev/null
+++ b/tools/deployment-cli-tools/tests/test_dockercompose.py
@@ -0,0 +1,365 @@
+from ch_cli_tools.dockercompose import *
+from ch_cli_tools.configurationgenerator import *
+import pytest
+
+HERE = os.path.dirname(os.path.realpath(__file__))
+RESOURCES = os.path.join(HERE, 'resources')
+CLOUDHARNESS_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
+COMPOSE_PATH = COMPOSE
+
+
+def exists(path):
+        return path.exists()
+
+
+def test_collect_compose_values(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
+                               exclude=['events'], domain="my.local",
+                               namespace='test', env='dev', local=False, tag=1, registry='reg')
+
+    # Auto values
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/myapp:1'
+    assert values.apps['myapp'].harness.deployment.image == 'reg/cloudharness/myapp:1'
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['name'] == 'myapp'
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['name'] == 'legacy'
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/accounts:1'
+
+    # First level include apps
+    assert 'samples' in values[KEY_APPS]
+    assert 'myapp' in values[KEY_APPS]
+
+    # Not included
+    assert 'jupyterhub' not in values[KEY_APPS]
+
+    # Dependency include first level
+    assert 'accounts' in values[KEY_APPS]
+    assert 'legacy' in values[KEY_APPS]
+
+    # Dependency include second level
+    assert 'argo' in values[KEY_APPS]
+
+    # Explicit exclude overrides include
+    assert 'events' not in values[KEY_APPS]
+
+    # Base values kept
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['subdomain'] == 'accounts'
+
+    # Defaults
+    assert 'service' in values[KEY_APPS]['legacy'][KEY_HARNESS]
+    assert 'common' in values[KEY_APPS]['legacy']
+    assert 'common' in values[KEY_APPS]['accounts']
+    # Values overriding
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['port'] == 'overridden'
+
+    # Environment specific overriding
+    assert values[KEY_APPS]['accounts']['a'] == 'dev'
+    assert values['a'] == 'dev'
+    assert values['database']['auto'] is False
+
+    # legacy reading
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] is True
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] is False
+
+    compose_path = out_folder / COMPOSE_PATH
+
+    # Check files
+    assert exists(compose_path)
+    assert exists(compose_path / 'values.yaml')
+    assert exists(compose_path / 'resources' / 'accounts' / 'realm.json')
+    assert exists(compose_path / 'resources' / 'accounts' / 'aresource.txt')
+    assert exists(compose_path / 'resources' / 'myapp' / 'aresource.txt')
+    assert exists(compose_path / 'templates' / 'myapp' / 'mytemplate.yaml')
+
+    # Checl base and task images
+    assert values[KEY_TASK_IMAGES]
+    assert 'cloudharness-base' in values[KEY_TASK_IMAGES]
+    assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'reg/cloudharness/cloudharness-base:1'
+    assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'reg/cloudharness/myapp-mytask:1'
+    # Not indicated as a build dependency
+    assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES]
+
+
+def test_collect_compose_values_noreg_noinclude(tmp_path):
+    out_path = tmp_path / 'test_collect_compose_values_noreg_noinclude'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_path, domain="my.local",
+                               namespace='test', env='dev', local=False, tag=1)
+
+    # Auto values
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'cloudharness/myapp:1'
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['name'] == 'myapp'
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['name'] == 'legacy'
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['image'] == 'cloudharness/accounts:1'
+
+    # First level include apps
+    assert 'samples' in values[KEY_APPS]
+    assert 'myapp' in values[KEY_APPS]
+    assert 'jupyterhub' in values[KEY_APPS]
+    assert 'accounts' in values[KEY_APPS]
+    assert 'legacy' in values[KEY_APPS]
+    assert 'argo' in values[KEY_APPS]
+    assert 'events' in values[KEY_APPS]
+
+    # Base values kept
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['subdomain'] == 'accounts'
+
+    # Defaults
+    assert 'service' in values[KEY_APPS]['legacy'][KEY_HARNESS]
+    assert 'common' in values[KEY_APPS]['legacy']
+    assert 'common' in values[KEY_APPS]['accounts']
+    # Values overriding
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['port'] == 'overridden'
+    assert values[KEY_APPS]['events']['kafka']['resources']['limits']['memory'] == 'overridden'
+
+    # Environment specific overriding
+    assert values[KEY_APPS]['accounts']['a'] == 'dev'
+    assert values['a'] == 'dev'
+    assert values['database']['auto'] is False
+
+    # legacy reading
+    assert values[KEY_APPS]['accounts'][KEY_HARNESS]['deployment']['auto'] is True
+    assert values[KEY_APPS]['legacy'][KEY_HARNESS]['deployment']['auto'] is False
+
+    compose_path = out_path / COMPOSE_PATH
+
+    # Check files
+    assert exists(compose_path)
+    assert exists(compose_path / 'values.yaml')
+    assert exists(compose_path / 'resources' / 'accounts' / 'realm.json')
+    assert exists(compose_path / 'resources' / 'accounts' / 'aresource.txt')
+    assert exists(compose_path / 'resources' / 'myapp' / 'aresource.txt')
+    assert exists(compose_path / 'templates' / 'myapp' / 'mytemplate.yaml')
+
+    assert values[KEY_TASK_IMAGES]
+    assert 'cloudharness-base' in values[KEY_TASK_IMAGES]
+    assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'cloudharness/cloudharness-base:1'
+    assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'cloudharness/myapp-mytask:1'
+
+
+def test_collect_compose_values_precedence(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_precedence'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               namespace='test', env='prod', local=False, tag=1, include=["events"])
+
+    # Values.yaml from current app must override values-prod.yaml from cloudharness
+    assert values[KEY_APPS]['events']['kafka']['resources']['limits']['memory'] == 'overridden'
+    assert values[KEY_APPS]['events']['kafka']['resources']['limits']['cpu'] == 'overridden-prod'
+
+def test_collect_compose_values_multiple_envs(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_multiple_envs'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               namespace='test', env=['dev', 'test'], local=False, tag=1, include=["myapp"])
+
+
+    assert values[KEY_APPS]['myapp']['test'] is True, 'values-test not loaded'
+    assert values[KEY_APPS]['myapp']['dev'] is True, 'values-dev not loaded'
+    assert values[KEY_APPS]['myapp']['a'] == 'test', 'values-test not overriding'
+
+
+
+def test_collect_compose_values_wrong_dependencies_validate(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_wrong_dependencies_validate'
+    with pytest.raises(ValuesValidationException):
+        create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
+                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-hard"])
+    try:
+        create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
+                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-soft"])
+
+    except ValuesValidationException as e:
+        pytest.fail("Should not error because of wrong soft dependency")
+
+    with pytest.raises(ValuesValidationException):
+        create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
+                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-build"])
+    with pytest.raises(ValuesValidationException):
+        create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
+                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-services"])
+
+
+def test_collect_compose_values_build_dependencies(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_build_dependencies'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               namespace='test', env='prod', local=False, tag=1, include=["myapp"])
+
+    assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
+    assert 'cloudharness-base' in values[KEY_TASK_IMAGES], "Cloudharness-base is included in cloudharness-flask Dockerfile and it should be guessed"
+    assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
+    assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
+
+def test_collect_compose_values_build_dependencies_nodeps(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_build_dependencies_nodeps'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               namespace='test', env='prod', local=False, tag=1, include=["events"])
+
+
+    assert 'cloudharness-flask' not in values[KEY_TASK_IMAGES], "Cloudharness-flask is not included in the build dependencies"
+    assert 'cloudharness-base' not in values[KEY_TASK_IMAGES], "Cloudharness-base is not included in the build dependencies"
+    assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
+    assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
+
+
+def test_collect_compose_values_build_dependencies_exclude(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_build_dependencies_exclude'
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               namespace='test', env='prod', local=False, tag=1, include=["workflows"], exclude=["workflows-extract-download"])
+
+
+    assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
+    assert 'cloudharness-base' in values[KEY_TASK_IMAGES], "Cloudharness-base is included in cloudharness-flask Dockerfile and it should be guessed"
+    assert 'workflows-extract-download' not in values[KEY_TASK_IMAGES], "workflows-extract-download has been explicitly excluded"
+
+
+def test_clear_unused_dbconfig(tmp_path):
+    out_folder = tmp_path / 'test_clear_unused_dbconfig'
+
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               env='withpostgres', local=False, include=["myapp"], exclude=["legacy"])
+
+    # There is a DB config
+    assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
+
+    db_config = values[KEY_APPS]['myapp'][KEY_HARNESS][KEY_DATABASE]
+    # postgres is set, but other entries are not.
+    assert db_config['postgres'] is not None
+    assert db_config['postgres']['image'].startswith('postgres:')
+
+    # However, it seems that even after removing unused entries,
+    # the finale instance of the HarnessMainConfig class that is created
+    # adds back those entries and set them to None.
+    assert db_config['mongo'] is None
+    assert db_config['neo4j'] is None
+
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               env='withmongo', local=False, include=["myapp"], exclude=["legacy"])
+
+    assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
+    db_config = values[KEY_APPS]['myapp'][KEY_HARNESS][KEY_DATABASE]
+
+    # mongo is set, but other entries are not.
+    assert db_config['mongo'] is not None
+    assert db_config['mongo']['image'].startswith('mongo:')
+    assert db_config['neo4j'] is None
+
+    assert db_config['postgres'] is None
+
+
+def test_clear_all_dbconfig_if_nodb(tmp_path):
+    out_folder = tmp_path / 'test_clear_all_dbconfig_if_nodb'
+
+    values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
+                               env='withoutdb', local=False, include=["myapp"], exclude=["legacy"])
+
+    # There is a DB config
+    assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
+
+    # But it is None
+    db_config = values[KEY_APPS]['myapp'][KEY_HARNESS][KEY_DATABASE]
+    assert db_config is None
+
+
+def test_tag_hash_generation():
+    v1 = generate_tag_from_content(RESOURCES)
+    v2 = generate_tag_from_content(RESOURCES, ignore=['myapp'])
+    assert v1 != v2
+    v3 = generate_tag_from_content(RESOURCES, ignore=['*/myapp/*'])
+    assert v3 != v1
+    v4 = generate_tag_from_content(RESOURCES, ignore=['applications/myapp/*'])
+    assert v4 == v3
+    v5 = generate_tag_from_content(RESOURCES, ignore=['/applications/myapp/*'])
+    assert v5 == v4
+
+    fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.txt'
+    try:
+        fname.write_text('a')
+
+        v6 = generate_tag_from_content(RESOURCES, ignore=['/applications/myapp/*'])
+        assert v6 == v5
+        v7 = generate_tag_from_content(RESOURCES)
+        assert v7 != v1
+    finally:
+        fname.unlink()
+
+
+def test_collect_compose_values_auto_tag(tmp_path):
+    out_folder = tmp_path / 'test_collect_compose_values_auto_tag'
+    def create():
+        return create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
+                               exclude=['events'], domain="my.local",
+                               namespace='test', env='dev', local=False, tag=None, registry='reg')
+
+    BASE_KEY = "cloudharness-base"
+    values = create()
+
+    # Auto values are set by using the directory hash
+    assert 'reg/cloudharness/myapp:' in values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image']
+    assert 'reg/cloudharness/myapp:' in values.apps['myapp'].harness.deployment.image
+    assert 'cloudharness/myapp-mytask' in values[KEY_TASK_IMAGES]['myapp-mytask']
+    assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == values.apps['myapp'].harness.deployment.image
+    v1 = values.apps['myapp'].harness.deployment.image
+    c1 = values["task-images"]["my-common"]
+    b1 = values["task-images"][BASE_KEY]
+    d1 = values["task-images"]["cloudharness-flask"]
+
+    values = create()
+    assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing changed the hash value"
+    assert values["task-images"][BASE_KEY] == b1, "Base image should not change following the root .dockerignore"
+
+
+    fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.txt'
+    try:
+        fname.write_text('a')
+
+        values = create()
+        assert v1 != values.apps['myapp'].harness.deployment.image, "Adding the file changed the hash value"
+        v2 = values.apps['myapp'].harness.deployment.image
+        assert values["task-images"][BASE_KEY] == b1, "Application files should be ignored for base image following the root .dockerignore"
+    finally:
+        fname.unlink()
+
+    try:
+        fname.write_text('a')
+
+        values = create()
+        assert v2 == values.apps['myapp'].harness.deployment.image, "Recreated an identical file, the hash value should be the same"
+    finally:
+        fname.unlink()
+
+
+    fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.ignored'
+    try:
+        fname.write_text('a')
+
+
+        values = create()
+        assert values["task-images"][BASE_KEY] == b1, "2: Application files should be ignored for base image following the root .dockerignore"
+
+        assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing should change the hash value as the file is ignored in the .dockerignore"
+    finally:
+        fname.unlink()
+
+    # Dependencies test: if a dependency is changed, the hash should change
+    fname = Path(RESOURCES) / 'infrastructure' / 'common-images' / 'my-common' / 'afile'
+
+    try:
+        fname.write_text('a')
+
+        values = create()
+
+        assert c1 != values["task-images"]["my-common"], "If content of a static image is changed, the hash should change"
+        assert v1 != values.apps['myapp'].harness.deployment.image, "If a static image dependency is changed, the hash should change"
+    finally:
+        fname.unlink()
+
+
+    fname = Path(CLOUDHARNESS_ROOT) / 'atestfile'
+    try:
+        fname.write_text('a')
+
+        values = create()
+
+        assert b1 != values["task-images"][BASE_KEY], "Content for base image is changed, the hash should change"
+        assert d1 != values["task-images"]["cloudharness-flask"], "Content for base image is changed, the static image should change"
+        assert v1 != values.apps['myapp'].harness.deployment.image, "2 levels dependency: If a base image dependency is changed, the hash should change"
+    finally:
+        fname.unlink()

From b125dfc1399056c27f90b789c4726f508a2bc239 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 08:52:39 -0600
Subject: [PATCH 070/210] CH-100 Add tests for docker compose

---
 .../deploy/templates-compose/mytemplate.yaml  | 13 +++++++++++++
 .../tests/test_dockercompose.py               | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml b/tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml
index e69de29b..aa1a2140 100644
--- a/tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml
+++ b/tools/deployment-cli-tools/tests/resources/applications/myapp/deploy/templates-compose/mytemplate.yaml
@@ -0,0 +1,13 @@
+cloudharness-metadata:
+  path: resources/generated/test.yaml
+
+data: |-
+  mykey: myvalue
+
+---
+
+cloudharness-metadata:
+  path: resources/generated/test2.yaml
+
+data: |-
+  mykey2: myvalue2
diff --git a/tools/deployment-cli-tools/tests/test_dockercompose.py b/tools/deployment-cli-tools/tests/test_dockercompose.py
index c59d552f..bd6c0a67 100644
--- a/tools/deployment-cli-tools/tests/test_dockercompose.py
+++ b/tools/deployment-cli-tools/tests/test_dockercompose.py
@@ -64,13 +64,22 @@ def test_collect_compose_values(tmp_path):
     compose_path = out_folder / COMPOSE_PATH
 
     # Check files
+    assert exists(out_folder / 'docker-compose.yaml')
     assert exists(compose_path)
     assert exists(compose_path / 'values.yaml')
+    assert exists(compose_path / 'allvalues.yaml')
     assert exists(compose_path / 'resources' / 'accounts' / 'realm.json')
     assert exists(compose_path / 'resources' / 'accounts' / 'aresource.txt')
     assert exists(compose_path / 'resources' / 'myapp' / 'aresource.txt')
+    assert exists(compose_path / 'resources' / 'generated' / 'test.yaml')
+    assert exists(compose_path / 'resources' / 'generated' / 'test2.yaml')
     assert exists(compose_path / 'templates' / 'myapp' / 'mytemplate.yaml')
 
+    content = (compose_path / 'resources' / 'generated' / 'test.yaml').read_text()
+    assert content == 'mykey: myvalue'
+    content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
+    assert content == 'mykey2: myvalue2'
+
     # Checl base and task images
     assert values[KEY_TASK_IMAGES]
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES]
@@ -123,19 +132,29 @@ def test_collect_compose_values_noreg_noinclude(tmp_path):
     compose_path = out_path / COMPOSE_PATH
 
     # Check files
+    assert exists(out_path / 'docker-compose.yaml')
     assert exists(compose_path)
     assert exists(compose_path / 'values.yaml')
+    assert exists(compose_path / 'allvalues.yaml')
     assert exists(compose_path / 'resources' / 'accounts' / 'realm.json')
     assert exists(compose_path / 'resources' / 'accounts' / 'aresource.txt')
     assert exists(compose_path / 'resources' / 'myapp' / 'aresource.txt')
+    assert exists(compose_path / 'resources' / 'generated' / 'test.yaml')
+    assert exists(compose_path / 'resources' / 'generated' / 'test2.yaml')
     assert exists(compose_path / 'templates' / 'myapp' / 'mytemplate.yaml')
 
+    content = (compose_path / 'resources' / 'generated' / 'test.yaml').read_text()
+    assert content == 'mykey: myvalue'
+    content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
+    assert content == 'mykey2: myvalue2'
+
     assert values[KEY_TASK_IMAGES]
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES]
     assert values[KEY_TASK_IMAGES]['cloudharness-base'] == 'cloudharness/cloudharness-base:1'
     assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'cloudharness/myapp-mytask:1'
 
 
+
 def test_collect_compose_values_precedence(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_precedence'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",

From 2c7e26488e787e372dc03f07ae2145417f145060 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 08:58:49 -0600
Subject: [PATCH 071/210] CH-100 Fix type hinting for Python 3.9

---
 .../ch_cli_tools/configurationgenerator.py                     | 3 ++-
 tools/deployment-cli-tools/ch_cli_tools/dockercompose.py       | 3 ++-
 tools/deployment-cli-tools/ch_cli_tools/helm.py                | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
index ba974dfc..e371bb53 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
@@ -1,6 +1,7 @@
 """
 Utilities to create a helm chart from a CloudHarness directory structure
 """
+from typing import Union
 import yaml
 from ruamel.yaml import YAML
 import os
@@ -38,7 +39,7 @@
 
 
 class ConfigurationGenerator(object):
-    def __init__(self, root_paths, tag: str | int | None='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+    def __init__(self, root_paths, tag: Union[str, int, None]='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                  output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                  namespace=None, templates_path=HELM_PATH):
         assert domain, 'A domain must be specified'
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 1a96e562..4b2c374b 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -1,6 +1,7 @@
 """
 Utilities to create a helm chart from a CloudHarness directory structure
 """
+from typing import Union
 import yaml
 from ruamel.yaml import YAML
 import os
@@ -18,7 +19,7 @@
 from .configurationgenerator import ConfigurationGenerator, validate_helm_values, KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates
 
 
-def create_docker_compose_configuration(root_paths, tag: str | int | None='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+def create_docker_compose_configuration(root_paths, tag: Union[str, int, None]='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                       namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index daae2d16..e58070fd 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -1,6 +1,7 @@
 """
 Utilities to create a helm chart from a CloudHarness directory structure
 """
+from typing import Union
 import yaml
 import os
 import logging
@@ -26,7 +27,7 @@ def deploy(namespace, output_path='./deployment'):
         f"helm upgrade {namespace} {helm_path} -n {namespace} --install --reset-values".split())
 
 
-def create_helm_chart(root_paths, tag: str | None | int ='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+def create_helm_chart(root_paths, tag: Union[str, int, None]='latest', registry='', local=True, domain=None, exclude=(), secured=True,
                       output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                       namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:

From 866dee9cf928ae247beb0e6c5fdf83a3cb5b5f47 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Mon, 1 Apr 2024 09:13:36 -0600
Subject: [PATCH 072/210] CH-100 Add conditional test for docker compose if
 "helm" is installed

---
 .../tests/test_dockercompose.py               | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/tools/deployment-cli-tools/tests/test_dockercompose.py b/tools/deployment-cli-tools/tests/test_dockercompose.py
index bd6c0a67..86fff944 100644
--- a/tools/deployment-cli-tools/tests/test_dockercompose.py
+++ b/tools/deployment-cli-tools/tests/test_dockercompose.py
@@ -1,12 +1,15 @@
 from ch_cli_tools.dockercompose import *
 from ch_cli_tools.configurationgenerator import *
 import pytest
+import shutil
 
 HERE = os.path.dirname(os.path.realpath(__file__))
 RESOURCES = os.path.join(HERE, 'resources')
 CLOUDHARNESS_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
 COMPOSE_PATH = COMPOSE
 
+HELM_IS_INSTALLED = shutil.which("helm") is not None
+
 
 def exists(path):
         return path.exists()
@@ -71,14 +74,15 @@ def test_collect_compose_values(tmp_path):
     assert exists(compose_path / 'resources' / 'accounts' / 'realm.json')
     assert exists(compose_path / 'resources' / 'accounts' / 'aresource.txt')
     assert exists(compose_path / 'resources' / 'myapp' / 'aresource.txt')
-    assert exists(compose_path / 'resources' / 'generated' / 'test.yaml')
-    assert exists(compose_path / 'resources' / 'generated' / 'test2.yaml')
     assert exists(compose_path / 'templates' / 'myapp' / 'mytemplate.yaml')
 
-    content = (compose_path / 'resources' / 'generated' / 'test.yaml').read_text()
-    assert content == 'mykey: myvalue'
-    content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
-    assert content == 'mykey2: myvalue2'
+    if HELM_IS_INSTALLED:
+        assert exists(compose_path / 'resources' / 'generated' / 'test.yaml')
+        assert exists(compose_path / 'resources' / 'generated' / 'test2.yaml')
+        content = (compose_path / 'resources' / 'generated' / 'test.yaml').read_text()
+        assert content == 'mykey: myvalue'
+        content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
+        assert content == 'mykey2: myvalue2'
 
     # Checl base and task images
     assert values[KEY_TASK_IMAGES]
@@ -139,14 +143,16 @@ def test_collect_compose_values_noreg_noinclude(tmp_path):
     assert exists(compose_path / 'resources' / 'accounts' / 'realm.json')
     assert exists(compose_path / 'resources' / 'accounts' / 'aresource.txt')
     assert exists(compose_path / 'resources' / 'myapp' / 'aresource.txt')
-    assert exists(compose_path / 'resources' / 'generated' / 'test.yaml')
-    assert exists(compose_path / 'resources' / 'generated' / 'test2.yaml')
     assert exists(compose_path / 'templates' / 'myapp' / 'mytemplate.yaml')
 
-    content = (compose_path / 'resources' / 'generated' / 'test.yaml').read_text()
-    assert content == 'mykey: myvalue'
-    content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
-    assert content == 'mykey2: myvalue2'
+    if HELM_IS_INSTALLED:
+        assert exists(compose_path / 'resources' / 'generated' / 'test.yaml')
+        assert exists(compose_path / 'resources' / 'generated' / 'test2.yaml')
+        content = (compose_path / 'resources' / 'generated' / 'test.yaml').read_text()
+        assert content == 'mykey: myvalue'
+        content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
+        assert content == 'mykey2: myvalue2'
+        assert False
 
     assert values[KEY_TASK_IMAGES]
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES]

From f226829ca70f7ff86aa755db461aa17f6562fbba Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 2 Apr 2024 06:00:53 -0600
Subject: [PATCH 073/210] CH-100 Update scripts

---
 deployment-configuration/compose/Chart.yaml | 2 +-
 deployment-configuration/compose/README.md  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/deployment-configuration/compose/Chart.yaml b/deployment-configuration/compose/Chart.yaml
index f294c3e7..83bf4933 100644
--- a/deployment-configuration/compose/Chart.yaml
+++ b/deployment-configuration/compose/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 appVersion: "0.0.1"
-description: CloudHarness Helm Chart
+description: CloudHarness Docker Compose
 name: cloudharness
 version: 0.0.1
 maintainers:
diff --git a/deployment-configuration/compose/README.md b/deployment-configuration/compose/README.md
index abeab69d..391b61c6 100644
--- a/deployment-configuration/compose/README.md
+++ b/deployment-configuration/compose/README.md
@@ -1,4 +1,3 @@
-# CloudHarness Helm chart: deploy CloudHarness to k8s
-
-Helm is used to define the CloudHarness deployment on Kubernetes. For further information about Helm, see https://helm.sh.
+# CloudHarness Docker Compose: deploy CloudHarness to Docker Compose
 
+Helm is used to define templates about how the CloudHarness deployment on Docker Compose. For further information about Helm, see https://helm.sh.

From ac4b863bed7dc9a2730ed42037ef4f35a2906179 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Tue, 2 Apr 2024 10:33:58 -0600
Subject: [PATCH 074/210] CH-100 Fix imports of harness-deployment

---
 tools/deployment-cli-tools/harness-application | 5 ++---
 tools/deployment-cli-tools/harness-deployment  | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index a584c05d..46532825 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -2,7 +2,6 @@
 
 import sys
 import os
-import shutil
 import re
 import tempfile
 
@@ -25,8 +24,8 @@ if __name__ == "__main__":
     parser.add_argument('name', metavar='name', type=str,
                         help='Application name')
     parser.add_argument('-t', '--template', dest='templates', action="append", default=['base',],
-                        help="""Add a template name. 
-                        
+                        help="""Add a template name.
+
                         Available templates:
                         - flask-server (backend flask server based on openapi)
                         - webapp (webapp including backend and frontend)
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index 9a5cc78c..40d4b09a 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -5,7 +5,8 @@ import sys
 import os
 
 from ch_cli_tools.dockercompose import create_docker_compose_configuration
-from ch_cli_tools.helm import create_helm_chart, hosts_info, deploy
+from ch_cli_tools.helm import create_helm_chart, deploy
+from ch_cli_tools.configurationgenerator import hosts_info
 from ch_cli_tools.skaffold import create_skaffold_configuration, create_vscode_debug_configuration
 from ch_cli_tools.codefresh import create_codefresh_deployment_scripts, write_env_file
 from ch_cli_tools.preprocessing import preprocess_build_overrides

From 9b4dcaa9abea51e672358b64f9e47966b8e2be0f Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Thu, 18 Apr 2024 10:11:59 -0600
Subject: [PATCH 075/210] CH-100 Fix issue with TAG policy in skaffold for
 docker compose

---
 .../compose/templates/allvalues-template.yaml                   | 2 +-
 tools/deployment-cli-tools/ch_cli_tools/skaffold.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/compose/templates/allvalues-template.yaml b/deployment-configuration/compose/templates/allvalues-template.yaml
index d69538aa..d0aa2866 100644
--- a/deployment-configuration/compose/templates/allvalues-template.yaml
+++ b/deployment-configuration/compose/templates/allvalues-template.yaml
@@ -8,7 +8,6 @@ to replace the secrets values we create a dict with the structure:
 thus with an empty secrets node
 and then it's mergeOverwrite the copy of the .Values we created
 resulting in a copy of the .Values with all secrets being ""
-*/ -}}
 cloudharness-metadata:
   path: allvalues2.yaml
 data: |
@@ -18,3 +17,4 @@ data: |
   {{- $tmp := mergeOverwrite $values_copy $new_secrets }}
 {{- end }}
 {{ $values_copy | toYaml | indent 4 }}
+*/ -}}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 7859d043..b78f8b9e 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -201,7 +201,7 @@ def identify_unicorn_based_main(candidates):
         }
         skaffold_conf['build']['tagPolicy'] = {
             'envTemplate': {
-                'template': "TAG"
+                'template': '"{{.TAG}}"'
             }
         }
 

From 10f2c0f1f4147247a71ee0a8ddacd0145954f5b0 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 19 Apr 2024 10:32:18 -0600
Subject: [PATCH 076/210] CH-100 Update configuration for db in docker compose

---
 .../compose/templates/auto-compose.yaml                   | 8 ++++----
 .../compose/templates/auto-database.yaml                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index ca024edd..c99023fa 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -19,8 +19,8 @@ services:
       - "443:443"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./certs/:/certs/:ro"
-      - "./traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
+      - "./compose/traefik/certs/:/certs/:ro"
+      - "./compose/traefik/traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
 
 {{- range $app_name, $app_config := .Values.apps }}
   {{- if has $app_name (list "argo" "events" "nfsserver") -}}
@@ -76,10 +76,10 @@ services:
       replicas: {{ $deployment.replicas | default 1 }}
       resources:
         limits:
-          cpus: {{ $deployment.resources.limits.cpu | default "50m" }}
+          cpus: {{ $deployment.resources.limits.cpu | default "0.5" }}
           memory: {{ trimSuffix "i" $deployment.resources.limits.memory | default "64M" }}
         reservations:
-          cpus: {{ $deployment.resources.requests.cpu | default "25m" }}
+          cpus: {{ $deployment.resources.requests.cpu | default "0.25" }}
           memory: {{ trimSuffix "i" $deployment.resources.requests.memory | default "32M" }}
     {{- with $deployment.command }}
     # entrypoint: {{ cat . $deployment.args }}
diff --git a/deployment-configuration/compose/templates/auto-database.yaml b/deployment-configuration/compose/templates/auto-database.yaml
index 569bb220..93fd22ff 100644
--- a/deployment-configuration/compose/templates/auto-database.yaml
+++ b/deployment-configuration/compose/templates/auto-database.yaml
@@ -13,10 +13,10 @@
   deploy:
     resources:
       limits:
-        cpus: {{ .limits.cpu | default "1000m" }}
+        cpus: {{ .limits.cpu | default "0.75" }}
         memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
       reservations:
-        cpus: {{ .requests.cpu | default "100m" }}
+        cpus: {{ .requests.cpu | default "0.50" }}
         memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
   {{- end }}
   volumes:

From 83d9b8a3de978d480a4e77620eca1390e975d47c Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 19 Apr 2024 11:50:21 -0600
Subject: [PATCH 077/210] CH-100 Add support to link databases with service in
 docker compose

---
 .../compose/templates/auto-compose.yaml        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index c99023fa..f284c4be 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -107,11 +107,18 @@ services:
       {{- range $app_config.harness.env }}
       - {{ .name }}={{ .value }}
       {{- end }}
-    {{- with (concat (without $app_config.harness.dependencies.hard "argo") $app_config.harness.dependencies.soft) }}
+    {{- with compact
+          (append (concat (without $app_config.harness.dependencies.hard "argo")
+                  $app_config.harness.dependencies.soft)
+                  (dig "database" "name" "" $app_config.harness)) }}
     links:
       {{- range . -}}
         {{- $service := .}}
         {{- range $name, $conf := $.Values.apps }}
+          {{- if hasSuffix "-db" $service }}
+      - {{ $service }}:{{ $service }}.{{ $.Values.domain }}
+            {{- break -}}
+          {{- end -}}
           {{- if eq $conf.harness.name $service }}
             {{- if has $name (list "events" "nfsserver") }}
 #     - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
@@ -128,14 +135,16 @@ services:
     {{/* "compact" in the beginning is to remove empty values */}}
     {{- with compact
             (append
-              (without $app_config.harness.dependencies.hard "argo" )
+              (without $app_config.harness.dependencies.hard "argo" "events")
               (dig "database" "name" "" $app_config.harness)) -}}
-    {{- with without $app_config.harness.dependencies.hard "argo" "events" }}
     depends_on:
-    {{- end }}
       {{- range . -}}
         {{- $service := .}}
         {{- range $name, $conf := $.Values.apps -}}
+          {{- if hasSuffix "-db" $service }}
+      - {{ $service }}
+            {{- break -}}
+          {{- end -}}
           {{- if eq $conf.harness.name $service }}
             {{- if has $name (list "events" "nfsserver") }}
 #     - {{ $name }}
@@ -144,6 +153,7 @@ services:
             {{- end }}
             {{- break -}}
           {{- end -}}
+
         {{- end -}}
       {{- end }}
     {{- end }}

From e5361ca0a462d035499f24782d30bac6d37ba4e1 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 19 Apr 2024 12:32:07 -0600
Subject: [PATCH 078/210] CH-100 Change location of traefik config files

---
 deployment-configuration/compose/templates/auto-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index f284c4be..a3b46854 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -19,8 +19,8 @@ services:
       - "443:443"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./compose/traefik/certs/:/certs/:ro"
-      - "./compose/traefik/traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
+      - "./traefik/certs/:/certs/:ro"
+      - "./traefik/traefik.yaml:/etc/traefik/dynamic_conf/conf.yml:ro"
 
 {{- range $app_name, $app_config := .Values.apps }}
   {{- if has $app_name (list "argo" "events" "nfsserver") -}}

From 4c5d36905e157c740fbb6c6c72d95e839d993203 Mon Sep 17 00:00:00 2001
From: aranega <vincent.aranega@gmail.com>
Date: Fri, 19 Apr 2024 20:26:30 -0600
Subject: [PATCH 079/210] CH-100 Add specific option to expose locally a DB

---
 .../compose/templates/auto-database.yaml                    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deployment-configuration/compose/templates/auto-database.yaml b/deployment-configuration/compose/templates/auto-database.yaml
index 93fd22ff..9d56ae00 100644
--- a/deployment-configuration/compose/templates/auto-database.yaml
+++ b/deployment-configuration/compose/templates/auto-database.yaml
@@ -9,6 +9,12 @@
   {{- range $port := $db_infos.ports }}
     - {{ $port.port | quote }}
   {{- end }}
+  {{- with .local_expose }}
+  ports:
+    {{- range $port := $db_infos.ports }}
+    - 127.0.0.1:{{ $port.port }}:{{ $port.port }}
+    {{- end }}
+  {{- end }}
   {{- with .resources }}
   deploy:
     resources:

From 606ee410b21376a6df349c90474b74bca6aa7b58 Mon Sep 17 00:00:00 2001
From: Afonso Pinto <afonsobspinto@gmail.com>
Date: Thu, 13 Jun 2024 15:59:58 +0100
Subject: [PATCH 080/210] Update accounts.md

---
 docs/accounts.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/accounts.md b/docs/accounts.md
index 8d07ca4a..5797c719 100644
--- a/docs/accounts.md
+++ b/docs/accounts.md
@@ -13,7 +13,7 @@ A user account must be provided to access to the MNP secured applications.
 To put a gatekeeper in front of your application, set `harness/secured` to `true`
 in the application's values.yaml.
 
-To assign paths and roles, set `uri_role_mapping` as you would do in the [gatekeeper configuration file resources](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/user-guide.md#configuration-options).
+To assign paths and roles, set `uri_role_mapping` as you would do in the [gatekeeper configuration file resources](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/userguide/_index.md#configuration-options).
 
 Example:
 
@@ -27,7 +27,7 @@ harness:
     - administrator
 ```
 
-See the [Gogatekeeper official documentation](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/user-guide.md) for more.
+See the [Gogatekeeper official documentation](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/userguide/_index.md) for more.
 
 
 ## Backend development

From 3f786449995289a19ecbad2645dcd00a8a7bb6c6 Mon Sep 17 00:00:00 2001
From: Afonso Pinto <afonsobspinto@gmail.com>
Date: Thu, 20 Jun 2024 11:02:00 +0100
Subject: [PATCH 081/210] Update accounts.md

---
 docs/accounts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/accounts.md b/docs/accounts.md
index 5797c719..dda1e83e 100644
--- a/docs/accounts.md
+++ b/docs/accounts.md
@@ -27,7 +27,7 @@ harness:
     - administrator
 ```
 
-See the [Gogatekeeper official documentation](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/userguide/_index.md) for more.
+See the [Gogatekeeper official documentation](https://gogatekeeper.github.io/gatekeeper/userguide) for more.
 
 
 ## Backend development

From 0305496fa8b685af2c2b2dac5254534bb096e6c8 Mon Sep 17 00:00:00 2001
From: Diogo Correia <diogo@metacell.us>
Date: Mon, 24 Jun 2024 14:34:51 +0100
Subject: [PATCH 082/210] Fix documentation typos

---
 README.md                                         | 1 -
 docs/README.md                                    | 2 +-
 docs/applications/secrets.md                      | 2 +-
 docs/build-deploy/README.md                       | 2 +-
 docs/build-deploy/environments.md                 | 2 +-
 docs/tutorials/simple-date-clock-application.adoc | 4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 459b2929..a1eb15a2 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,6 @@ A JRE is needed to run the code generators based on openapi-generator.
 
 For more info, see [here](https://openapi-generator.tech/docs/installation).
 
-
 ## CloudHarness command line tools
 To use the cli tools, install requirements first:
 
diff --git a/docs/README.md b/docs/README.md
index b6a8087f..33c6bb73 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # Index of the documentation articles
 - [Create and run a deployment](./build-deploy/README.md)
-  - [Create a codefresh continuous deployment](./build-deploy/codefresh.md)
+  - [Create a codefresh continuous deployment](./build-deploy/ci-cd/codefresh.md)
   - [Configure the Helm chart](./build-deploy/helm-configuration.md)
   - [Set up environments](./build-deploy/environments.md)
   - [Work with local deployments](./build-deploy/local-deploy/README.md)
diff --git a/docs/applications/secrets.md b/docs/applications/secrets.md
index c7d49143..dfd72256 100644
--- a/docs/applications/secrets.md
+++ b/docs/applications/secrets.md
@@ -2,7 +2,7 @@
 
 ## What secrets are
 
-Kubernetes Secrets let you store and manage sensitive information, such as passwords, OAuth tokens, and ssh keys. Storing confidential information in a Secret is safer and more flexible than putting it verbatim in a Pod definition or in a container image. See [Secrets design document](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/auth/secrets.md) for more information.
+Kubernetes Secrets let you store and manage sensitive information, such as passwords, OAuth tokens, and ssh keys. Storing confidential information in a Secret is safer and more flexible than putting it verbatim in a Pod definition or in a container image. See [Secrets design document](https://github.com/kubernetes/design-proposals-archive/blob/main/auth/secrets.md) for more information.
 
 **CloudHarness has build-in support for application specific kubernetes secrets.**
 
diff --git a/docs/build-deploy/README.md b/docs/build-deploy/README.md
index 35e5fbdc..c48892d9 100644
--- a/docs/build-deploy/README.md
+++ b/docs/build-deploy/README.md
@@ -94,7 +94,7 @@ To build and reploy
 
 ## Continuous deployment with Codefresh
 
-See [here](./codefresh.md).
+See [here](./ci-cd/codefresh.md).
 
 ## Relevant files and directory structure
 Deployment files are automatically generated with the script 
diff --git a/docs/build-deploy/environments.md b/docs/build-deploy/environments.md
index f730b641..6112a2bd 100644
--- a/docs/build-deploy/environments.md
+++ b/docs/build-deploy/environments.md
@@ -6,7 +6,7 @@ respect to the production build.
 
 ## How to set the environment
 
-The environment of the current deployment can ve set with the parameter `--env` (`-e`)
+The environment of the current deployment can be set with the parameter `--env` (`-e`)
 of `harness-deployment`.
 
 When the environment is set, specific environment configuration files are included, potentially overriding any value in the system.
diff --git a/docs/tutorials/simple-date-clock-application.adoc b/docs/tutorials/simple-date-clock-application.adoc
index 8ed52a0e..b5a480e4 100644
--- a/docs/tutorials/simple-date-clock-application.adoc
+++ b/docs/tutorials/simple-date-clock-application.adoc
@@ -36,7 +36,7 @@ Before installing everything, please be sure you have the following tools instal
 == Install {ch} (if it is not yet done)
 
 {ch} is coded in Python, consequently, it's always better to create a local virtualenv dedicated to the project to avoid messing with your system dependencies.
-As shown in the snippet above, we will clone the repository, change directory inside the freshly clone directory and create a virtualenv inside (for this tutorial, the Python's version used is CPython 3.10.6).
+As shown in the snippet bellow, we will clone the repository, change directory inside the freshly clone directory and create a virtualenv inside (for this tutorial, the Python's version used is CPython 3.10.6).
 
 First step is to clone the link:{repo_url}[{ch} repository] on your system.
 
@@ -398,7 +398,7 @@ This will add a new `datetime_controller.py` in the `backend/clockdate/controlle
 
 [IMPORTANT]
 You need to notice that all the controllers files (and all the files) are overridden in the `backend` directory.
-To prevent files of being overridden, you need to edit the `.openapi-generator-ignore` file, that acts like a `.gitignore` file (in a way), by marking the files/directories that needs to be ignored by the generation.
+To prevent files from being overridden, you need to edit the `.openapi-generator-ignore` file, in Cloud Harness template directory, which acts like a `.gitignore` file (in a way), by marking the files/directories that needs to be ignored by the generation.
 
 When we open this file, we get the following controller method:
 

From 3330807ac38424e865c6106cdd13a6d03bdcc303 Mon Sep 17 00:00:00 2001
From: Diogo Correia <diogo@metacell.us>
Date: Tue, 25 Jun 2024 16:41:56 +0100
Subject: [PATCH 083/210] Fix grammar mistake in the developer documentation

---
 docs/dev.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dev.md b/docs/dev.md
index 113e0c86..3c080d9b 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -233,7 +233,7 @@ The skaffold configuration is generated by the `create_skaffold_configuration(..
 This function also generates the skaffold entries for the Dockerfiles of the micro-services used in the application.
 The skaffold generation is based on the [`skaffold-template.yaml`](../deployment-configuration/skaffold-template.yaml) from the CloudHarness project located in [`deployment-configuration`](../deployment-configuration/).
 This base configuration is merged with the configuration dedicated to a specific project and which is located in the `deployment-configuration` folder of the project.
-Finally, once all the requiered information are injected in the skaffold configuration dictionnary, the dictionnary is saved as a YAML file in the `deployment/skaffold.yaml` file in the project directory.
+Finally, once all the requiered information is injected in the skaffold configuration dictionnary, the dictionnary is saved as a YAML file in the `deployment/skaffold.yaml` file in the project directory.
 
 #### How to extend the deployment generation
 

From 24269dd8e9cc8e10a14650f2470988d342ec07e9 Mon Sep 17 00:00:00 2001
From: Diogo Correia <diogo@metacell.us>
Date: Thu, 27 Jun 2024 10:42:29 +0100
Subject: [PATCH 084/210] Update dead links in accounts documentation

---
 docs/accounts.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/accounts.md b/docs/accounts.md
index 8d07ca4a..b85f9f5a 100644
--- a/docs/accounts.md
+++ b/docs/accounts.md
@@ -13,7 +13,7 @@ A user account must be provided to access to the MNP secured applications.
 To put a gatekeeper in front of your application, set `harness/secured` to `true`
 in the application's values.yaml.
 
-To assign paths and roles, set `uri_role_mapping` as you would do in the [gatekeeper configuration file resources](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/user-guide.md#configuration-options).
+To assign paths and roles, set `uri_role_mapping` as you would do in the [gatekeeper configuration file resources](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/configuration/_index.md).
 
 Example:
 
@@ -27,7 +27,7 @@ harness:
     - administrator
 ```
 
-See the [Gogatekeeper official documentation](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/user-guide.md) for more.
+See the [Gogatekeeper official documentation](https://github.com/gogatekeeper/gatekeeper/blob/master/docs/content/userguide/_index.md) for more.
 
 
 ## Backend development

From 90eedea0ee398343218e975cc8d7728123f80450 Mon Sep 17 00:00:00 2001
From: Diogo Correia <diogo@metacell.us>
Date: Thu, 27 Jun 2024 17:34:06 +0100
Subject: [PATCH 085/210] Fix previously introduced typo

---
 docs/tutorials/simple-date-clock-application.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/simple-date-clock-application.adoc b/docs/tutorials/simple-date-clock-application.adoc
index b5a480e4..8df80aaa 100644
--- a/docs/tutorials/simple-date-clock-application.adoc
+++ b/docs/tutorials/simple-date-clock-application.adoc
@@ -36,7 +36,7 @@ Before installing everything, please be sure you have the following tools instal
 == Install {ch} (if it is not yet done)
 
 {ch} is coded in Python, consequently, it's always better to create a local virtualenv dedicated to the project to avoid messing with your system dependencies.
-As shown in the snippet bellow, we will clone the repository, change directory inside the freshly clone directory and create a virtualenv inside (for this tutorial, the Python's version used is CPython 3.10.6).
+As shown in the snippet below, we will clone the repository, change directory inside the freshly clone directory and create a virtualenv inside (for this tutorial, the Python's version used is CPython 3.10.6).
 
 First step is to clone the link:{repo_url}[{ch} repository] on your system.
 

From 592bb486be5f77edf09b2e0b9d45eb21244c1096 Mon Sep 17 00:00:00 2001
From: Diogo Correia <diogo@metacell.us>
Date: Fri, 28 Jun 2024 17:08:53 +0100
Subject: [PATCH 086/210] Fix dead link to jupyter hook implementation example

---
 docs/jupyterhub.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/jupyterhub.md b/docs/jupyterhub.md
index 709ede5f..e48e101f 100644
--- a/docs/jupyterhub.md
+++ b/docs/jupyterhub.md
@@ -138,7 +138,7 @@ def change_pod_manifest(self: KubeSpawner):
 ```
 
 The hook function should be part of a library installable as a pip package.
-To see a real example, refer to the main [hook implementation](../applications/jupyterhub/src/harness_jupyter/jupyterhub.py).
+To see a real example, refer to the main [hook implementation](../applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py).
 
 ### Add the hook
 
@@ -178,5 +178,3 @@ to the [values.yaml](../applications/jupyterhub/deploy/values.yaml) file.
 Cloudharness JupyterHub is integrated with the accounts service so enabling a shared single-sign-on with other applications in the solution.
 
 The spawner is also adapted providing a hook to allow other applications to be based on the hub spawner to run with their own configurations.
-
-Available
\ No newline at end of file

From e0ba439477a60e64a6bccebb6a57e120e1aaa32a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 16 Jul 2024 15:56:46 +0200
Subject: [PATCH 087/210] CH-135 fix notifications build

---
 applications/notifications/server/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/notifications/server/setup.py b/applications/notifications/server/setup.py
index cccc107f..e126c665 100644
--- a/applications/notifications/server/setup.py
+++ b/applications/notifications/server/setup.py
@@ -14,7 +14,7 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-    "jinja2>=3"
+    "jinja2>=3",
     "python_dateutil>=2.6.0"
 ]
 

From bad0be01957a497d633eea18258f31e67e6523ef Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 26 Jul 2024 19:00:11 +0200
Subject: [PATCH 088/210] CH-140 update python dependencies

---
 .../cloudharness-common/requirements.txt      | 39 -------------------
 libraries/cloudharness-common/setup.py        | 20 ++++++----
 libraries/cloudharness-utils/requirements.txt |  6 ---
 libraries/cloudharness-utils/setup.py         |  8 ++--
 libraries/models/requirements.txt             | 10 -----
 libraries/models/setup.py                     | 16 +++++---
 6 files changed, 28 insertions(+), 71 deletions(-)

diff --git a/libraries/cloudharness-common/requirements.txt b/libraries/cloudharness-common/requirements.txt
index 6450109d..e69de29b 100644
--- a/libraries/cloudharness-common/requirements.txt
+++ b/libraries/cloudharness-common/requirements.txt
@@ -1,39 +0,0 @@
-argo-workflows==5.0.0
-blinker==1.7.0
-cachetools==5.3.2
-certifi==2023.11.17
-cffi==1.16.0
-charset-normalizer==3.3.2
-click==8.1.7
-cryptography==42.0.0
-deprecation==2.1.0
-ecdsa==0.18.0
-idna==3.6
-importlib-metadata==7.0.1
-itsdangerous==2.1.2
-Jinja2==3.1.3
-kafka-python==2.0.2
-kubernetes==29.0.0
-MarkupSafe==2.1.3
-oauthlib==3.2.2
-oyaml==1.0
-packaging==23.2
-pyaml==23.12.0
-pyasn1==0.5.1
-pyasn1-modules==0.3.0
-pycparser==2.21
-pyhumps==3.8.0
-PyJWT==2.8.0
-python-dateutil==2.8.2
-python-jose==3.3.0
-python-keycloak==3.7.0
-PyYAML==6.0.1
-requests==2.31.0
-requests-oauthlib==1.3.1
-requests-toolbelt==1.0.0
-rsa==4.9
-sentry-sdk==1.39.2
-six==1.16.0
-urllib3==2.1.0
-Werkzeug==3.0.1
-zipp==3.17.0
diff --git a/libraries/cloudharness-common/setup.py b/libraries/cloudharness-common/setup.py
index d3bee95c..8e775bc9 100644
--- a/libraries/cloudharness-common/setup.py
+++ b/libraries/cloudharness-common/setup.py
@@ -12,21 +12,26 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIREMENTS = [
-    'kubernetes',
-    'kafka-python',
-    'pyaml',
+    'kubernetes >= 29.0.0',
+    'PyYAML >= 6.0.1',
+    'oyaml >= 1.0',
     'pyjwt>=2.6.0',
     'cryptography',
     'requests>=2.21.0',
     'sentry-sdk[flask]>=0.14.4',
-    'python-keycloak',
+    'python-keycloak >= 3.7.0',
     'cloudharness_model',
     'argo-workflows==5.0.0',
-    'cachetools'
+    'cachetools >= 5.3.2',
+    'blinker >= 1.7.0',
+    'jinja2 >= 3.1.4',
+    'kafka-python >= 2.0.2',
+    'requests >= 2.31.0',
+    'python-dateutil >= 2.8.2',
+    'sentry-sdk >= 1.39.2',
 ]
 
 
-
 setup(
     name=NAME,
     version=VERSION,
@@ -35,7 +40,8 @@
     url="",
     keywords=["cloudharness", "cloud"],
     install_requires=REQUIREMENTS,
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
+    packages=find_packages(
+        exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     include_package_data=True,
     package_data={'': ['*.yaml']},
     long_description="""\
diff --git a/libraries/cloudharness-utils/requirements.txt b/libraries/cloudharness-utils/requirements.txt
index 0e663599..e69de29b 100644
--- a/libraries/cloudharness-utils/requirements.txt
+++ b/libraries/cloudharness-utils/requirements.txt
@@ -1,6 +0,0 @@
-docker
-six
-ruamel.yaml
-oyaml
-schemathesis
-cloudharness_model
diff --git a/libraries/cloudharness-utils/setup.py b/libraries/cloudharness-utils/setup.py
index 38b81ff8..fd994d21 100644
--- a/libraries/cloudharness-utils/setup.py
+++ b/libraries/cloudharness-utils/setup.py
@@ -21,12 +21,13 @@
 
 REQUIREMENTS = [
     'ruamel.yaml',
-    'oyaml',
+    'cloudharness_model',
+    'docker',
+    'ruamel.yaml',
     'cloudharness_model'
 ]
 
 
-
 setup(
     name=NAME,
     version=VERSION,
@@ -35,7 +36,8 @@
     url="",
     keywords=["Cloud", "Kubernetes", "Helm", "Deploy"],
     install_requires=REQUIREMENTS,
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
+    packages=find_packages(
+        exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     include_package_data=True,
     long_description="""\
     CloudHarness utils library
diff --git a/libraries/models/requirements.txt b/libraries/models/requirements.txt
index 183e9115..e69de29b 100644
--- a/libraries/models/requirements.txt
+++ b/libraries/models/requirements.txt
@@ -1,10 +0,0 @@
-fonttools==4.43.0
-Jinja2==3.1.3
-MarkupSafe==2.1.3
-oyaml==1.0
-psutil==5.9.4
-pyhumps==3.8.0
-python-dateutil==2.8.2
-PyYAML==6.0.1
-six==1.16.0
-swagger_ui_bundle==1.1.0
\ No newline at end of file
diff --git a/libraries/models/setup.py b/libraries/models/setup.py
index 264ae235..946a10f3 100644
--- a/libraries/models/setup.py
+++ b/libraries/models/setup.py
@@ -10,11 +10,15 @@
 NAME = "cloudharness_model"
 VERSION = "2.3.0"
 REQUIREMENTS = [
-    "swagger-ui-bundle >= 0.0.2",
-    "python_dateutil >= 2.6.0",
-    "setuptools >= 21.0.0",
-    "pyhumps",
-    "oyaml"
+    "Jinja2 >= 3.1.3",
+    "oyaml >= 1.0",
+    "psutil >= 5.9.4",
+    "pyhumps >= 3.8.0",
+    "python-dateutil >= 2.8.2",
+    "PyYAML >= 6.0.1",
+    "six >= 1.16.0",
+    "swagger_ui_bundle >= 1.1.0",
 ]
 print(REQUIREMENTS)
-setup(name=NAME, version=VERSION, install_requires=REQUIREMENTS, packages=find_packages(),)
+setup(name=NAME, version=VERSION,
+      install_requires=REQUIREMENTS, packages=find_packages(),)

From 11c9fe57c844628d4219c1c524c350f49238d60c Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 26 Jul 2024 19:02:27 +0200
Subject: [PATCH 089/210] CH-17 Update do Python 3.12

---
 .../base-images/cloudharness-base-debian/Dockerfile           | 2 +-
 infrastructure/base-images/cloudharness-base/Dockerfile       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infrastructure/base-images/cloudharness-base-debian/Dockerfile b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
index 18975b71..5b600d8a 100644
--- a/infrastructure/base-images/cloudharness-base-debian/Dockerfile
+++ b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
@@ -1,4 +1,4 @@
-ARG PARENT=python:3.9.10
+ARG PARENT=python:3.12
 FROM ${PARENT}
 
 RUN apt-get update && apt-get install -y nfs-common && rm -rf /var/lib/apt/lists/*
diff --git a/infrastructure/base-images/cloudharness-base/Dockerfile b/infrastructure/base-images/cloudharness-base/Dockerfile
index 782c7d55..ac7f94ac 100644
--- a/infrastructure/base-images/cloudharness-base/Dockerfile
+++ b/infrastructure/base-images/cloudharness-base/Dockerfile
@@ -1,4 +1,4 @@
-ARG PARENT=python:3.9.10-alpine
+ARG PARENT=python:3.12-alpine
 FROM ${PARENT}
 
 RUN apk update
@@ -11,7 +11,7 @@ RUN apk add gcc libc-dev g++ python3-dev libffi-dev openssl-dev rust musl-dev ca
 
 RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
     pip install pytest  --prefer-binary
-    
+
 COPY libraries/models/requirements.txt /libraries/models/requirements.txt
 RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
     pip install -r /libraries/models/requirements.txt  --prefer-binary

From 2809262fce6a0faaabe0aaa27718ae1d72c9385a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 26 Jul 2024 19:02:45 +0200
Subject: [PATCH 090/210] CH-17 Update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a1eb15a2..67588d75 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ Python 3.9 must be installed.
 It is recommended to setup a virtual environment.
 With conda: 
 ```bash
-conda create --name ch python=3.9
+conda create --name ch python=3.12
 conda activate ch
 ```
 

From 102faf7b0ef7d8e1f62927cd15461b50f7915039 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 26 Jul 2024 19:05:39 +0200
Subject: [PATCH 091/210] CH-66 fix default value

---
 deployment-configuration/value-template.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/value-template.yaml b/deployment-configuration/value-template.yaml
index 8702e6f6..c04439a3 100644
--- a/deployment-configuration/value-template.yaml
+++ b/deployment-configuration/value-template.yaml
@@ -55,7 +55,7 @@ harness:
     # -- Service port.
     port: 80
   # -- Auto generated secrets key-value pairs. If no value is provided, a random hash is generated
-  secrets:
+  secrets: {}
   # -- Specify which services this application uses in the frontend to create proxy ingresses. e.g. - name: mnp-checkout
   use_services: []
   # -- enabled sentry for automated error report
@@ -136,4 +136,4 @@ harness:
       keepalive:
     payload:
       # -- Maximum size of payload in MB
-      max: 
\ No newline at end of file
+      max:

From 82c254d84ec5c02a56777972cd6ad2570a883cdc Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 26 Jul 2024 19:08:56 +0200
Subject: [PATCH 092/210] CH-121 WIP: use vite on samples app

---
 applications/samples/frontend/.babelrc        |   20 -
 applications/samples/frontend/.eslintignore   |    1 -
 applications/samples/frontend/.eslintrc.cjs   |   19 +
 applications/samples/frontend/.eslintrc.yml   |   49 -
 applications/samples/frontend/.gitignore      |   24 +-
 applications/samples/frontend/README.md       |   31 +-
 applications/samples/frontend/index.html      |   16 +
 applications/samples/frontend/package.json    |   76 +-
 .../samples/frontend/public/favicon.png       |  Bin 0 -> 5899 bytes
 .../{src/assets/icon.png => public/logo.png}  |  Bin
 applications/samples/frontend/src/App.tsx     |   11 +-
 .../frontend/src/components/RestTest.tsx      |    9 +-
 .../frontend/src/components/Version.tsx       |    4 +-
 applications/samples/frontend/src/index.css   |    5 +
 applications/samples/frontend/src/index.ejs   |   10 -
 applications/samples/frontend/src/index.tsx   |    6 -
 applications/samples/frontend/src/main.tsx    |   10 +
 .../samples/frontend/src/styles/style.less    |    4 -
 .../samples/frontend/src/vite-env.d.ts        |    1 +
 .../samples/frontend/tsconfig.app.json        |   27 +
 applications/samples/frontend/tsconfig.json   |   29 +-
 .../samples/frontend/tsconfig.node.json       |   13 +
 applications/samples/frontend/vite.config.ts  |   32 +
 .../samples/frontend/webpack.config.dev.js    |   48 -
 .../samples/frontend/webpack.config.js        |  124 -
 applications/samples/frontend/yarn.lock       | 8484 +++--------------
 26 files changed, 1621 insertions(+), 7432 deletions(-)
 delete mode 100644 applications/samples/frontend/.babelrc
 delete mode 100644 applications/samples/frontend/.eslintignore
 create mode 100644 applications/samples/frontend/.eslintrc.cjs
 delete mode 100644 applications/samples/frontend/.eslintrc.yml
 create mode 100644 applications/samples/frontend/index.html
 create mode 100644 applications/samples/frontend/public/favicon.png
 rename applications/samples/frontend/{src/assets/icon.png => public/logo.png} (100%)
 create mode 100644 applications/samples/frontend/src/index.css
 delete mode 100644 applications/samples/frontend/src/index.ejs
 delete mode 100644 applications/samples/frontend/src/index.tsx
 create mode 100644 applications/samples/frontend/src/main.tsx
 delete mode 100644 applications/samples/frontend/src/styles/style.less
 create mode 100644 applications/samples/frontend/src/vite-env.d.ts
 create mode 100644 applications/samples/frontend/tsconfig.app.json
 mode change 100755 => 100644 applications/samples/frontend/tsconfig.json
 create mode 100644 applications/samples/frontend/tsconfig.node.json
 create mode 100644 applications/samples/frontend/vite.config.ts
 delete mode 100644 applications/samples/frontend/webpack.config.dev.js
 delete mode 100644 applications/samples/frontend/webpack.config.js

diff --git a/applications/samples/frontend/.babelrc b/applications/samples/frontend/.babelrc
deleted file mode 100644
index 2b53150f..00000000
--- a/applications/samples/frontend/.babelrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "presets": [
-      "@babel/preset-env",
-      "@babel/preset-react"
-    ],
-    "env": {
-        "production":{
-            "presets": ["minify"]
-        }
-    },
-    "plugins": [
-        "@babel/transform-regenerator",
-        "@babel/plugin-proposal-class-properties",
-        [
-            "module-resolver", {
-                "root": ["./src"]
-            }
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/applications/samples/frontend/.eslintignore b/applications/samples/frontend/.eslintignore
deleted file mode 100644
index 77738287..00000000
--- a/applications/samples/frontend/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-dist/
\ No newline at end of file
diff --git a/applications/samples/frontend/.eslintrc.cjs b/applications/samples/frontend/.eslintrc.cjs
new file mode 100644
index 00000000..ba9dc0ed
--- /dev/null
+++ b/applications/samples/frontend/.eslintrc.cjs
@@ -0,0 +1,19 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs', 'rest'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+    ''
+  }
+}
diff --git a/applications/samples/frontend/.eslintrc.yml b/applications/samples/frontend/.eslintrc.yml
deleted file mode 100644
index 68fb53e5..00000000
--- a/applications/samples/frontend/.eslintrc.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-root: true
-extends:
-  - eslint:recommended
-  - plugin:react/recommended
-parser: 'babel-eslint'
-parserOptions:
-  ecmaFeatures:
-    jsx: true
-plugins:
-  - jest
-  - react
-  - react-hooks
-settings:
-  react:
-    version: detect
-env:
-  jest/globals: true
-  browser: true
-  es6: true
-rules:
-  no-console: 0
-  func-style: 2
-  consistent-return: 2
-  prefer-arrow-callback:
-    - 2
-    - allowNamedFunctions: false
-      allowUnboundThis: false
-  jest/no-disabled-tests: 2
-  jest/no-focused-tests: 2
-  react/prop-types: 0
-  react/forbid-prop-types: 0
-  react/no-unused-prop-types: 0
-  react-hooks/rules-of-hooks: 2
-  react-hooks/exhaustive-deps: 1
-  curly: 2
-  no-tabs: 2
-  arrow-spacing: 2
-  no-unneeded-ternary: 2
-  object-curly-spacing:
-    - 2
-    - always
-  indent: 
-    - 2
-    - 2
-    - SwitchCase: 1
-globals:
-  __dirname: writable
-  module: writable
\ No newline at end of file
diff --git a/applications/samples/frontend/.gitignore b/applications/samples/frontend/.gitignore
index 149b5765..a547bf36 100644
--- a/applications/samples/frontend/.gitignore
+++ b/applications/samples/frontend/.gitignore
@@ -1,4 +1,24 @@
-wwwroot/*.js
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
 node_modules
-typings
 dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/applications/samples/frontend/README.md b/applications/samples/frontend/README.md
index 7de3e72e..e1cdc89d 100644
--- a/applications/samples/frontend/README.md
+++ b/applications/samples/frontend/README.md
@@ -1 +1,30 @@
-# samples
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default {
+  // other rules...
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    project: ['./tsconfig.json', './tsconfig.node.json', './tsconfig.app.json'],
+    tsconfigRootDir: __dirname,
+  },
+}
+```
+
+- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
+- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
diff --git a/applications/samples/frontend/index.html b/applications/samples/frontend/index.html
new file mode 100644
index 00000000..d0f66997
--- /dev/null
+++ b/applications/samples/frontend/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.png" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>CloudHarness sample application</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/main.tsx"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/applications/samples/frontend/package.json b/applications/samples/frontend/package.json
index 2ebb4f2c..9ccdc4a6 100644
--- a/applications/samples/frontend/package.json
+++ b/applications/samples/frontend/package.json
@@ -1,60 +1,32 @@
 {
-  "name": "samples",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
+  "name": "frontend",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prebuild": "eslint . --color",
-    "build": "webpack --config webpack.config.js",
-    "build-dev": "webpack --config webpack.config.js --env mode=development",
-    "prestart": "eslint . --color --fix",
-    "start": "webpack serve --progress  --env DOMAIN=http://localhost:5000 --config webpack.config.dev.js",
-    "start:dev": "webpack serve --progress  --env.DOMAIN=https://samples.cloudharness.metacell.us --config webpack.config.dev.js",
-    "start:local": "webpack serve --progress --env DOMAIN=http://samples.ch.local --config webpack.config.dev.js"
+    "dev": "vite",
+    "start": "DOMAIN=http://localhost:5000 vite",
+    "start:dev": "DOMAIN=https://test.ch.metacell.us vite",
+    "start:local": "DOMAIN=http://samples.ch vite",
+    "build": "tsc -b && vite build",
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview"
   },
-  "author": "",
-  "license": "MIT",
   "dependencies": {
-    "axios": "^1.6.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-router": "^5.0.0",
-    "react-router-dom": "^5.0.0",
-    "use-clipboard-copy": "^0.1.2"
+    "axios": "^1.7.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.3",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "babel-preset-minify": "^0.5.1",
-    "clean-webpack-plugin": "^3.0.0",
-    "compression-webpack-plugin": "^7.1.2",
-    "copy-webpack-plugin": "^6.2.1",
-    "css-loader": "^5.2.4",
-    "dotenv": "^16.0.2",
-    "eslint": "5.16.0",
-    "eslint-plugin-jest": "^23.8.2",
-    "eslint-plugin-react": "^7.19.0",
-    "eslint-plugin-react-hooks": "^3.0.0",
-    "file-loader": "^5.0.2",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^5.5.0",
-    "image-webpack-loader": "^8.1.0",
-    "less": "^3.10.3",
-    "less-loader": "^6.1.2",
-    "less-vars-to-js": "^1.3.0",
-    "raw-loader": "^4.0.2",
-    "style-loader": "^1.1.3",
-    "ts-loader": "^9.0.0",
-    "typescript": "^4.8.3",
-    "webpack": "^5.61.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^4.5.0",
-    "webpack-merge": "^5.7.0"
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
+    "@vitejs/plugin-react": "^4.3.1",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.7",
+    "typescript": "^5.2.2",
+    "vite": "^5.3.4"
   }
 }
diff --git a/applications/samples/frontend/public/favicon.png b/applications/samples/frontend/public/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..93c13b76c7b9432da2e43fcc23c6094538c528c7
GIT binary patch
literal 5899
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

literal 0
HcmV?d00001

diff --git a/applications/samples/frontend/src/assets/icon.png b/applications/samples/frontend/public/logo.png
similarity index 100%
rename from applications/samples/frontend/src/assets/icon.png
rename to applications/samples/frontend/public/logo.png
diff --git a/applications/samples/frontend/src/App.tsx b/applications/samples/frontend/src/App.tsx
index 81836267..eb8c0452 100644
--- a/applications/samples/frontend/src/App.tsx
+++ b/applications/samples/frontend/src/App.tsx
@@ -1,17 +1,16 @@
-import React from 'react';
-import './styles/style.less';
-
 import RestTest from './components/RestTest';
 import Version from './components/Version';
 
+
 const Main = () => (
     <>
-      <img src="/assets/icon.png" width="800" />
+       <img src="/logo.png" width="800" />
       <h1>Sample React application is working!</h1>
       <Version />
       <RestTest />
       <p>See api documentation <a href="/api/ui/">here</a></p>
     </>
-);
+  )
+
 
-export default Main;
\ No newline at end of file
+export default Main;
diff --git a/applications/samples/frontend/src/components/RestTest.tsx b/applications/samples/frontend/src/components/RestTest.tsx
index 3fbaa933..5732a17a 100644
--- a/applications/samples/frontend/src/components/RestTest.tsx
+++ b/applications/samples/frontend/src/components/RestTest.tsx
@@ -1,13 +1,16 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 
 import { TestApi } from '../rest/api'
+import { AxiosResponse } from 'axios';
 const test = new TestApi();
 
+
+
 const RestTest = () => {
-  const [result, setResult] = useState(null);
+  const [result, setResult] = useState<any>(null);
   useEffect(() => {
-    test.ping().then(r => setResult(r), () => setResult({ data: "API error"}));
+    test.ping().then((r: AxiosResponse) => setResult(r), () => setResult({ data: "API error"}));
   }, []);
     
 
diff --git a/applications/samples/frontend/src/components/Version.tsx b/applications/samples/frontend/src/components/Version.tsx
index 2b5f5eb3..279e0aca 100644
--- a/applications/samples/frontend/src/components/Version.tsx
+++ b/applications/samples/frontend/src/components/Version.tsx
@@ -1,9 +1,9 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 
 
 const Version = () => {
-  const [result, setResult] = useState(null);
+  const [result, setResult] = useState<any>(null);
   useEffect(() => {
     fetch("/proxy/common/api/version", {
       headers: {
diff --git a/applications/samples/frontend/src/index.css b/applications/samples/frontend/src/index.css
new file mode 100644
index 00000000..7466f905
--- /dev/null
+++ b/applications/samples/frontend/src/index.css
@@ -0,0 +1,5 @@
+body {
+  text-align: center;
+  background-color: '#eeeeee';
+  font-family: Roboto, Helvetica, sans-serif;
+}
\ No newline at end of file
diff --git a/applications/samples/frontend/src/index.ejs b/applications/samples/frontend/src/index.ejs
deleted file mode 100644
index 4cd05b48..00000000
--- a/applications/samples/frontend/src/index.ejs
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>Samples</title>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/applications/samples/frontend/src/index.tsx b/applications/samples/frontend/src/index.tsx
deleted file mode 100644
index ae31e413..00000000
--- a/applications/samples/frontend/src/index.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import App from './App';
-
-ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/applications/samples/frontend/src/main.tsx b/applications/samples/frontend/src/main.tsx
new file mode 100644
index 00000000..3d7150da
--- /dev/null
+++ b/applications/samples/frontend/src/main.tsx
@@ -0,0 +1,10 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import App from './App.tsx'
+import './index.css'
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+)
diff --git a/applications/samples/frontend/src/styles/style.less b/applications/samples/frontend/src/styles/style.less
deleted file mode 100644
index b1bece6a..00000000
--- a/applications/samples/frontend/src/styles/style.less
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
-    text-align: center;
-    background-color: '#eeeeee';
-}
\ No newline at end of file
diff --git a/applications/samples/frontend/src/vite-env.d.ts b/applications/samples/frontend/src/vite-env.d.ts
new file mode 100644
index 00000000..11f02fe2
--- /dev/null
+++ b/applications/samples/frontend/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/applications/samples/frontend/tsconfig.app.json b/applications/samples/frontend/tsconfig.app.json
new file mode 100644
index 00000000..d739292a
--- /dev/null
+++ b/applications/samples/frontend/tsconfig.app.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src"]
+}
diff --git a/applications/samples/frontend/tsconfig.json b/applications/samples/frontend/tsconfig.json
old mode 100755
new mode 100644
index 21ec6c41..ea9d0cd8
--- a/applications/samples/frontend/tsconfig.json
+++ b/applications/samples/frontend/tsconfig.json
@@ -1,22 +1,11 @@
 {
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "module": "commonjs",
-    "target": "es2017",
-    "stripInternal":true,
-    "skipLibCheck": true,
-    "alwaysStrict":false,
-    "forceConsistentCasingInFileNames": true,
-    "noImplicitReturns": false,
-    "strict": false,
-    "noUnusedLocals": false,
-    "jsx": "react",
-    "types": [],
-    "esModuleInterop": true
-  },
-  "exclude": [
-    "node_modules"
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.node.json"
+    }
   ]
-}
\ No newline at end of file
+}
diff --git a/applications/samples/frontend/tsconfig.node.json b/applications/samples/frontend/tsconfig.node.json
new file mode 100644
index 00000000..3afdd6e3
--- /dev/null
+++ b/applications/samples/frontend/tsconfig.node.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "noEmit": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/applications/samples/frontend/vite.config.ts b/applications/samples/frontend/vite.config.ts
new file mode 100644
index 00000000..71663236
--- /dev/null
+++ b/applications/samples/frontend/vite.config.ts
@@ -0,0 +1,32 @@
+import { defineConfig, loadEnv } from 'vite'
+import react from '@vitejs/plugin-react'
+
+
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => {
+  // Load env file based on `mode` in the current working directory.
+  // Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
+  const env = loadEnv(mode, process.cwd(), '')
+
+  const theDomain = env && env.DOMAIN ? env.DOMAIN : 'localhost:5000';
+  
+  console.log('Dev server address: ', theDomain);
+
+  const proxyTarget = theDomain;
+  const replaceHost = (uri: string, appName: string) => (uri.includes("samples") && uri.replace("samples", appName + '.' + theDomain)) || uri;
+
+
+  return {
+  plugins: [react()],
+  server: {
+    port: 9000,
+    proxy: {
+      '/api/': {
+        target: replaceHost( proxyTarget, 'samples'),
+        secure: false,
+        changeOrigin: true,
+      }
+  }
+}}}
+)
diff --git a/applications/samples/frontend/webpack.config.dev.js b/applications/samples/frontend/webpack.config.dev.js
deleted file mode 100644
index a36b5bd5..00000000
--- a/applications/samples/frontend/webpack.config.dev.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const { merge } = require('webpack-merge');
-const common = require('./webpack.config.js');
-
-var path = require('path');
-
-const PORT = 9000;
-
-
-module.exports = env => {
-
-  const theDomain = env && env.DOMAIN ? env.DOMAIN : 'localhost:5000';
-  
-  console.log('Dev server address: ', theDomain);
-
-  const proxyTarget = theDomain;
-  const replaceHost = (uri, appName) => (uri.includes("samples") && uri.replace("samples", appName + '.' + theDomain)) || uri;
-  if (!env.port) {
-    env.devPort = PORT;
-  }
-
-
-  const devServer = {
-    static: [{
-      directory: path.resolve(__dirname, 'dist'),
-      publicPath: '/',
-    }],
-    compress: true,
-    https: env.DOMAIN.includes("https"),
-    port: Number(env.devPort),
-    historyApiFallback: true,
-    proxy: {
-      '/api/': {
-        target: replaceHost( proxyTarget, 'samples'),
-        secure: false,
-        changeOrigin: true,
-      }
-    },
-  };
-
-  return merge(
-    common(env),
-    {
-      mode: 'development',
-      devtool: 'source-map',
-      devServer,
-    } 
-  )
-};
diff --git a/applications/samples/frontend/webpack.config.js b/applications/samples/frontend/webpack.config.js
deleted file mode 100644
index 69f80cb9..00000000
--- a/applications/samples/frontend/webpack.config.js
+++ /dev/null
@@ -1,124 +0,0 @@
-const path = require("path");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const CompressionPlugin = require("compression-webpack-plugin");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-
-const copyPaths = [
-  { from: path.resolve(__dirname, "src/assets"), to: "assets" },
-];
-
-module.exports = function webpacking(envVariables) {
-  let env = envVariables;
-  if (!env) {
-    env = {};
-  }
-  if (!env.mode) {
-    env.mode = "production";
-  }
-
-  console.log("####################");
-  console.log("####################");
-  console.log("BUILD bundle with parameters:");
-  console.log(env);
-  console.log("####################");
-  console.log("####################");
-
-  const { mode } = env;
-  const devtool = "source-map";
-
-  const output = {
-    path: path.resolve(__dirname, "dist"),
-    filename: "js/[name].[contenthash].js",
-    publicPath: "/"
-  };
-
-  const module = {
-    rules: [
-      {
-        test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
-        loader: "babel-loader",
-      },
-      {
-        test: /\.ts(x?)$/,
-        include: path.resolve(__dirname, 'src'),
-        use: [
-          {
-            loader: "ts-loader",
-            options: {
-              transpileOnly: true,
-            },
-          }
-        ]
-      },
-      {
-        test: /\.(css)$/,
-        use: [
-          {
-            loader: "style-loader",
-          },
-          {
-            loader: "css-loader",
-          },
-        ],
-      },
-      {
-        test: /\.less$/,
-        use: [
-          {
-            loader: "style-loader",
-          },
-          {
-            loader: "css-loader",
-          },
-          {
-            loader: "less-loader",
-            options: {
-              lessOptions: {
-                strictMath: true,
-              },
-            },
-          },
-        ],
-      },
-      {
-        test: /\.(png|jpg|gif|eot|woff|woff2|svg|ttf)$/,
-        use: [
-          "file-loader",
-          {
-            loader: "image-webpack-loader",
-            options: {
-              bypassOnDebug: true, // webpack@1.x
-              disable: true, // webpack@2.x and newer
-            },
-          },
-        ],
-      },
-    ],
-  };
-
-  const resolve = {
-    extensions: ["*", ".js", ".json", ".ts", ".tsx", ".jsx"],
-    symlinks: false,
-  };
-
-  const plugins = [
-    new CleanWebpackPlugin(),
-    new CopyWebpackPlugin({ patterns: copyPaths }),
-    new CompressionPlugin(),
-    new HtmlWebpackPlugin({
-      template: "src/index.ejs",
-      favicon: path.join(__dirname, "src/assets/icon.png"),
-    }),
-  ];
-
-  return {
-    mode,
-    devtool,
-    output,
-    module,
-    resolve,
-    plugins,
-  };
-};
diff --git a/applications/samples/frontend/yarn.lock b/applications/samples/frontend/yarn.lock
index 44bbec56..eae974cc 100644
--- a/applications/samples/frontend/yarn.lock
+++ b/applications/samples/frontend/yarn.lock
@@ -3,7394 +3,1710 @@
 
 
 "@ampproject/remapping@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
-  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+"@babel/compat-data@^7.24.8":
+  version "7.24.9"
+  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz"
+  integrity sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==
 
-"@babel/core@^7.8.3":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f"
-  integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==
+"@babel/core@^7.24.5":
+  version "7.24.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.9.tgz#dc07c9d307162c97fa9484ea997ade65841c7c82"
+  integrity sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.7"
-    "@babel/parser" "^7.23.6"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.7"
-    "@babel/types" "^7.23.6"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.9"
+    "@babel/helper-compilation-targets" "^7.24.8"
+    "@babel/helper-module-transforms" "^7.24.9"
+    "@babel/helpers" "^7.24.8"
+    "@babel/parser" "^7.24.8"
+    "@babel/template" "^7.24.7"
+    "@babel/traverse" "^7.24.8"
+    "@babel/types" "^7.24.9"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+"@babel/generator@^7.24.8", "@babel/generator@^7.24.9":
+  version "7.24.10"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz"
+  integrity sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==
   dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
-  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+"@babel/helper-compilation-targets@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz"
+  integrity sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==
   dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
+    "@babel/compat-data" "^7.24.8"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.15":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz#b2e6826e0e20d337143655198b79d58fdc9bd43d"
-  integrity sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==
+"@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    semver "^6.3.1"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
-  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
+"@babel/helper-function-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-define-polyfill-provider@^0.4.4":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088"
-  integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
-"@babel/helper-define-polyfill-provider@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b"
-  integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==
+"@babel/helper-hoist-variables@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz"
+  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+"@babel/helper-module-transforms@^7.24.9":
+  version "7.24.9"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz"
+  integrity sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
 
-"@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
-  dependencies:
-    "@babel/types" "^7.22.15"
+"@babel/helper-plugin-utils@^7.24.7":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-split-export-declaration@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
-  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
 
-"@babel/helper-remap-async-to-generator@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
-  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
-
-"@babel/helper-replace-supers@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
-  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
-  dependencies:
-    "@babel/types" "^7.22.5"
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
-  dependencies:
-    "@babel/types" "^7.22.5"
+"@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
-
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
-
-"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
-
-"@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+"@babel/helpers@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz"
+  integrity sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==
   dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
-
-"@babel/helpers@^7.23.7":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.8.tgz#fc6b2d65b16847fd50adddbd4232c76378959e34"
-  integrity sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.7"
-    "@babel/types" "^7.23.6"
-
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.8"
+
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.6", "@babel/parser@^7.7.0":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
-  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.24.7", "@babel/parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz"
+  integrity sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==
+
+"@babel/plugin-transform-react-jsx-self@^7.24.5":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz#66bff0248ea0b549972e733516ffad577477bdab"
+  integrity sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
+"@babel/plugin-transform-react-jsx-source@^7.24.1":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz#1198aab2548ad19582013815c938d3ebd8291ee3"
+  integrity sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
+"@babel/template@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz"
+  integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz"
+  integrity sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.8"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-hoist-variables" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/parser" "^7.24.8"
+    "@babel/types" "^7.24.8"
+    debug "^4.3.1"
+    globals "^11.1.0"
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
-  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.24.9":
+  version "7.24.9"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz"
+  integrity sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
-  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.23.3"
-
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b"
-  integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    eslint-visitor-keys "^3.3.0"
 
-"@babel/plugin-proposal-class-properties@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
-  version "7.21.0-placeholder-for-preset-env.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
-  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
+  integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
 
-"@babel/plugin-syntax-class-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
 
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
 
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@babel/plugin-syntax-import-assertions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
-  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@babel/plugin-syntax-import-attributes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
-  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/plugin-syntax-import-meta@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@babel/plugin-syntax-jsx@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
-  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+"@rollup/rollup-android-arm-eabi@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.0.tgz#3d9fd50164b94964f5de68c3c4ce61933b3a338d"
+  integrity sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==
+
+"@rollup/rollup-android-arm64@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.0.tgz#e1a6d4bca2eb08c84fd996a4bf896ce4b6f4014c"
+  integrity sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==
+
+"@rollup/rollup-darwin-arm64@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.0.tgz#0a3fffea69489a24a96079af414b0be78df8abbc"
+  integrity sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==
+
+"@rollup/rollup-darwin-x64@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.0.tgz#13fbdb15f58f090871b0ffff047ece06ad6ad74c"
+  integrity sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.0.tgz#e9d9219ddf6f6e946e2ee322198af12466d2c868"
+  integrity sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==
+
+"@rollup/rollup-linux-arm-musleabihf@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.0.tgz#4ba804a00b5e793196a622f6977e05f23e01f59a"
+  integrity sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==
+
+"@rollup/rollup-linux-arm64-gnu@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.0.tgz#d871e3f41de759a6db27fc99235b782ba47c15cc"
+  integrity sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==
+
+"@rollup/rollup-linux-arm64-musl@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.0.tgz#6e63f7ad4cc51bd2c693a2826fd279de9eaa05b5"
+  integrity sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.0.tgz#1540b284d91c440bc9fa7a1714cfb71a5597e94d"
+  integrity sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==
+
+"@rollup/rollup-linux-riscv64-gnu@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.0.tgz#70ae58103b5bc7ba2e2235738b51d97022c8ef92"
+  integrity sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==
+
+"@rollup/rollup-linux-s390x-gnu@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.0.tgz#579ca5f271421a961d3c73d221202c79e02ff03a"
+  integrity sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==
+
+"@rollup/rollup-linux-x64-gnu@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.0.tgz#f0282d761b8b4e7b92b236813475248e37231849"
+  integrity sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==
+
+"@rollup/rollup-linux-x64-musl@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.0.tgz#65da807ac66c505ad14b76f1e5976006cb67dd5f"
+  integrity sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==
+
+"@rollup/rollup-win32-arm64-msvc@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.0.tgz#1eed24b91f421c2eea8bb7ca8889ba0c867e1780"
+  integrity sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==
+
+"@rollup/rollup-win32-ia32-msvc@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.0.tgz#1ed93c9cdc84e185359797a686f4d1576afcea58"
+  integrity sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==
+
+"@rollup/rollup-win32-x64-msvc@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.0.tgz#baf9b65023ea2ecc5e6ec68f787a0fecfd8ee84c"
+  integrity sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==
+
+"@types/babel__core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
+  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7"
+  integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==
+  dependencies:
+    "@babel/types" "^7.20.7"
+
+"@types/estree@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+"@types/prop-types@*":
+  version "15.7.12"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
+  integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
+
+"@types/react-dom@^18.3.0":
+  version "18.3.0"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
+  integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@^18.3.3":
+  version "18.3.3"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
+  integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
+"@typescript-eslint/eslint-plugin@^7.15.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz#c8ed1af1ad2928ede5cdd207f7e3090499e1f77b"
+  integrity sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.17.0"
+    "@typescript-eslint/type-utils" "7.17.0"
+    "@typescript-eslint/utils" "7.17.0"
+    "@typescript-eslint/visitor-keys" "7.17.0"
+    graphemer "^1.4.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@^7.15.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.17.0.tgz#be8e32c159190cd40a305a2121220eadea5a88e7"
+  integrity sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.17.0"
+    "@typescript-eslint/types" "7.17.0"
+    "@typescript-eslint/typescript-estree" "7.17.0"
+    "@typescript-eslint/visitor-keys" "7.17.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz#e072d0f914662a7bfd6c058165e3c2b35ea26b9d"
+  integrity sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==
+  dependencies:
+    "@typescript-eslint/types" "7.17.0"
+    "@typescript-eslint/visitor-keys" "7.17.0"
+
+"@typescript-eslint/type-utils@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz#c5da78feb134c9c9978cbe89e2b1a589ed22091a"
+  integrity sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "7.17.0"
+    "@typescript-eslint/utils" "7.17.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/types@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.17.0.tgz#7ce8185bdf06bc3494e73d143dbf3293111b9cff"
+  integrity sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==
+
+"@typescript-eslint/typescript-estree@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz#dcab3fea4c07482329dd6107d3c6480e228e4130"
+  integrity sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==
+  dependencies:
+    "@typescript-eslint/types" "7.17.0"
+    "@typescript-eslint/visitor-keys" "7.17.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.17.0.tgz#815cd85b9001845d41b699b0ce4f92d6dfb84902"
+  integrity sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "7.17.0"
+    "@typescript-eslint/types" "7.17.0"
+    "@typescript-eslint/typescript-estree" "7.17.0"
+
+"@typescript-eslint/visitor-keys@7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz#680465c734be30969e564b4647f38d6cdf49bfb0"
+  integrity sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==
+  dependencies:
+    "@typescript-eslint/types" "7.17.0"
+    eslint-visitor-keys "^3.4.3"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+"@vitejs/plugin-react@^4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz#d0be6594051ded8957df555ff07a991fb618b48e"
+  integrity sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/core" "^7.24.5"
+    "@babel/plugin-transform-react-jsx-self" "^7.24.5"
+    "@babel/plugin-transform-react-jsx-source" "^7.24.1"
+    "@types/babel__core" "^7.20.5"
+    react-refresh "^0.14.2"
 
-"@babel/plugin-syntax-top-level-await@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
-  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+acorn@^8.9.0:
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
-"@babel/plugin-transform-arrow-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
-  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
+ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.7":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd"
-  integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-transform-async-to-generator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
-  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-
-"@babel/plugin-transform-block-scoped-functions@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
-  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-"@babel/plugin-transform-block-scoping@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
-  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    color-convert "^1.9.0"
 
-"@babel/plugin-transform-class-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
-  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    color-convert "^2.0.1"
 
-"@babel/plugin-transform-class-static-block@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
-  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-transform-classes@^7.23.8":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
-  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    globals "^11.1.0"
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-"@babel/plugin-transform-computed-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
-  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.15"
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-"@babel/plugin-transform-destructuring@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
-  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-"@babel/plugin-transform-dotall-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
-  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
+axios@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
-"@babel/plugin-transform-duplicate-keys@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
-  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-"@babel/plugin-transform-dynamic-import@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
-  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
 
-"@babel/plugin-transform-exponentiation-operator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
-  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    balanced-match "^1.0.0"
 
-"@babel/plugin-transform-export-namespace-from@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
-  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    fill-range "^7.1.1"
 
-"@babel/plugin-transform-for-of@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
-  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
+browserslist@^4.23.1:
+  version "4.23.2"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz"
+  integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    caniuse-lite "^1.0.30001640"
+    electron-to-chromium "^1.4.820"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.1.0"
 
-"@babel/plugin-transform-function-name@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
-  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-json-strings@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
-  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-"@babel/plugin-transform-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
-  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+caniuse-lite@^1.0.30001640:
+  version "1.0.30001643"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz"
+  integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
 
-"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
-  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
 
-"@babel/plugin-transform-member-expression-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
-  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
-"@babel/plugin-transform-modules-amd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
-  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    color-name "1.1.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
-  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
-
-"@babel/plugin-transform-modules-systemjs@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz#fa7e62248931cb15b9404f8052581c302dd9de81"
-  integrity sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-
-"@babel/plugin-transform-modules-umd@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
-  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    color-name "~1.1.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
-  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-"@babel/plugin-transform-new-target@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
-  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
-  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    delayed-stream "~1.0.0"
 
-"@babel/plugin-transform-numeric-separator@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
-  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-"@babel/plugin-transform-object-rest-spread@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
-  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
-  dependencies:
-    "@babel/compat-data" "^7.23.3"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.23.3"
-
-"@babel/plugin-transform-object-super@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
-  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.20"
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-"@babel/plugin-transform-optional-catch-binding@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
-  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
-"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
-  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-transform-parameters@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
-  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+csstype@^3.0.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-"@babel/plugin-transform-private-methods@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
-  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
+debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    ms "2.1.2"
 
-"@babel/plugin-transform-private-property-in-object@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
-  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-transform-property-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
-  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-"@babel/plugin-transform-react-display-name@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz#70529f034dd1e561045ad3c8152a267f0d7b6200"
-  integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-"@babel/plugin-transform-react-jsx-development@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
-  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.22.5"
+    path-type "^4.0.0"
 
-"@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312"
-  integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-jsx" "^7.23.3"
-    "@babel/types" "^7.23.4"
-
-"@babel/plugin-transform-react-pure-annotations@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz#fabedbdb8ee40edf5da96f3ecfc6958e3783b93c"
-  integrity sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    esutils "^2.0.2"
 
-"@babel/plugin-transform-regenerator@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
-  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    regenerator-transform "^0.15.2"
+electron-to-chromium@^1.4.820:
+  version "1.5.2"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz"
+  integrity sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==
 
-"@babel/plugin-transform-reserved-words@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
-  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+esbuild@^0.21.3:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
+
+escalade@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
-"@babel/plugin-transform-shorthand-properties@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
-  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-"@babel/plugin-transform-spread@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
-  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-"@babel/plugin-transform-sticky-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
-  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+eslint-plugin-react-hooks@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
+  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
-"@babel/plugin-transform-template-literals@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
-  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+eslint-plugin-react-refresh@^0.4.7:
+  version "0.4.9"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.9.tgz#bf870372b353b12e1e6fb7fc41b282d9cbc8d93d"
+  integrity sha512-QK49YrBAo5CLNLseZ7sZgvgTy21E6NEw22eZqc4teZfH8pxV3yXc9XXOYfUI6JNpw7mfHNkAeWtBxrTyykB6HA==
 
-"@babel/plugin-transform-typeof-symbol@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
-  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
-"@babel/plugin-transform-unicode-escapes@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
-  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint@^8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
 
-"@babel/plugin-transform-unicode-property-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
-  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
-"@babel/plugin-transform-unicode-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
-  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
+esquery@^1.4.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    estraverse "^5.1.0"
 
-"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
-  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    estraverse "^5.2.0"
 
-"@babel/preset-env@^7.8.3":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.8.tgz#7d6f8171ea7c221ecd28059e65ad37c20e441e3e"
-  integrity sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==
-  dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7"
-    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.23.3"
-    "@babel/plugin-syntax-import-attributes" "^7.23.3"
-    "@babel/plugin-syntax-import-meta" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.23.3"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.7"
-    "@babel/plugin-transform-async-to-generator" "^7.23.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
-    "@babel/plugin-transform-block-scoping" "^7.23.4"
-    "@babel/plugin-transform-class-properties" "^7.23.3"
-    "@babel/plugin-transform-class-static-block" "^7.23.4"
-    "@babel/plugin-transform-classes" "^7.23.8"
-    "@babel/plugin-transform-computed-properties" "^7.23.3"
-    "@babel/plugin-transform-destructuring" "^7.23.3"
-    "@babel/plugin-transform-dotall-regex" "^7.23.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
-    "@babel/plugin-transform-dynamic-import" "^7.23.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
-    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
-    "@babel/plugin-transform-for-of" "^7.23.6"
-    "@babel/plugin-transform-function-name" "^7.23.3"
-    "@babel/plugin-transform-json-strings" "^7.23.4"
-    "@babel/plugin-transform-literals" "^7.23.3"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
-    "@babel/plugin-transform-modules-amd" "^7.23.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.3"
-    "@babel/plugin-transform-modules-umd" "^7.23.3"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
-    "@babel/plugin-transform-new-target" "^7.23.3"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
-    "@babel/plugin-transform-numeric-separator" "^7.23.4"
-    "@babel/plugin-transform-object-rest-spread" "^7.23.4"
-    "@babel/plugin-transform-object-super" "^7.23.3"
-    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
-    "@babel/plugin-transform-optional-chaining" "^7.23.4"
-    "@babel/plugin-transform-parameters" "^7.23.3"
-    "@babel/plugin-transform-private-methods" "^7.23.3"
-    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
-    "@babel/plugin-transform-property-literals" "^7.23.3"
-    "@babel/plugin-transform-regenerator" "^7.23.3"
-    "@babel/plugin-transform-reserved-words" "^7.23.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
-    "@babel/plugin-transform-spread" "^7.23.3"
-    "@babel/plugin-transform-sticky-regex" "^7.23.3"
-    "@babel/plugin-transform-template-literals" "^7.23.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
-    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
-    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
-    "@babel/plugin-transform-unicode-regex" "^7.23.3"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
-    "@babel/preset-modules" "0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2 "^0.4.7"
-    babel-plugin-polyfill-corejs3 "^0.8.7"
-    babel-plugin-polyfill-regenerator "^0.5.4"
-    core-js-compat "^3.31.0"
-    semver "^6.3.1"
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-"@babel/preset-modules@0.1.6-no-external-plugins":
-  version "0.1.6-no-external-plugins"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
-  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-"@babel/preset-react@^7.8.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.23.3.tgz#f73ca07e7590f977db07eb54dbe46538cc015709"
-  integrity sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-transform-react-display-name" "^7.23.3"
-    "@babel/plugin-transform-react-jsx" "^7.22.15"
-    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
-    "@babel/plugin-transform-react-pure-annotations" "^7.23.3"
-
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.8.4":
-  version "7.23.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
-  integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
-  dependencies:
-    regenerator-runtime "^0.14.0"
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
-
-"@babel/traverse@^7.23.7", "@babel/traverse@^7.7.0":
-  version "7.23.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305"
-  integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==
+fast-glob@^3.2.9:
+  version "3.3.2"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.6"
-    "@babel/types" "^7.23.6"
-    debug "^4.3.1"
-    globals "^11.1.0"
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
-  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
-
-"@discoveryjs/json-ext@^0.5.0":
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
-  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
-
-"@gar/promisify@^1.0.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
-  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.1"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
-
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
-  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz#5dc1df7b3dc4a6209e503a924e1ca56097a2bb15"
-  integrity sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
-  integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@sindresorhus/is@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
-
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
-"@types/body-parser@*":
-  version "1.19.5"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
-  integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
-"@types/bonjour@^3.5.9":
-  version "3.5.13"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
-  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/connect-history-api-fallback@^1.3.5":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
-  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
-  dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/node" "*"
-
-"@types/connect@*":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858"
-  integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==
-  dependencies:
-    "@types/node" "*"
-
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.56.2"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.2.tgz#1c72a9b794aa26a8b94ad26d5b9aa51c8a6384bb"
-  integrity sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
-  version "4.17.41"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz#5077defa630c2e8d28aa9ffc2c01c157c305bef6"
-  integrity sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-    "@types/send" "*"
-
-"@types/express@*", "@types/express@^4.17.13":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.33"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
-"@types/glob@^7.1.1":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/html-minifier-terser@^6.0.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
-  integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
-
-"@types/http-errors@*":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f"
-  integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
-
-"@types/http-proxy@^1.17.8":
-  version "1.17.14"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.14.tgz#57f8ccaa1c1c3780644f8a94f9c6b5000b5e2eec"
-  integrity sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==
-  dependencies:
-    "@types/node" "*"
-
-"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
-"@types/mime@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45"
-  integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==
-
-"@types/mime@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
-  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
-
-"@types/minimatch@*":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
-"@types/node-forge@^1.3.0":
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
-  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/node@*":
-  version "20.11.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.5.tgz#be10c622ca7fcaa3cf226cf80166abc31389d86e"
-  integrity sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/qs@*":
-  version "6.9.11"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda"
-  integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==
-
-"@types/range-parser@*":
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
-  integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
-
-"@types/retry@0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
-
-"@types/send@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
-  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
-"@types/serve-index@^1.9.1":
-  version "1.9.4"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
-  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
-  dependencies:
-    "@types/express" "*"
-
-"@types/serve-static@*", "@types/serve-static@^1.13.10":
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033"
-  integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==
-  dependencies:
-    "@types/http-errors" "*"
-    "@types/mime" "*"
-    "@types/node" "*"
-
-"@types/sockjs@^0.3.33":
-  version "0.3.36"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
-  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
-  dependencies:
-    "@types/node" "*"
-
-"@types/source-list-map@*":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.6.tgz#164e169dd061795b50b83c19e4d3be09f8d3a454"
-  integrity sha512-5JcVt1u5HDmlXkwOD2nslZVllBBc7HDuOICfiZah2Z0is8M8g+ddAEawbmd3VjedfDHBzxCaXLs07QEmb7y54g==
-
-"@types/tapable@^1":
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.12.tgz#bc2cab12e87978eee89fb21576b670350d6d86ab"
-  integrity sha512-bTHG8fcxEqv1M9+TD14P8ok8hjxoOCkfKc8XXLaaD05kI7ohpeI956jtDOD3XHKBQrlyPughUtzm1jtVhHpA5Q==
-
-"@types/uglify-js@*":
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.4.tgz#3c70021f08023e5a760ce133d22966f200e1d31c"
-  integrity sha512-Hm/T0kV3ywpJyMGNbsItdivRhYNCQQf1IIsYsXnoVPES4t+FMLyDe0/K+Ea7ahWtMtSNb22ZdY7MIyoD9rqARg==
-  dependencies:
-    source-map "^0.6.1"
-
-"@types/webpack-sources@*":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.3.tgz#b667bd13e9fa15a9c26603dce502c7985418c3d8"
-  integrity sha512-4nZOdMwSPHZ4pTEZzSp0AsTM4K7Qmu40UKW4tJDiOVs20UzYF9l+qUe4s0ftfN0pin06n+5cWWDJXH+sbhAiDw==
-  dependencies:
-    "@types/node" "*"
-    "@types/source-list-map" "*"
-    source-map "^0.7.3"
-
-"@types/webpack@^4.4.31":
-  version "4.41.38"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.38.tgz#5a40ac81bdd052bf405e8bdcf3e1236f6db6dc26"
-  integrity sha512-oOW7E931XJU1mVfCnxCVgv8GLFL768pDO5u2Gzk82i8yTIgX6i7cntyZOkZYb/JtYM8252SN9bQp9tgkVDSsRw==
-  dependencies:
-    "@types/node" "*"
-    "@types/tapable" "^1"
-    "@types/uglify-js" "*"
-    "@types/webpack-sources" "*"
-    anymatch "^3.0.0"
-    source-map "^0.6.0"
-
-"@types/ws@^8.5.5":
-  version "8.5.10"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
-  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
-  dependencies:
-    "@types/node" "*"
-
-"@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
-  integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.34.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
-"@typescript-eslint/typescript-estree@2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
-  integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
-  dependencies:
-    debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
-
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
-
-"@webassemblyjs/helper-buffer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
-
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
-
-"@webassemblyjs/helper-wasm-section@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
-
-"@webassemblyjs/wasm-edit@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-opt" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-    "@webassemblyjs/wast-printer" "1.11.6"
-
-"@webassemblyjs/wasm-gen@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wasm-opt@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wast-printer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webpack-cli/configtest@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
-  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
-
-"@webpack-cli/info@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
-  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
-  dependencies:
-    envinfo "^7.7.3"
-
-"@webpack-cli/serve@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
-  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
-  dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
-
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
-acorn-jsx@^5.0.0:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^6.0.7:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
-
-acorn@^8.7.1, acorn@^8.8.2:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv-formats@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
-  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv-keywords@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
-  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
-ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^8.0.0, ajv@^8.9.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ansi-escapes@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
-ansi-html-community@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
-  integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
-
-ansi-regex@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
-  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
-
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-anymatch@^3.0.0, anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-arch@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
-  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
-
-archive-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70"
-  integrity sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==
-  dependencies:
-    file-type "^4.2.0"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-array-buffer-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
-  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
-  dependencies:
-    call-bind "^1.0.2"
-    is-array-buffer "^3.0.1"
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
-array-includes@^3.1.6:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
-  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
-    is-string "^1.0.7"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
-
-array.prototype.flat@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
-  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.flatmap@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
-  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-
-array.prototype.tosorted@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz#620eff7442503d66c799d95503f82b475745cefd"
-  integrity sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.2.1"
-
-arraybuffer.prototype.slice@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
-  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
-    is-array-buffer "^3.0.2"
-    is-shared-array-buffer "^1.0.2"
-
-ast-types@0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
-  integrity sha512-qEdtR2UH78yyHX/AUNfXmJTlM48XoFZKBdwi1nzkI1mJL21cmbu0cvjxjpkXJ5NENMq42H+hNs8VLJcqXLerBQ==
-
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-asynciterator.prototype@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62"
-  integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==
-  dependencies:
-    has-symbols "^1.0.3"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
-
-axios@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
-  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
-  dependencies:
-    follow-redirects "^1.15.0"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
-babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
-babel-helper-evaluate-path@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz#a62fa9c4e64ff7ea5cea9353174ef023a900a67c"
-  integrity sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==
-
-babel-helper-flip-expressions@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
-  integrity sha512-rSrkRW4YQ2ETCWww9gbsWk4N0x1BOtln349Tk0dlCS90oT68WMLyGR7WvaMp3eAnsVrCqdUtC19lo1avyGPejA==
-
-babel-helper-is-nodes-equiv@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-  integrity sha512-ri/nsMFVRqXn7IyT5qW4/hIAGQxuYUFHa3qsxmPtbk6spZQcYlyDogfVpNm2XYOslH/ULS4VEJGUqQX5u7ACQw==
-
-babel-helper-is-void-0@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
-  integrity sha512-07rBV0xPRM3TM5NVJEOQEkECX3qnHDjaIbFvWYPv+T1ajpUiVLiqTfC+MmiZxY5KOL/Ec08vJdJD9kZiP9UkUg==
-
-babel-helper-mark-eval-scopes@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
-  integrity sha512-+d/mXPP33bhgHkdVOiPkmYoeXJ+rXRWi7OdhwpyseIqOS8CmzHQXHUp/+/Qr8baXsT0kjGpMHHofHs6C3cskdA==
-
-babel-helper-remove-or-void@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
-  integrity sha512-eYNceYtcGKpifHDir62gHJadVXdg9fAhuZEXiRQnJJ4Yi4oUTpqpNY//1pM4nVyjjDMPYaC2xSf0I+9IqVzwdA==
-
-babel-helper-to-multiple-sequence-expressions@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
-  integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
-
-babel-loader@^8.0.6:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
-  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
-  dependencies:
-    find-cache-dir "^3.3.1"
-    loader-utils "^2.0.0"
-    make-dir "^3.1.0"
-    schema-utils "^2.6.5"
-
-babel-plugin-minify-builtins@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
-  integrity sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==
-
-babel-plugin-minify-constant-folding@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz#f84bc8dbf6a561e5e350ff95ae216b0ad5515b6e"
-  integrity sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-minify-dead-code-elimination@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.2.tgz#f386ceec77a80cc4e76022a04c21b7d68e0aa5eb"
-  integrity sha512-krq9Lwi0QIzyAlcNBXTL4usqUvevB4BzktdEsb8srcXC1AaYqRJiAQw6vdKdJSaXbz6snBvziGr6ch/aoRCfpA==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-mark-eval-scopes "^0.4.3"
-    babel-helper-remove-or-void "^0.4.3"
-    lodash "^4.17.11"
-
-babel-plugin-minify-flip-comparisons@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
-  integrity sha512-8hNwgLVeJzpeLVOVArag2DfTkbKodzOHU7+gAZ8mGBFGPQHK6uXVpg3jh5I/F6gfi5Q5usWU2OKcstn1YbAV7A==
-  dependencies:
-    babel-helper-is-void-0 "^0.4.3"
-
-babel-plugin-minify-guarded-expressions@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz#818960f64cc08aee9d6c75bec6da974c4d621135"
-  integrity sha512-RMv0tM72YuPPfLT9QLr3ix9nwUIq+sHT6z8Iu3sLbqldzC1Dls8DPCywzUIzkTx9Zh1hWX4q/m9BPoPed9GOfA==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-
-babel-plugin-minify-infinity@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
-  integrity sha512-X0ictxCk8y+NvIf+bZ1HJPbVZKMlPku3lgYxPmIp62Dp8wdtbMLSekczty3MzvUOlrk5xzWYpBpQprXUjDRyMA==
-
-babel-plugin-minify-mangle-names@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.1.tgz#3dfba7f4e649ff37a767542ea0d1093bee3bb155"
-  integrity sha512-8KMichAOae2FHlipjNDTo2wz97MdEb2Q0jrn4NIRXzHH7SJ3c5TaNNBkeTHbk9WUsMnqpNUx949ugM9NFWewzw==
-  dependencies:
-    babel-helper-mark-eval-scopes "^0.4.3"
-
-babel-plugin-minify-numeric-literals@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
-  integrity sha512-5D54hvs9YVuCknfWywq0eaYDt7qYxlNwCqW9Ipm/kYeS9gYhJd0Rr/Pm2WhHKJ8DC6aIlDdqSBODSthabLSX3A==
-
-babel-plugin-minify-replace@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
-  integrity sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==
-
-babel-plugin-minify-simplify@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz#f21613c8b95af3450a2ca71502fdbd91793c8d6a"
-  integrity sha512-OSYDSnoCxP2cYDMk9gxNAed6uJDiDz65zgL6h8d3tm8qXIagWGMLWhqysT6DY3Vs7Fgq7YUDcjOomhVUb+xX6A==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-    babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.5.0"
-
-babel-plugin-minify-type-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
-  integrity sha512-4ADB0irJ/6BeXWHubjCJmrPbzhxDgjphBMjIjxCc25n4NGJ00NsYqwYt+F/OvE9RXx8KaSW7cJvp+iZX436tnQ==
-  dependencies:
-    babel-helper-is-void-0 "^0.4.3"
-
-babel-plugin-module-resolver@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
-  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
-  dependencies:
-    find-babel-config "^1.2.0"
-    glob "^7.1.6"
-    pkg-up "^3.1.0"
-    reselect "^4.0.0"
-    resolve "^1.13.1"
-
-babel-plugin-polyfill-corejs2@^0.4.7:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269"
-  integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==
-  dependencies:
-    "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
-    semver "^6.3.1"
-
-babel-plugin-polyfill-corejs3@^0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04"
-  integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.4"
-    core-js-compat "^3.33.1"
-
-babel-plugin-polyfill-regenerator@^0.5.4:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a"
-  integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.5.0"
-
-babel-plugin-transform-inline-consecutive-adds@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
-  integrity sha512-8D104wbzzI5RlxeVPYeQb9QsUyepiH1rAO5hpPpQ6NPRgQLpIVwkS/Nbx944pm4K8Z+rx7CgjPsFACz/VCBN0Q==
-
-babel-plugin-transform-member-expression-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-  integrity sha512-Xq9/Rarpj+bjOZSl1nBbZYETsNEDDJSrb6Plb1sS3/36FukWFLLRysgecva5KZECjUJTrJoQqjJgtWToaflk5Q==
-
-babel-plugin-transform-merge-sibling-variables@^6.9.5:
-  version "6.9.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.5.tgz#0b2faa9e027ef47d4e7502f77cd1a7f3a6dfbc7b"
-  integrity sha512-xj/KrWi6/uP+DrD844h66Qh2cZN++iugEIgH8QcIxhmZZPNP6VpOE9b4gP2FFW39xDAY43kCmYMM6U0QNKN8fw==
-
-babel-plugin-transform-minify-booleans@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-  integrity sha512-9pW9ePng6DZpzGPalcrULuhSCcauGAbn8AeU3bE34HcDkGm8Ldt0ysjGkyb64f0K3T5ilV4mriayOVv5fg0ASA==
-
-babel-plugin-transform-property-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-  integrity sha512-Pf8JHTjTPxecqVyL6KSwD/hxGpoTZjiEgV7nCx0KFQsJYM0nuuoCajbg09KRmZWeZbJ5NGTySABYv8b/hY1eEA==
-  dependencies:
-    esutils "^2.0.2"
-
-babel-plugin-transform-regexp-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
-  integrity sha512-JjymDyEyRNhAoNFp09y/xGwYVYzT2nWTGrBrWaL6eCg2m+B24qH2jR0AA8V8GzKJTgC8NW6joJmc6nabvWBD/g==
-
-babel-plugin-transform-remove-console@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-  integrity sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==
-
-babel-plugin-transform-remove-debugger@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-  integrity sha512-Kd+eTBYlXfwoFzisburVwrngsrz4xh9I0ppoJnU/qlLysxVBRgI4Pj+dk3X8F5tDiehp3hhP8oarRMT9v2Z3lw==
-
-babel-plugin-transform-remove-undefined@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz#80208b31225766c630c97fa2d288952056ea22dd"
-  integrity sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-transform-simplify-comparison-operators@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-  integrity sha512-GLInxhGAQWJ9YIdjwF6dAFlmh4U+kN8pL6Big7nkDzHoZcaDQOtBm28atEhQJq6m9GpAovbiGEShKqXv4BSp0A==
-
-babel-plugin-transform-undefined-to-void@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-  integrity sha512-D2UbwxawEY1xVc9svYAUZQM2xarwSNXue2qDIx6CeV2EuMGaes/0su78zlIDIAgE7BvnMw4UpmSo9fDy+znghg==
-
-babel-preset-minify@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.2.tgz#4d5be8b1c21d126ac403a3fd002d8b5fb7bb3c34"
-  integrity sha512-v4GL+kk0TfovbRIKZnC3HPbu2cAGmPAby7BsOmuPdMJfHV+4FVdsGXTH/OOGQRKYdjemBuL1+MsE6mobobhe9w==
-  dependencies:
-    babel-plugin-minify-builtins "^0.5.0"
-    babel-plugin-minify-constant-folding "^0.5.0"
-    babel-plugin-minify-dead-code-elimination "^0.5.2"
-    babel-plugin-minify-flip-comparisons "^0.4.3"
-    babel-plugin-minify-guarded-expressions "^0.4.4"
-    babel-plugin-minify-infinity "^0.4.3"
-    babel-plugin-minify-mangle-names "^0.5.1"
-    babel-plugin-minify-numeric-literals "^0.4.3"
-    babel-plugin-minify-replace "^0.5.0"
-    babel-plugin-minify-simplify "^0.5.1"
-    babel-plugin-minify-type-constructors "^0.4.3"
-    babel-plugin-transform-inline-consecutive-adds "^0.4.3"
-    babel-plugin-transform-member-expression-literals "^6.9.4"
-    babel-plugin-transform-merge-sibling-variables "^6.9.5"
-    babel-plugin-transform-minify-booleans "^6.9.4"
-    babel-plugin-transform-property-literals "^6.9.4"
-    babel-plugin-transform-regexp-constructors "^0.4.3"
-    babel-plugin-transform-remove-console "^6.9.4"
-    babel-plugin-transform-remove-debugger "^6.9.4"
-    babel-plugin-transform-remove-undefined "^0.5.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.9.4"
-    babel-plugin-transform-undefined-to-void "^6.9.4"
-    lodash "^4.17.11"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-bin-build@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-3.0.0.tgz#c5780a25a8a9f966d8244217e6c1f5082a143861"
-  integrity sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==
-  dependencies:
-    decompress "^4.0.0"
-    download "^6.2.2"
-    execa "^0.7.0"
-    p-map-series "^1.0.0"
-    tempfile "^2.0.0"
-
-bin-check@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-4.1.0.tgz#fc495970bdc88bb1d5a35fc17e65c4a149fc4a49"
-  integrity sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==
-  dependencies:
-    execa "^0.7.0"
-    executable "^4.1.0"
-
-bin-version-check@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-4.0.0.tgz#7d819c62496991f80d893e6e02a3032361608f71"
-  integrity sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==
-  dependencies:
-    bin-version "^3.0.0"
-    semver "^5.6.0"
-    semver-truncate "^1.1.2"
-
-bin-version@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-3.1.0.tgz#5b09eb280752b1bd28f0c9db3f96f2f43b6c0839"
-  integrity sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==
-  dependencies:
-    execa "^1.0.0"
-    find-versions "^3.0.0"
-
-bin-wrapper@^4.0.0, bin-wrapper@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-4.1.0.tgz#99348f2cf85031e3ef7efce7e5300aeaae960605"
-  integrity sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==
-  dependencies:
-    bin-check "^4.1.0"
-    bin-version-check "^4.0.0"
-    download "^7.1.0"
-    import-lazy "^3.1.0"
-    os-filter-obj "^2.0.0"
-    pify "^4.0.1"
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bl@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
-  integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==
-  dependencies:
-    readable-stream "^2.3.5"
-    safe-buffer "^5.1.1"
-
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
-  dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.11.0"
-    raw-body "2.5.1"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
-
-bonjour-service@^1.0.11:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
-  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-    multicast-dns "^7.2.5"
-
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-browserslist@^4.14.5, browserslist@^4.22.2:
-  version "4.22.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
-  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
-  dependencies:
-    caniuse-lite "^1.0.30001565"
-    electron-to-chromium "^1.4.601"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-buffer@^5.2.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
-bytes@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-
-cacache@^15.0.5:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-cacheable-request@^2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==
-  dependencies:
-    clone-response "1.0.2"
-    get-stream "3.0.0"
-    http-cache-semantics "3.8.1"
-    keyv "3.0.0"
-    lowercase-keys "1.0.0"
-    normalize-url "2.0.1"
-    responselike "1.0.2"
-
-call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
-  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
-  dependencies:
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.1"
-    set-function-length "^1.1.1"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camel-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
-  dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
-
-caniuse-lite@^1.0.30001565:
-  version "1.0.30001579"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz#45c065216110f46d6274311a4b3fcf6278e0852a"
-  integrity sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==
-
-caw@^2.0.0, caw@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
-  integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==
-  dependencies:
-    get-proxy "^2.0.0"
-    isurl "^1.0.0-alpha5"
-    tunnel-agent "^0.6.0"
-    url-to-options "^1.0.1"
-
-chalk@^2.1.0, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-clean-css@4.2.x:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
-  integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-css@^5.2.2:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
-  integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-clean-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz#a99d8ec34c1c628a4541567aa7b457446460c62b"
-  integrity sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==
-  dependencies:
-    "@types/webpack" "^4.4.31"
-    del "^4.1.1"
-
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
-  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
-clipboard-copy@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/clipboard-copy/-/clipboard-copy-3.2.0.tgz#3c5b8651d3512dcfad295d77a9eb09e7fac8d5fb"
-  integrity sha512-vooFaGFL6ulEP1liiaWFBmmfuPm3cY3y7T9eB83ZTnYc/oFeAKsq3NcDrOkBC8XaauEE8zHQwI7k0+JSYiVQSQ==
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-clone-response@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==
-  dependencies:
-    mimic-response "^1.0.0"
-
-clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^2.0.10, colorette@^2.0.14:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
-  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
-
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commander@^2.20.0, commander@^2.8.1:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^7.0.0, commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression-webpack-plugin@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-7.1.2.tgz#f9a1ba84d4879693e29726f6884b382940876597"
-  integrity sha512-9DKNW6ILLjx+bNBoviHDgLx6swBhWWH9ApClC9sTH2NoFfQM47BapQfovCm9zjD9v1uZwInF5a925FB9ErGQeQ==
-  dependencies:
-    schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
-
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-config-chain@^1.1.11:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
-connect-history-api-fallback@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
-  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
-
-content-disposition@0.5.4, content-disposition@^0.5.2:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
-
-content-type@~1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
-  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
-
-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
-
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
-
-copy-anything@^2.0.1:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
-  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
-  dependencies:
-    is-what "^3.14.1"
-
-copy-webpack-plugin@^6.2.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
-  integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
-  dependencies:
-    cacache "^15.0.5"
-    fast-glob "^3.2.4"
-    find-cache-dir "^3.3.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
-    p-limit "^3.0.2"
-    schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
-    webpack-sources "^1.4.3"
-
-core-js-compat@^3.31.0, core-js-compat@^3.33.1:
-  version "3.35.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.0.tgz#c149a3d1ab51e743bc1da61e39cb51f461a41873"
-  integrity sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==
-  dependencies:
-    browserslist "^4.22.2"
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.0, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-css-loader@^5.2.4:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
-  integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
-  dependencies:
-    icss-utils "^5.1.0"
-    loader-utils "^2.0.0"
-    postcss "^8.2.15"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
-    postcss-modules-scope "^3.0.0"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.1.0"
-    schema-utils "^3.0.0"
-    semver "^7.3.5"
-
-css-select@^4.1.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
-  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.0.1"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
-css-tree@^1.1.2, css-tree@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
-css-what@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
-cwebp-bin@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cwebp-bin/-/cwebp-bin-7.0.1.tgz#cb1303bf43f645ba5b2ece342773c4a93574d4f4"
-  integrity sha512-Ko5ADY74/dbfd8xG0+f+MUP9UKjCe1TG4ehpW0E5y4YlPdwDJlGrSzSR4/Yonxpm9QmZE1RratkIxFlKeyo3FA==
-  dependencies:
-    bin-build "^3.0.0"
-    bin-wrapper "^4.0.1"
-
-debug@2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-decode-uri-component@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
-decompress-response@^3.2.0, decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
-  dependencies:
-    mimic-response "^1.0.0"
-
-decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
-  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
-  dependencies:
-    file-type "^5.2.0"
-    is-stream "^1.1.0"
-    tar-stream "^1.5.2"
-
-decompress-tarbz2@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
-  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
-  dependencies:
-    decompress-tar "^4.1.0"
-    file-type "^6.1.0"
-    is-stream "^1.1.0"
-    seek-bzip "^1.0.5"
-    unbzip2-stream "^1.0.9"
-
-decompress-targz@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
-  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
-  dependencies:
-    decompress-tar "^4.1.1"
-    file-type "^5.2.0"
-    is-stream "^1.1.0"
-
-decompress-unzip@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
-  integrity sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==
-  dependencies:
-    file-type "^3.8.0"
-    get-stream "^2.2.0"
-    pify "^2.3.0"
-    yauzl "^2.4.2"
-
-decompress@^4.0.0, decompress@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
-  integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
-  dependencies:
-    decompress-tar "^4.0.0"
-    decompress-tarbz2 "^4.0.0"
-    decompress-targz "^4.0.0"
-    decompress-unzip "^4.0.1"
-    graceful-fs "^4.1.10"
-    make-dir "^1.0.0"
-    pify "^2.3.0"
-    strip-dirs "^2.0.0"
-
-deep-is@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-default-gateway@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
-  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
-  dependencies:
-    execa "^5.0.0"
-
-define-data-property@^1.0.1, define-data-property@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
-  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
-  dependencies:
-    get-intrinsic "^1.2.1"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.0"
-
-define-lazy-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
-  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
-
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
-  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
-  dependencies:
-    define-data-property "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
-detect-node@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
-  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-dns-packet@^5.2.2:
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f"
-  integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==
-  dependencies:
-    "@leichtgewicht/ip-codec" "^2.0.1"
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dom-converter@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
-  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
-  dependencies:
-    utila "~0.4"
-
-dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
-domutils@^2.5.2, domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-dotenv@^16.0.2:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
-  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
-
-download@^6.2.2:
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714"
-  integrity sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==
-  dependencies:
-    caw "^2.0.0"
-    content-disposition "^0.5.2"
-    decompress "^4.0.0"
-    ext-name "^5.0.0"
-    file-type "5.2.0"
-    filenamify "^2.0.0"
-    get-stream "^3.0.0"
-    got "^7.0.0"
-    make-dir "^1.0.0"
-    p-event "^1.0.0"
-    pify "^3.0.0"
-
-download@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233"
-  integrity sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==
-  dependencies:
-    archive-type "^4.0.0"
-    caw "^2.0.1"
-    content-disposition "^0.5.2"
-    decompress "^4.2.0"
-    ext-name "^5.0.0"
-    file-type "^8.1.0"
-    filenamify "^2.0.0"
-    get-stream "^3.0.0"
-    got "^8.3.1"
-    make-dir "^1.2.0"
-    p-event "^2.1.0"
-    pify "^3.0.0"
-
-duplexer3@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
-  integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-
-electron-to-chromium@^1.4.601:
-  version "1.4.639"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.639.tgz#c6f9cc685f9efb2980d2cfc95a27f8142c9adf28"
-  integrity sha512-CkKf3ZUVZchr+zDpAlNLEEy2NJJ9T64ULWaDgy3THXXlPVPkLu3VOs9Bac44nebVtdwl2geSj6AxTtGDOxoXhg==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
-envinfo@^7.7.3:
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f"
-  integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==
-
-errno@^0.1.1:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-es-abstract@^1.22.1:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
-  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.2"
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.5"
-    es-set-tostringtag "^2.0.1"
-    es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.2"
-    get-symbol-description "^1.0.0"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
-    internal-slot "^1.0.5"
-    is-array-buffer "^3.0.2"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.12"
-    is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.1"
-    safe-array-concat "^1.0.1"
-    safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.8"
-    string.prototype.trimend "^1.0.7"
-    string.prototype.trimstart "^1.0.7"
-    typed-array-buffer "^1.0.0"
-    typed-array-byte-length "^1.0.0"
-    typed-array-byte-offset "^1.0.0"
-    typed-array-length "^1.0.4"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.13"
-
-es-iterator-helpers@^1.0.12:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40"
-  integrity sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==
-  dependencies:
-    asynciterator.prototype "^1.0.0"
-    call-bind "^1.0.2"
-    define-properties "^1.2.1"
-    es-abstract "^1.22.1"
-    es-set-tostringtag "^2.0.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.2.1"
-    globalthis "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.5"
-    iterator.prototype "^1.1.2"
-    safe-array-concat "^1.0.1"
-
-es-module-lexer@^1.2.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
-  integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
-
-es-set-tostringtag@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
-  integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==
-  dependencies:
-    get-intrinsic "^1.2.2"
-    has-tostringtag "^1.0.0"
-    hasown "^2.0.0"
-
-es-shim-unscopables@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
-  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
-  dependencies:
-    hasown "^2.0.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-templates@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4"
-  integrity sha512-sziUVwcvQ+lOsrTyUY0Q11ilAPj+dy7AQ1E1MgSaHTaaAFTffaa08QSlGNU61iyVaroyb6nYdBV6oD7nzn6i8w==
-  dependencies:
-    recast "~0.11.12"
-    through "~2.3.6"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-eslint-plugin-jest@^23.8.2:
-  version "23.20.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz#e1d69c75f639e99d836642453c4e75ed22da4099"
-  integrity sha512-+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "^2.5.0"
-
-eslint-plugin-react-hooks@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-3.0.0.tgz#9e80c71846eb68dd29c3b21d832728aa66e5bd35"
-  integrity sha512-EjxTHxjLKIBWFgDJdhKKzLh5q+vjTFrqNZX36uIxWS4OfyXe5DawqPj3U5qeJ1ngLwatjzQnmR0Lz0J0YH3kxw==
-
-eslint-plugin-react@^7.19.0:
-  version "7.33.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608"
-  integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flatmap "^1.3.1"
-    array.prototype.tosorted "^1.1.1"
-    doctrine "^2.1.0"
-    es-iterator-helpers "^1.0.12"
-    estraverse "^5.3.0"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.1.2"
-    object.entries "^1.1.6"
-    object.fromentries "^2.0.6"
-    object.hasown "^1.1.2"
-    object.values "^1.1.6"
-    prop-types "^15.8.1"
-    resolve "^2.0.0-next.4"
-    semver "^6.3.1"
-    string.prototype.matchall "^4.0.8"
-
-eslint-scope@5.1.1, eslint-scope@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^1.3.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint@5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.11"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
-  dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha512-AWwVMNxwhN8+NIPQzAQZCm7RkLC4RbM3B1OobMuyp3i+w73X57KCKaVIxaRZb+DYCojq7rspo+fmuQfAboyhFg==
-
-esquery@^1.0.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.1.0, esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-events@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-exec-buffer@^3.0.0, exec-buffer@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.2.0.tgz#b1686dbd904c7cf982e652c1f5a79b1e5573082b"
-  integrity sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==
-  dependencies:
-    execa "^0.7.0"
-    p-finally "^1.0.0"
-    pify "^3.0.0"
-    rimraf "^2.5.4"
-    tempfile "^2.0.0"
-
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-executable@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
-  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
-  dependencies:
-    pify "^2.2.0"
-
-express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.1"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.5.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.2.0"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.7"
-    qs "6.11.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-ext-list@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
-  integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==
-  dependencies:
-    mime-db "^1.28.0"
-
-ext-name@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6"
-  integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==
-  dependencies:
-    ext-list "^2.0.0"
-    sort-keys-length "^1.0.0"
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.0.3, fast-glob@^3.2.4, fast-glob@^3.2.9:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fast-xml-parser@^4.1.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.3.tgz#aeaf5778392329f17168c40c51bcbfec8ff965be"
-  integrity sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==
-  dependencies:
-    strnum "^1.0.5"
-
-fastest-levenshtein@^1.0.12:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
-  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
-
-fastparse@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
-  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
-
-fastq@^1.6.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320"
-  integrity sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==
-  dependencies:
-    reusify "^1.0.4"
-
-faye-websocket@^0.11.3:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
-  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
-  dependencies:
-    pend "~1.2.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
-file-loader@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz#cb56c070efc0e40666424309bd0d9e45ac6f2bb8"
-  integrity sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==
-  dependencies:
-    loader-utils "^1.4.0"
-    schema-utils "^2.5.0"
-
-file-type@5.2.0, file-type@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
-  integrity sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==
-
-file-type@^10.4.0, file-type@^10.5.0:
-  version "10.11.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
-  integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
-
-file-type@^12.0.0:
-  version "12.4.2"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9"
-  integrity sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==
-
-file-type@^3.8.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-  integrity sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==
-
-file-type@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5"
-  integrity sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==
-
-file-type@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
-  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
-
-file-type@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c"
-  integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==
-
-filename-reserved-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
-  integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==
-
-filenamify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9"
-  integrity sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==
-  dependencies:
-    filename-reserved-regex "^2.0.0"
-    strip-outer "^1.0.0"
-    trim-repeated "^1.0.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
-
-find-babel-config@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
-  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
-  dependencies:
-    json5 "^0.5.1"
-    path-exists "^3.0.0"
-
-find-cache-dir@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-find-versions@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
-  integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
-  dependencies:
-    semver-regex "^2.0.0"
-
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
-flat@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
-  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-follow-redirects@^1.0.0, follow-redirects@^1.15.0:
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
-  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
-
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
-
-from2@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-monkey@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.5.tgz#fe450175f0db0d7ea758102e1d84096acb925788"
-  integrity sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-function-bind@^1.1.1, function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-function.prototype.name@^1.1.5, function.prototype.name@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
-  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    functions-have-names "^1.2.3"
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
-functions-have-names@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
-  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
-  dependencies:
-    function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
-
-get-proxy@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93"
-  integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==
-  dependencies:
-    npm-conf "^1.1.0"
-
-get-stream@3.0.0, get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
-
-get-stream@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  integrity sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==
-  dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-gifsicle@^5.0.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-5.3.0.tgz#499713c6f1e89ebbc3630da3a74fdb4697913b4e"
-  integrity sha512-FJTpgdj1Ow/FITB7SVza5HlzXa+/lqEY0tHQazAJbuAdvyJtkH4wIdsR2K414oaTwRXHFLLF+tYbipj+OpYg+Q==
-  dependencies:
-    bin-build "^3.0.0"
-    bin-wrapper "^4.0.0"
-    execa "^5.0.0"
-
-glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
-glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^11.1.0, globals@^11.7.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
-  dependencies:
-    define-properties "^1.1.3"
-
-globby@^10.0.0:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
-  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.0.3"
-    glob "^7.1.3"
-    ignore "^5.1.1"
-    merge2 "^1.2.3"
-    slash "^3.0.0"
-
-globby@^11.0.1:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
-
-got@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
-  integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==
-  dependencies:
-    decompress-response "^3.2.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-plain-obj "^1.1.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    isurl "^1.0.0-alpha5"
-    lowercase-keys "^1.0.0"
-    p-cancelable "^0.3.0"
-    p-timeout "^1.1.1"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    url-parse-lax "^1.0.0"
-    url-to-options "^1.0.1"
-
-got@^8.3.1:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
-  dependencies:
-    "@sindresorhus/is" "^0.7.0"
-    cacheable-request "^2.1.1"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    into-stream "^3.1.0"
-    is-retry-allowed "^1.1.0"
-    isurl "^1.0.0-alpha5"
-    lowercase-keys "^1.0.0"
-    mimic-response "^1.0.0"
-    p-cancelable "^0.4.0"
-    p-timeout "^2.0.1"
-    pify "^3.0.0"
-    safe-buffer "^5.1.1"
-    timed-out "^4.0.1"
-    url-parse-lax "^3.0.0"
-    url-to-options "^1.0.1"
-
-graceful-fs@^4.1.10, graceful-fs@^4.1.2, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
-
-has-bigints@^1.0.1, has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
-  integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
-  dependencies:
-    get-intrinsic "^1.2.2"
-
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
-
-has-symbol-support-x@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
-
-has-symbols@^1.0.2, has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
-has-to-string-tag-x@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
-  dependencies:
-    has-symbol-support-x "^1.4.1"
-
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
-  dependencies:
-    has-symbols "^1.0.2"
-
-hasown@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
-  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
-  dependencies:
-    function-bind "^1.1.2"
-
-he@1.2.x, he@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-history@^4.9.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
-  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^3.0.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^1.0.1"
-
-hoist-non-react-statics@^3.1.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
-  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
-
-html-loader@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.5.tgz#6356dbeb0c49756d8ebd5ca327f16ff06ab5faea"
-  integrity sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==
-  dependencies:
-    es6-templates "^0.2.3"
-    fastparse "^1.1.1"
-    html-minifier "^3.5.8"
-    loader-utils "^1.1.0"
-    object-assign "^4.1.1"
-
-html-minifier-terser@^6.0.2:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
-  integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==
-  dependencies:
-    camel-case "^4.1.2"
-    clean-css "^5.2.2"
-    commander "^8.3.0"
-    he "^1.2.0"
-    param-case "^3.0.4"
-    relateurl "^0.2.7"
-    terser "^5.10.0"
-
-html-minifier@^3.5.8:
-  version "3.5.21"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
-  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-html-webpack-plugin@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
-  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
-  dependencies:
-    "@types/html-minifier-terser" "^6.0.0"
-    html-minifier-terser "^6.0.2"
-    lodash "^4.17.21"
-    pretty-error "^4.0.0"
-    tapable "^2.0.0"
-
-htmlparser2@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
-  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
-    domutils "^2.5.2"
-    entities "^2.0.0"
-
-http-cache-semantics@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
-
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.5.1:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
-  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
-
-http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
-  dependencies:
-    "@types/http-proxy" "^1.17.8"
-    http-proxy "^1.18.1"
-    is-glob "^4.0.1"
-    is-plain-obj "^3.0.0"
-    micromatch "^4.0.2"
-
-http-proxy@^1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-icss-utils@^5.0.0, icss-utils@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
-
-ieee754@^1.1.13:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.1.1, ignore@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
-  integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
-
-image-webpack-loader@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/image-webpack-loader/-/image-webpack-loader-8.1.0.tgz#cd97172e1e7304ef5eb898344fc25bbb650fc7d7"
-  integrity sha512-bxzMIBNu42KGo6Bc9YMB0QEUt+XuVTl2ZSX3oGAlbsqYOkxkT4TEWvVsnwUkCRCYISJrMCEc/s0y8OYrmEfUOg==
-  dependencies:
-    imagemin "^7.0.1"
-    loader-utils "^2.0.0"
-    object-assign "^4.1.1"
-    schema-utils "^2.7.1"
-  optionalDependencies:
-    imagemin-gifsicle "^7.0.0"
-    imagemin-mozjpeg "^9.0.0"
-    imagemin-optipng "^8.0.0"
-    imagemin-pngquant "^9.0.2"
-    imagemin-svgo "^9.0.0"
-    imagemin-webp "^7.0.0"
-
-imagemin-gifsicle@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz#1a7ab136a144c4678657ba3b6c412f80805d26b0"
-  integrity sha512-LaP38xhxAwS3W8PFh4y5iQ6feoTSF+dTAXFRUEYQWYst6Xd+9L/iPk34QGgK/VO/objmIlmq9TStGfVY2IcHIA==
-  dependencies:
-    execa "^1.0.0"
-    gifsicle "^5.0.0"
-    is-gif "^3.0.0"
-
-imagemin-mozjpeg@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-mozjpeg/-/imagemin-mozjpeg-9.0.0.tgz#d1af26d0b43d75a41c211051c1910da59d9d2324"
-  integrity sha512-TwOjTzYqCFRgROTWpVSt5UTT0JeCuzF1jswPLKALDd89+PmrJ2PdMMYeDLYZ1fs9cTovI9GJd68mRSnuVt691w==
-  dependencies:
-    execa "^4.0.0"
-    is-jpg "^2.0.0"
-    mozjpeg "^7.0.0"
-
-imagemin-optipng@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-8.0.0.tgz#b88e5cf6da25cc8479e07cdf38c3ae0479df7ef2"
-  integrity sha512-CUGfhfwqlPjAC0rm8Fy+R2DJDBGjzy2SkfyT09L8rasnF9jSoHFqJ1xxSZWK6HVPZBMhGPMxCTL70OgTHlLF5A==
-  dependencies:
-    exec-buffer "^3.0.0"
-    is-png "^2.0.0"
-    optipng-bin "^7.0.0"
-
-imagemin-pngquant@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/imagemin-pngquant/-/imagemin-pngquant-9.0.2.tgz#38155702b0cc4f60f671ba7c2b086ea3805d9567"
-  integrity sha512-cj//bKo8+Frd/DM8l6Pg9pws1pnDUjgb7ae++sUX1kUVdv2nrngPykhiUOgFeE0LGY/LmUbCf4egCHC4YUcZSg==
-  dependencies:
-    execa "^4.0.0"
-    is-png "^2.0.0"
-    is-stream "^2.0.0"
-    ow "^0.17.0"
-    pngquant-bin "^6.0.0"
-
-imagemin-svgo@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-9.0.0.tgz#749370804608917a67d4ff590f07a87756aec006"
-  integrity sha512-uNgXpKHd99C0WODkrJ8OO/3zW3qjgS4pW7hcuII0RcHN3tnKxDjJWcitdVC/TZyfIqSricU8WfrHn26bdSW62g==
-  dependencies:
-    is-svg "^4.2.1"
-    svgo "^2.1.0"
-
-imagemin-webp@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-webp/-/imagemin-webp-7.0.0.tgz#df000ec927855d74d4cfafec8558ac418c88d2a9"
-  integrity sha512-JoYjvHNgBLgrQAkeCO7T5iNc8XVpiBmMPZmiXMhalC7K6gwY/3DCEUfNxVPOmNJ+NIJlJFvzcMR9RBxIE74Xxw==
-  dependencies:
-    cwebp-bin "^7.0.1"
-    exec-buffer "^3.2.0"
-    is-cwebp-readable "^3.0.0"
-
-imagemin@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-7.0.1.tgz#f6441ca647197632e23db7d971fffbd530c87dbf"
-  integrity sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==
-  dependencies:
-    file-type "^12.0.0"
-    globby "^10.0.0"
-    graceful-fs "^4.2.2"
-    junk "^3.1.0"
-    make-dir "^3.0.0"
-    p-pipe "^3.0.0"
-    replace-ext "^1.0.0"
-
-import-fresh@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-lazy@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc"
-  integrity sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==
-
-import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
-
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-inquirer@^6.2.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
-  dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
-internal-slot@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
-  integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
-  dependencies:
-    get-intrinsic "^1.2.2"
-    hasown "^2.0.0"
-    side-channel "^1.0.4"
-
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
-
-into-stream@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==
-  dependencies:
-    from2 "^2.1.1"
-    p-is-promise "^1.1.0"
-
-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
-ipaddr.js@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
-
-is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
-  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    is-typed-array "^1.1.10"
-
-is-async-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
-  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-bigint@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
-  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
-  dependencies:
-    has-bigints "^1.0.1"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
-  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-core-module@^2.13.0:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
-  dependencies:
-    hasown "^2.0.0"
-
-is-cwebp-readable@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-cwebp-readable/-/is-cwebp-readable-3.0.0.tgz#0554aaa400977a2fc4de366d8c0244f13cde58cb"
-  integrity sha512-bpELc7/Q1/U5MWHn4NdHI44R3jxk0h9ew9ljzabiRl70/UIjL/ZAqRMb52F5+eke/VC8yTiv4Ewryo1fPWidvA==
-  dependencies:
-    file-type "^10.5.0"
-
-is-date-object@^1.0.1, is-date-object@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-docker@^2.0.0, is-docker@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-finalizationregistry@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
-  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
-is-generator-function@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
-  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-gif@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-3.0.0.tgz#c4be60b26a301d695bb833b20d9b5d66c6cf83b1"
-  integrity sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==
-  dependencies:
-    file-type "^10.4.0"
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-jpg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97"
-  integrity sha512-ODlO0ruzhkzD3sdynIainVP5eoOFNN85rxA1+cwwnPe4dKyX0r5+hxNO5XpCrxlHcmb9vkOit9mhRD2JVuimHg==
-
-is-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
-
-is-natural-number@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
-  integrity sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==
-
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
-
-is-number-object@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
-  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
-  integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
-
-is-path-cwd@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
-
-is-plain-obj@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
-  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-png@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d"
-  integrity sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==
-
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
-  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
-is-set@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-stream@^1.0.0, is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
-
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
-is-svg@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.4.0.tgz#34db20a38146be5f2b3060154da33d11e6f74b7c"
-  integrity sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==
-  dependencies:
-    fast-xml-parser "^4.1.3"
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
-  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
-  dependencies:
-    which-typed-array "^1.1.11"
-
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
-
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-weakset@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
-  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
-is-what@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
-
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-
-isurl@^1.0.0-alpha5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
-  dependencies:
-    has-to-string-tag-x "^1.2.0"
-    is-object "^1.0.1"
-
-iterator.prototype@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
-  integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==
-  dependencies:
-    define-properties "^1.2.1"
-    get-intrinsic "^1.2.1"
-    has-symbols "^1.0.3"
-    reflect.getprototypeof "^1.0.4"
-    set-function-name "^2.0.1"
-
-jest-worker@^27.4.5:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
-  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
-
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
-
-json-parse-even-better-errors@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
-
-json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.2, json5@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
-  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    object.assign "^4.1.4"
-    object.values "^1.1.6"
-
-junk@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
-  integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
-
-keyv@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
-  dependencies:
-    json-buffer "3.0.0"
-
-kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-launch-editor@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
-  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
-  dependencies:
-    picocolors "^1.0.0"
-    shell-quote "^1.8.1"
-
-less-loader@^6.1.2:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-6.2.0.tgz#8b26f621c155b342eefc24f5bd6e9dc40c42a719"
-  integrity sha512-Cl5h95/Pz/PWub/tCBgT1oNMFeH1WTD33piG80jn5jr12T4XbxZcjThwNXDQ7AG649WEynuIzO4b0+2Tn9Qolg==
-  dependencies:
-    clone "^2.1.2"
-    less "^3.11.3"
-    loader-utils "^2.0.0"
-    schema-utils "^2.7.0"
-
-less-vars-to-js@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/less-vars-to-js/-/less-vars-to-js-1.3.0.tgz#c322cf43a3c8fc3fab655da3e51a14c1499ab571"
-  integrity sha512-xeiLLn/IMCGtdyCkYQnW8UuzoW2oYMCKg9boZRaGI58fLz5r90bNJDlqGzmVt/1Uqk75/DxIVtQSNCMkE5fRZQ==
-  dependencies:
-    strip-json-comments "^2.0.1"
-
-less@^3.10.3, less@^3.11.3:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
-  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
-  dependencies:
-    copy-anything "^2.0.1"
-    tslib "^1.10.0"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
-    mime "^1.4.1"
-    native-request "^1.0.5"
-    source-map "~0.6.0"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-loader-runner@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
-  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
-
-loader-utils@^1.1.0, loader-utils@^1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==
-
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
-  dependencies:
-    tslib "^2.0.3"
-
-lowercase-keys@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==
-
-lowercase-keys@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-make-dir@^1.0.0, make-dir@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
-make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
-
-memfs@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
-  dependencies:
-    fs-monkey "^1.0.4"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
-micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@1.6.0, mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-mimic-response@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-minimalistic-assert@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mkdirp@^0.5.1:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mozjpeg@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/mozjpeg/-/mozjpeg-7.1.1.tgz#dfb61953536e66fcabd4ae795e7a312d42a51f18"
-  integrity sha512-iIDxWvzhWvLC9mcRJ1uSkiKaj4drF58oCqK2bITm5c2Jt6cJ8qQjSSru2PCaysG+hLIinryj8mgz5ZJzOYTv1A==
-  dependencies:
-    bin-build "^3.0.0"
-    bin-wrapper "^4.0.0"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multicast-dns@^7.2.5:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
-  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
-  dependencies:
-    dns-packet "^5.2.2"
-    thunky "^1.0.2"
-
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==
-
-nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
-
-native-request@^1.0.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.1.0.tgz#acdb30fe2eefa3e1bc8c54b3a6852e9c5c0d3cb0"
-  integrity sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-negotiator@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
-  dependencies:
-    lower-case "^1.1.1"
-
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
-
-node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-url@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
-  dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
-
-npm-conf@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
-  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^3.0.0"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
-  dependencies:
-    path-key "^2.0.0"
-
-npm-run-path@^4.0.0, npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-inspect@^1.13.1, object-inspect@^1.9.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
-
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.4:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
-  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
-  dependencies:
-    call-bind "^1.0.5"
-    define-properties "^1.2.1"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
-object.entries@^1.1.6:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131"
-  integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-object.fromentries@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
-  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-object.hasown@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae"
-  integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==
-  dependencies:
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-object.values@^1.1.6:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
-  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-on-finished@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==
-  dependencies:
-    mimic-fn "^1.0.0"
-
-onetime@^5.1.0, onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-open@^8.0.9:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
-  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
-  dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
-
-optionator@^0.8.2:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-optipng-bin@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-7.0.1.tgz#beb8e55a52f8a26f885ee57ab44fcf62397d6972"
-  integrity sha512-W99mpdW7Nt2PpFiaO+74pkht7KEqkXkeRomdWXfEz3SALZ6hns81y/pm1dsGZ6ItUIfchiNIP6ORDr1zETU1jA==
-  dependencies:
-    bin-build "^3.0.0"
-    bin-wrapper "^4.0.0"
-
-os-filter-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-2.0.0.tgz#1c0b62d5f3a2442749a2d139e6dddee6e81d8d16"
-  integrity sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==
-  dependencies:
-    arch "^2.1.0"
-
-os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
-
-ow@^0.17.0:
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/ow/-/ow-0.17.0.tgz#4f938999fed6264c9048cd6254356e0f1e7f688c"
-  integrity sha512-i3keDzDQP5lWIe4oODyDFey1qVrq2hXKTuTH2VpqwpYtzPiKZt2ziRI4NBQmgW40AnV5Euz17OyWweCb+bNEQA==
-  dependencies:
-    type-fest "^0.11.0"
-
-p-cancelable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
-  integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==
-
-p-cancelable@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
-
-p-event@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-event/-/p-event-1.3.0.tgz#8e6b4f4f65c72bc5b6fe28b75eda874f96a4a085"
-  integrity sha512-hV1zbA7gwqPVFcapfeATaNjQ3J0NuzorHPyG8GPL9g/Y/TplWVBVoCKCXL6Ej2zscrCEv195QNWJXuBH6XZuzA==
-  dependencies:
-    p-timeout "^1.1.1"
-
-p-event@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6"
-  integrity sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==
-  dependencies:
-    p-timeout "^2.0.1"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
-
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==
-
-p-limit@^2.0.0, p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-map-series@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
-  integrity sha512-4k9LlvY6Bo/1FcIdV33wqZQES0Py+iKISU9Uc8p8AjWoZPnFKMpVIVD3s0EYn4jzLh1I+WeUZkJ0Yoa4Qfw3Kg==
-  dependencies:
-    p-reduce "^1.0.0"
-
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-pipe@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
-  integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==
-
-p-reduce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
-  integrity sha512-3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ==
-
-p-retry@^4.5.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
-  dependencies:
-    "@types/retry" "0.12.0"
-    retry "^0.13.1"
-
-p-timeout@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
-  integrity sha512-gb0ryzr+K2qFqFv6qi3khoeqMZF/+ajxQipEF6NteZVnvz9tzdsfAVj3lYtn1gAXvH5lfLwfxEII799gt/mRIA==
-  dependencies:
-    p-finally "^1.0.0"
-
-p-timeout@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
-  dependencies:
-    p-finally "^1.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==
-  dependencies:
-    no-case "^2.2.0"
-
-param-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-
-path-key@^3.0.0, path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
-
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
-
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-  dependencies:
-    find-up "^3.0.0"
-
-pngquant-bin@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/pngquant-bin/-/pngquant-bin-6.0.1.tgz#2b5789ca219eeb4d8509ab1ae082092801b7f07e"
-  integrity sha512-Q3PUyolfktf+hYio6wsg3SanQzEU/v8aICg/WpzxXcuCMRb7H2Q81okfpcEztbMvw25ILjd3a87doj2N9kvbpQ==
-  dependencies:
-    bin-build "^3.0.0"
-    bin-wrapper "^4.0.1"
-    execa "^4.0.0"
-
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
-  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
-  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.15"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535"
-  integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-value-parser@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-postcss@^8.2.15:
-  version "8.4.33"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742"
-  integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
-prepend-http@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==
-
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
-
-pretty-error@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
-  integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==
-  dependencies:
-    lodash "^4.17.20"
-    renderkid "^3.0.0"
-
-private@~0.1.5:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
-prop-types@^15.6.2, prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
-
-proxy-addr@~2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
-  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
-  dependencies:
-    forwarded "0.2.0"
-    ipaddr.js "1.9.1"
-
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-punycode@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
-  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
-
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
-query-string@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-range-parser@^1.2.1, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-raw-loader@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
-  integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
-react-dom@^16.12.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
-  integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.19.1"
-
-react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-router-dom@^5.0.0:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6"
-  integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==
-  dependencies:
-    "@babel/runtime" "^7.12.13"
-    history "^4.9.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.2"
-    react-router "5.3.4"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-react-router@5.3.4, react-router@^5.0.0:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5"
-  integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==
-  dependencies:
-    "@babel/runtime" "^7.12.13"
-    history "^4.9.0"
-    hoist-non-react-statics "^3.1.0"
-    loose-envify "^1.3.1"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-
-react@^16.12.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.3.0, readable-stream@^2.3.5:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-recast@~0.11.12:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  integrity sha512-+nixG+3NugceyR8O1bLU45qs84JgI3+8EauyRZafLgC9XbdAOIVgwV1Pe2da0YzGo62KzWoZwUpVEQf6qNAXWA==
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
-  dependencies:
-    resolve "^1.9.0"
-
-reflect.getprototypeof@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3"
-  integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
-    globalthis "^1.0.3"
-    which-builtin-type "^1.1.3"
-
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
-  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
-regenerator-transform@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
-  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
-regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
-  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    set-function-name "^2.0.0"
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
-  dependencies:
-    "@babel/regjsgen" "^0.8.0"
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+fastq@^1.6.0:
+  version "1.17.1"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
-    jsesc "~0.5.0"
-
-relateurl@0.2.x, relateurl@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
+    reusify "^1.0.4"
 
-renderkid@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a"
-  integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
-    css-select "^4.1.3"
-    dom-converter "^0.2.0"
-    htmlparser2 "^6.1.0"
-    lodash "^4.17.21"
-    strip-ansi "^6.0.1"
-
-replace-ext@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
-  integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+    flat-cache "^3.0.4"
 
-reselect@^4.0.0:
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
-  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
-
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
-    resolve-from "^5.0.0"
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+    to-regex-range "^5.0.1"
 
-resolve-from@^5.0.0:
+find-up@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve-pathname@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
-  integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
-
-resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.9.0:
-  version "1.22.8"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
-  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
-  dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^2.0.0-next.4:
-  version "2.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
-  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-responselike@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
-  dependencies:
-    lowercase-keys "^1.0.0"
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==
+flat-cache@^3.0.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
-retry@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+    flatted "^3.2.9"
+    keyv "^4.5.3"
+    rimraf "^3.0.2"
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
+flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-rimraf@^2.5.4, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
+follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
-    glob "^7.1.3"
-
-run-async@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
 
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-rxjs@^6.4.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
+fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-safe-array-concat@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692"
-  integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==
-  dependencies:
-    call-bind "^1.0.5"
-    get-intrinsic "^1.2.2"
-    has-symbols "^1.0.3"
-    isarray "^2.0.5"
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+glob-parent@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-regex-test@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5"
-  integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
-    call-bind "^1.0.5"
-    get-intrinsic "^1.2.2"
-    is-regex "^1.1.4"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+    is-glob "^4.0.1"
 
-scheduler@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
-  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
+    is-glob "^4.0.3"
 
-schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+glob@^7.1.3:
+  version "7.2.3"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
 
-schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
-  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    ajv "^8.9.0"
-    ajv-formats "^2.1.1"
-    ajv-keywords "^5.1.0"
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-seek-bzip@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
-  integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==
+globals@^13.19.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
-    commander "^2.8.1"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
+    type-fest "^0.20.2"
 
-selfsigned@^2.1.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
-  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
-    "@types/node-forge" "^1.3.0"
-    node-forge "^1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
 
-semver-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
-  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-semver-truncate@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
-  integrity sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==
-  dependencies:
-    semver "^5.3.0"
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
-semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-semver@^6.0.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+ignore@^5.2.0, ignore@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
-    lru-cache "^6.0.0"
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
-serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
-  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
-  dependencies:
-    randombytes "^2.1.0"
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-serialize-javascript@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
-  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
-    randombytes "^2.1.0"
+    once "^1.3.0"
+    wrappy "1"
 
-serve-index@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.18.0"
+inherits@2:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-set-function-length@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1"
-  integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==
-  dependencies:
-    define-data-property "^1.1.1"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.2"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.1"
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-set-function-name@^2.0.0, set-function-name@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
-  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
-    define-data-property "^1.0.1"
-    functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.0"
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+    is-extglob "^2.1.1"
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
-  dependencies:
-    shebang-regex "^1.0.0"
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-shebang-command@^2.0.0:
+isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-shell-quote@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
+    argparse "^2.0.1"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
-sockjs@^0.3.24:
-  version "0.3.24"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
-  integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
-  dependencies:
-    faye-websocket "^0.11.3"
-    uuid "^8.3.2"
-    websocket-driver "^0.7.4"
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-sort-keys-length@^1.0.0:
+json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
-  integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==
-  dependencies:
-    sort-keys "^1.0.0"
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@^0.7.3, source-map@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-source-map@~0.5.0:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
-
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
-  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-"statuses@>= 1.4.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
-
-string-width@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string.prototype.matchall@^4.0.8:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100"
-  integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.5"
-    regexp.prototype.flags "^1.5.0"
-    set-function-name "^2.0.0"
-    side-channel "^1.0.4"
-
-string.prototype.trim@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
-  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-string.prototype.trimend@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
-  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-string.prototype.trimstart@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
-  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
-    safe-buffer "~5.2.0"
+    json-buffer "3.0.1"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
-    safe-buffer "~5.1.0"
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
   dependencies:
-    ansi-regex "^3.0.0"
+    p-locate "^5.0.0"
 
-strip-ansi@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+loose-envify@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
-    ansi-regex "^5.0.1"
+    js-tokens "^3.0.0 || ^4.0.0"
 
-strip-dirs@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
-  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
-    is-natural-number "^4.0.1"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+    yallist "^3.0.2"
 
-strip-json-comments@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-strip-outer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
-  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
+micromatch@^4.0.4:
+  version "4.0.7"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
   dependencies:
-    escape-string-regexp "^1.0.2"
+    braces "^3.0.3"
+    picomatch "^2.3.1"
 
-strnum@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"
-  integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-style-loader@^1.1.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
-  integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^2.7.0"
+    mime-db "1.52.0"
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
-    has-flag "^3.0.0"
+    brace-expansion "^1.1.7"
 
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
-    has-flag "^4.0.0"
+    brace-expansion "^2.0.1"
 
-supports-color@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-svgo@^2.1.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
-  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
-tar-stream@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
-  dependencies:
-    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
-    end-of-stream "^1.0.0"
-    fs-constants "^1.0.0"
-    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
-    xtend "^4.0.0"
-
-tar@^6.0.2:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
-  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-  integrity sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==
+node-releases@^2.0.14:
+  version "2.0.18"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-tempfile@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
-  integrity sha512-ZOn6nJUgvgC09+doCEF3oB+r3ag7kUvlsXEGX069QRD60p+P3uP7XG9N2/at+EyIRGSN//ZY3LyEotA1YpmjuA==
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
-    temp-dir "^1.0.0"
-    uuid "^3.0.1"
+    wrappy "1"
 
-terser-webpack-plugin@^5.3.7:
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
-  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.20"
-    jest-worker "^27.4.5"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.1"
-    terser "^5.26.0"
-
-terser@^5.10.0, terser@^5.26.0:
-  version "5.27.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.27.0.tgz#70108689d9ab25fef61c4e93e808e9fd092bf20c"
-  integrity sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==
+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
 
-through@^2.3.6, through@^2.3.8, through@~2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
 
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
-timed-out@^4.0.0, timed-out@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==
-
-tiny-invariant@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
-  integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
-
-tiny-warning@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
-    os-tmpdir "~1.0.2"
+    callsites "^3.0.0"
 
-to-buffer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-toidentifier@1.0.1:
+picocolors@^1.0.0, picocolors@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
-trim-repeated@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
-  integrity sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==
-  dependencies:
-    escape-string-regexp "^1.0.2"
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-ts-loader@^9.0.0:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89"
-  integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==
+postcss@^8.4.39:
+  version "8.4.40"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
+  integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
   dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-    source-map "^0.7.4"
-
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.0.3:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
-tsutils@^3.17.1:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
+    nanoid "^3.3.7"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
-  dependencies:
-    prelude-ls "~1.1.2"
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+punycode@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-typed-array-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
-  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+react-dom@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
-    is-typed-array "^1.1.10"
+    loose-envify "^1.1.0"
+    scheduler "^0.23.2"
 
-typed-array-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
-  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
-  dependencies:
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    has-proto "^1.0.1"
-    is-typed-array "^1.1.10"
+react-refresh@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"
+  integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==
 
-typed-array-byte-offset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
-  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+react@^18.3.1:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
+  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    has-proto "^1.0.1"
-    is-typed-array "^1.1.10"
+    loose-envify "^1.1.0"
 
-typed-array-length@^1.0.4:
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+reusify@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    is-typed-array "^1.1.9"
-
-typescript@^4.8.3:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+    glob "^7.1.3"
+
+rollup@^4.13.0:
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.19.0.tgz#83b08cc0b2bc38c26c194cb7f2cdabd84a2a8c02"
+  integrity sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==
   dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
+    "@types/estree" "1.0.5"
+  optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.19.0"
+    "@rollup/rollup-android-arm64" "4.19.0"
+    "@rollup/rollup-darwin-arm64" "4.19.0"
+    "@rollup/rollup-darwin-x64" "4.19.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.19.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.19.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.19.0"
+    "@rollup/rollup-linux-arm64-musl" "4.19.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.19.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.19.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.19.0"
+    "@rollup/rollup-linux-x64-gnu" "4.19.0"
+    "@rollup/rollup-linux-x64-musl" "4.19.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.19.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.19.0"
+    "@rollup/rollup-win32-x64-msvc" "4.19.0"
+    fsevents "~2.3.2"
 
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
-    call-bind "^1.0.2"
-    has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
-
-unbzip2-stream@^1.0.9:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
-  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
+    queue-microtask "^1.2.2"
+
+scheduler@^0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
   dependencies:
-    buffer "^5.2.1"
-    through "^2.3.8"
+    loose-envify "^1.1.0"
 
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-unicode-canonical-property-names-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
-  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
+semver@^7.6.0:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-unicode-match-property-ecmascript@^2.0.0:
+shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
-  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^2.0.0"
-    unicode-property-aliases-ecmascript "^2.0.0"
-
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
-
-unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
+    shebang-regex "^3.0.0"
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    ansi-regex "^5.0.1"
 
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==
+strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
-    punycode "^2.1.0"
+    has-flag "^3.0.0"
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
-    prepend-http "^1.0.1"
+    has-flag "^4.0.0"
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
-  dependencies:
-    prepend-http "^2.0.0"
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-url-to-options@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
-use-clipboard-copy@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/use-clipboard-copy/-/use-clipboard-copy-0.1.2.tgz#83b16292dfa8ea262be714252022a8b4ad1c28c5"
-  integrity sha512-EkauxqyX+us4+Mfif/f61ew89EAOWIArqFpHR0jSG4SwwuDZzDAOeqO7gkK0vi+DQVADeB1RB3xqU3U0oOO3NQ==
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
-    clipboard-copy "^3.0.0"
+    is-number "^7.0.0"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-utila@~0.4:
+type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
-
-uuid@^3.0.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-value-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
-  integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
-
-watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
+    prelude-ls "^1.2.1"
 
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-webpack-cli@^4.6.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
-  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
-  dependencies:
-    "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.2.0"
-    "@webpack-cli/info" "^1.5.0"
-    "@webpack-cli/serve" "^1.7.0"
-    colorette "^2.0.14"
-    commander "^7.0.0"
-    cross-spawn "^7.0.3"
-    fastest-levenshtein "^1.0.12"
-    import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
-    webpack-merge "^5.7.3"
-
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
-  dependencies:
-    colorette "^2.0.10"
-    memfs "^3.4.3"
-    mime-types "^2.1.31"
-    range-parser "^1.2.1"
-    schema-utils "^4.0.0"
-
-webpack-dev-server@^4.5.0:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
-  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
-    ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
-    colorette "^2.0.10"
-    compression "^1.7.4"
-    connect-history-api-fallback "^2.0.0"
-    default-gateway "^6.0.3"
-    express "^4.17.3"
-    graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
-    serve-index "^1.9.1"
-    sockjs "^0.3.24"
-    spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
-    ws "^8.13.0"
-
-webpack-merge@^5.7.0, webpack-merge@^5.7.3:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
-  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
-  dependencies:
-    clone-deep "^4.0.1"
-    flat "^5.0.2"
-    wildcard "^2.0.0"
-
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-sources@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-
-webpack@^5.61.0:
-  version "5.89.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
-  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.0"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
-websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+typescript@^5.2.2:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
+  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
 
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
   dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
-which-builtin-type@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b"
-  integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==
-  dependencies:
-    function.prototype.name "^1.1.5"
-    has-tostringtag "^1.0.0"
-    is-async-function "^2.0.0"
-    is-date-object "^1.0.5"
-    is-finalizationregistry "^1.0.2"
-    is-generator-function "^1.0.10"
-    is-regex "^1.1.4"
-    is-weakref "^1.0.2"
-    isarray "^2.0.5"
-    which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
-
-which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
-  dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
-
-which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.9:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
-  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.4"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+    punycode "^2.1.0"
+
+vite@^5.3.4:
+  version "5.3.5"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.5.tgz#b847f846fb2b6cb6f6f4ed50a830186138cb83d8"
+  integrity sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==
   dependencies:
-    isexe "^2.0.0"
+    esbuild "^0.21.3"
+    postcss "^8.4.39"
+    rollup "^4.13.0"
+  optionalDependencies:
+    fsevents "~2.3.3"
 
 which@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-wildcard@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
-  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
-
-word-wrap@~1.2.3:
+word-wrap@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@^8.13.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
-  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
-
-xtend@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
-
 yallist@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yauzl@^2.4.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

From 7195c2ac571b3af1279ee21c7d18d04b7fec656a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 29 Jul 2024 10:11:57 +0200
Subject: [PATCH 093/210] CH-17 update codefresh pipeline

---
 .../codefresh-template-dev.yaml               | 20 ++++++++--------
 .../codefresh-template-prod.yaml              | 19 +++++++--------
 .../codefresh-template-stage.yaml             | 24 +++++++++----------
 .../codefresh-template-test.yaml              |  2 +-
 deployment/codefresh-test.yaml                | 16 +++++++++++--
 5 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/deployment-configuration/codefresh-template-dev.yaml b/deployment-configuration/codefresh-template-dev.yaml
index e11bcf6d..7673ff53 100644
--- a/deployment-configuration/codefresh-template-dev.yaml
+++ b/deployment-configuration/codefresh-template-dev.yaml
@@ -1,4 +1,4 @@
-version: '1.0'
+version: "1.0"
 stages:
   - prepare
   - build
@@ -11,8 +11,8 @@ steps:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
-    revision: '${{CF_BRANCH}}'
+    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
+    revision: "${{CF_BRANCH}}"
     git: github
   post_main_clone:
     title: Post main clone
@@ -22,13 +22,13 @@ steps:
       - title: Cloning cloud-harness repository...
         type: git-clone
         stage: prepare
-        repo: 'https://github.com/MetaCell/cloud-harness.git'
-        revision: '${{CLOUDHARNESS_BRANCH}}'
+        repo: "https://github.com/MetaCell/cloud-harness.git"
+        revision: "${{CLOUDHARNESS_BRANCH}}"
         working_directory: .
         git: github
   prepare_deployment:
     title: "Prepare helm chart"
-    image: python:3.9.10
+    image: python:3.12
     stage: prepare
     working_directory: .
     commands:
@@ -38,13 +38,13 @@ steps:
       - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:
     commands:
-      - 'helm template ./deployment/helm --debug -n ${{NAMESPACE}}'
+      - "helm template ./deployment/helm --debug -n ${{NAMESPACE}}"
     environment:
       - ACTION=auth
       - KUBE_CONTEXT=${{NAMESPACE}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
-    title: 'View helm chart'
+    title: "View helm chart"
   build_base_images:
     title: Build base images
     type: parallel
@@ -77,7 +77,7 @@ steps:
       chart_version: ${{CF_BUILD_ID}}
       cmd_ps: --wait --timeout 600s --create-namespace
       custom_value_files:
-      - ./deployment/helm/values.yaml
+        - ./deployment/helm/values.yaml
   build_test_images:
     title: Build test images
     type: parallel
@@ -141,4 +141,4 @@ steps:
     when:
       condition:
         all:
-          whenVarExists: 'includes("${{DEPLOYMENT_PUBLISH_TAG}}", "{{DEPLOYMENT_PUBLISH_TAG}}") == false'
\ No newline at end of file
+          whenVarExists: 'includes("${{DEPLOYMENT_PUBLISH_TAG}}", "{{DEPLOYMENT_PUBLISH_TAG}}") == false'
diff --git a/deployment-configuration/codefresh-template-prod.yaml b/deployment-configuration/codefresh-template-prod.yaml
index ce5ed02c..ab54a186 100644
--- a/deployment-configuration/codefresh-template-prod.yaml
+++ b/deployment-configuration/codefresh-template-prod.yaml
@@ -1,4 +1,4 @@
-version: '1.0'
+version: "1.0"
 stages:
   - prepare
   - deploy
@@ -7,8 +7,8 @@ steps:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
-    revision: '${{CF_BRANCH}}'
+    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
+    revision: "${{CF_BRANCH}}"
     git: github
   post_main_clone:
     title: Post main clone
@@ -18,13 +18,13 @@ steps:
       - title: Cloning cloud-harness repository...
         type: git-clone
         stage: prepare
-        repo: 'https://github.com/MetaCell/cloud-harness.git'
-        revision: '${{CLOUDHARNESS_BRANCH}}'
+        repo: "https://github.com/MetaCell/cloud-harness.git"
+        revision: "${{CLOUDHARNESS_BRANCH}}"
         working_directory: .
         git: github
   prepare_deployment:
     title: "Prepare helm chart"
-    image: python:3.9.10
+    image: python:3.12
     stage: prepare
     working_directory: .
     commands:
@@ -32,13 +32,13 @@ steps:
       - harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} -e $ENV $PARAMS
   prepare_deployment_view:
     commands:
-      - 'helm template ./deployment/helm --debug -n ${{NAMESPACE}}'
+      - "helm template ./deployment/helm --debug -n ${{NAMESPACE}}"
     environment:
       - ACTION=auth
       - KUBE_CONTEXT=${{NAMESPACE}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
-    title: 'View helm chart'
+    title: "View helm chart"
   deployment:
     stage: deploy
     type: helm
@@ -53,5 +53,4 @@ steps:
       chart_version: ${{DEPLOYMENT_TAG}}
       cmd_ps: --wait --timeout 600s --create-namespace
       custom_value_files:
-      - ./deployment/helm/values.yaml
-
+        - ./deployment/helm/values.yaml
diff --git a/deployment-configuration/codefresh-template-stage.yaml b/deployment-configuration/codefresh-template-stage.yaml
index 7a1ff574..894d130c 100644
--- a/deployment-configuration/codefresh-template-stage.yaml
+++ b/deployment-configuration/codefresh-template-stage.yaml
@@ -1,4 +1,4 @@
-version: '1.0'
+version: "1.0"
 stages:
   - prepare
   - build
@@ -10,8 +10,8 @@ steps:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
-    revision: '${{CF_BRANCH}}'
+    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
+    revision: "${{CF_BRANCH}}"
     git: github
   post_main_clone:
     title: Post main clone
@@ -21,27 +21,27 @@ steps:
       - title: Cloning cloud-harness repository...
         type: git-clone
         stage: prepare
-        repo: 'https://github.com/MetaCell/cloud-harness.git'
-        revision: '${{CLOUDHARNESS_BRANCH}}'
+        repo: "https://github.com/MetaCell/cloud-harness.git"
+        revision: "${{CLOUDHARNESS_BRANCH}}"
         working_directory: .
         git: github
   prepare_deployment:
     title: "Prepare helm chart"
-    image: python:3.9.10
+    image: python:3.12
     stage: prepare
     working_directory: .
     commands:
       - bash cloud-harness/install.sh
-      - harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} -e $ENV $PARAMS  
+      - harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} -e $ENV $PARAMS
   prepare_deployment_view:
     commands:
-      - 'helm template ./deployment/helm --debug -n ${{NAMESPACE}}'
+      - "helm template ./deployment/helm --debug -n ${{NAMESPACE}}"
     environment:
       - ACTION=auth
       - KUBE_CONTEXT=${{NAMESPACE}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
-    title: 'View helm chart'
+    title: "View helm chart"
   deployment:
     stage: deploy
     type: helm
@@ -56,7 +56,7 @@ steps:
       chart_version: ${{DEPLOYMENT_TAG}}
       cmd_ps: --wait --timeout 600s --create-namespace
       custom_value_files:
-      - ./deployment/helm/values.yaml
+        - ./deployment/helm/values.yaml
   build_test_images:
     title: Build test images
     type: parallel
@@ -118,8 +118,7 @@ steps:
   publish:
     type: parallel
     stage: publish
-    steps:
-      REPLACE_ME
+    steps: REPLACE_ME
     when:
       condition:
         all:
@@ -140,4 +139,3 @@ steps:
         all:
           whenVarExists: 'includes("${{DEPLOYMENT_PUBLISH_TAG}}", "{{DEPLOYMENT_PUBLISH_TAG}}") == false'
           whenVarExists2: 'includes("${{REPO_TOKEN}}", "{{REPO_TOKEN}}") == false'
-
diff --git a/deployment-configuration/codefresh-template-test.yaml b/deployment-configuration/codefresh-template-test.yaml
index bfaee7ad..9139211e 100644
--- a/deployment-configuration/codefresh-template-test.yaml
+++ b/deployment-configuration/codefresh-template-test.yaml
@@ -27,7 +27,7 @@ steps:
         git: github
   prepare_deployment:
     title: "Prepare helm chart"
-    image: python:3.9.10
+    image: python:3.12
     stage: prepare
     working_directory: .
     commands:
diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index 672a2b26..410925a5 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -13,13 +13,25 @@ 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:
+    - 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.9.10
+    image: python:3.12
     stage: prepare
     working_directory: .
     commands:
-    - bash install.sh
+    - bash cloud-harness/install.sh
     - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
       -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
     - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export

From 8b5faa42dbff67be9d2a8a38056ef8a619d1510a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 29 Jul 2024 10:17:40 +0200
Subject: [PATCH 094/210] Fix test pipeline

---
 deployment/codefresh-test.yaml | 414 +++++++++++++++++----------------
 1 file changed, 217 insertions(+), 197 deletions(-)

diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index 410925a5..935d508e 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -1,47 +1,35 @@
-version: '1.0'
+version: "1.0"
 stages:
-- prepare
-- build
-- unittest
-- deploy
-- qa
+  - prepare
+  - build
+  - unittest
+  - deploy
+  - qa
 steps:
   main_clone:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
-    revision: '${{CF_BRANCH}}'
+    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
+    revision: "${{CF_BRANCH}}"
     git: github
-  post_main_clone:
-    title: Post main clone
-    type: parallel
-    stage: prepare
-    steps:
-    - 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
-    - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
-      -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
-    - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
-    - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
+      - bash install.sh
+      - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
+        -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
+      - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
+      - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:
     commands:
-    - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
+      - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
     environment:
-    - ACTION=auth
-    - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
+      - ACTION=auth
+      - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
     title: View helm chart
@@ -54,43 +42,47 @@ steps:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-base/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-base
         title: Cloudharness base
         working_directory: ./.
-        tag: '${{CLOUDHARNESS_BASE_TAG}}'
+        tag: "${{CLOUDHARNESS_BASE_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
                 == false
       cloudharness-frontend-build:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-frontend-build/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-frontend-build
         title: Cloudharness frontend build
         working_directory: ./.
-        tag: '${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}'
+        tag: "${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}') == false
   build_static_images:
     title: Build static images
@@ -101,23 +93,25 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/cloudharness-flask
         title: Cloudharness flask
         working_directory: ./infrastructure/common-images/cloudharness-flask
-        tag: '${{CLOUDHARNESS_FLASK_TAG}}'
+        tag: "${{CLOUDHARNESS_FLASK_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
                 == false
   build_application_images:
     type: parallel
@@ -127,241 +121,263 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/nfsserver
         title: Nfsserver
         working_directory: ./applications/nfsserver
-        tag: '${{NFSSERVER_TAG}}'
+        tag: "${{NFSSERVER_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{NFSSERVER_TAG_EXISTS}}', '{{NFSSERVER_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{NFSSERVER_TAG_EXISTS}}', '{{NFSSERVER_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{NFSSERVER_TAG_FORCE_BUILD}}', '{{NFSSERVER_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{NFSSERVER_TAG_FORCE_BUILD}}', '{{NFSSERVER_TAG_FORCE_BUILD}}')
                 == false
       accounts:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/accounts
         title: Accounts
         working_directory: ./applications/accounts
-        tag: '${{ACCOUNTS_TAG}}'
+        tag: "${{ACCOUNTS_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
                 == false
       samples:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
+          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/samples
         title: Samples
         working_directory: ./applications/samples
-        tag: '${{SAMPLES_TAG}}'
+        tag: "${{SAMPLES_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
                 == false
       samples-print-file:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-print-file
         title: Samples print file
         working_directory: ./applications/samples/tasks/print-file
-        tag: '${{SAMPLES_PRINT_FILE_TAG}}'
+        tag: "${{SAMPLES_PRINT_FILE_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
                 == false
       samples-secret:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-secret
         title: Samples secret
         working_directory: ./applications/samples/tasks/secret
-        tag: '${{SAMPLES_SECRET_TAG}}'
+        tag: "${{SAMPLES_SECRET_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
                 == false
       samples-sum:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-sum
         title: Samples sum
         working_directory: ./applications/samples/tasks/sum
-        tag: '${{SAMPLES_SUM_TAG}}'
+        tag: "${{SAMPLES_SUM_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
                 == false
       common:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/common
         title: Common
         working_directory: ./applications/common/server
-        tag: '${{COMMON_TAG}}'
+        tag: "${{COMMON_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
                 == false
       workflows-send-result-event:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-send-result-event
         title: Workflows send result event
         working_directory: ./applications/workflows/tasks/send-result-event
-        tag: '${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}'
+        tag: "${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}') == false
       workflows-extract-download:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/workflows-extract-download
         title: Workflows extract download
         working_directory: ./applications/workflows/tasks/extract-download
-        tag: '${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}'
+        tag: "${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}') == false
       workflows-notify-queue:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-notify-queue
         title: Workflows notify queue
         working_directory: ./applications/workflows/tasks/notify-queue
-        tag: '${{WORKFLOWS_NOTIFY_QUEUE_TAG}}'
+        tag: "${{WORKFLOWS_NOTIFY_QUEUE_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}') == false
       workflows:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/workflows
         title: Workflows
         working_directory: ./applications/workflows/server
-        tag: '${{WORKFLOWS_TAG}}'
+        tag: "${{WORKFLOWS_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
                 == false
   tests_unit:
     stage: unittest
@@ -370,8 +386,8 @@ steps:
       samples_ut:
         title: Unit tests for samples
         commands:
-        - pytest /usr/src/app/samples/test
-        image: '${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}'
+          - pytest /usr/src/app/samples/test
+        image: "${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}"
   deployment:
     stage: deploy
     type: helm
@@ -381,14 +397,14 @@ steps:
       helm_version: 3.6.2
       chart_name: deployment/helm
       release_name: test-${{NAMESPACE_BASENAME}}
-      kube_context: '${{CLUSTER_NAME}}'
+      kube_context: "${{CLUSTER_NAME}}"
       namespace: test-${{NAMESPACE_BASENAME}}
-      chart_version: '${{CF_SHORT_REVISION}}'
+      chart_version: "${{CF_SHORT_REVISION}}"
       cmd_ps: --timeout 600s --create-namespace
       custom_value_files:
-      - ./deployment/helm/values.yaml
+        - ./deployment/helm/values.yaml
       custom_values:
-      - apps_samples_harness_secrets_asecret=${{ASECRET}}
+        - apps_samples_harness_secrets_asecret=${{ASECRET}}
   build_test_images:
     title: Build test images
     type: parallel
@@ -398,130 +414,134 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/test-e2e
         title: Test e2e
         working_directory: ./test/test-e2e
-        tag: '${{TEST_E2E_TAG}}'
+        tag: "${{TEST_E2E_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
                 == false
       test-api:
         type: build
         stage: build
         dockerfile: test/test-api/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/test-api
         title: Test api
         working_directory: ./.
-        tag: '${{TEST_API_TAG}}'
+        tag: "${{TEST_API_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
                 == false
   wait_deployment:
     stage: qa
     title: Wait deployment to be ready
     image: codefresh/kubectl
     commands:
-    - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
-    - kubectl rollout status deployment/accounts
-    - kubectl rollout status deployment/samples
-    - kubectl rollout status deployment/common
-    - kubectl rollout status deployment/workflows
-    - sleep 60
+      - kubectl config use-context ${{CLUSTER_NAME}}
+      - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
+      - kubectl rollout status deployment/accounts
+      - kubectl rollout status deployment/samples
+      - kubectl rollout status deployment/common
+      - kubectl rollout status deployment/workflows
+      - sleep 60
   tests_api:
     stage: qa
     title: Api tests
     working_directory: /home/test
-    image: '${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}'
+    image: "${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}"
     fail_fast: false
     commands:
-    - echo $APP_NAME
+      - echo $APP_NAME
     scale:
       samples_api_test:
         title: samples api test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/samples:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
+          - "${{CF_REPO_NAME}}/applications/samples:/home/test"
+          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
         environment:
-        - APP_URL=https://samples.${{DOMAIN}}/api
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
+          - APP_URL=https://samples.${{DOMAIN}}/api
+          - USERNAME=sample@testuser.com
+          - PASSWORD=test
         commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
-          --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
-          --show-errors-tracebacks
-        - pytest -v test/api
+          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+            https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
+            --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
+            --show-errors-tracebacks
+          - pytest -v test/api
       common_api_test:
         title: common api test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/common:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
+          - "${{CF_REPO_NAME}}/applications/common:/home/test"
+          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
         environment:
-        - APP_URL=https://common.${{DOMAIN}}/api
+          - APP_URL=https://common.${{DOMAIN}}/api
         commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://common.${{DOMAIN}}/api -c all
+          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+            https://common.${{DOMAIN}}/api -c all
       workflows_api_test:
         title: workflows api test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/workflows:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
+          - "${{CF_REPO_NAME}}/applications/workflows:/home/test"
+          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
         environment:
-        - APP_URL=https://workflows.${{DOMAIN}}/api
+          - APP_URL=https://workflows.${{DOMAIN}}/api
         commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://workflows.${{DOMAIN}}/api -c all
+          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+            https://workflows.${{DOMAIN}}/api -c all
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-          - cf_export  FAILED=failed
+            - cf_export  FAILED=failed
   tests_e2e:
     stage: qa
     title: End to end tests
     working_directory: /home/test
-    image: '${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}'
+    image: "${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}"
     fail_fast: false
     commands:
-    - yarn test
+      - yarn test
     scale:
       samples_e2e_test:
         title: samples e2e test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples'
+          - "${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples"
         environment:
-        - APP_URL=https://samples.${{DOMAIN}}
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
+          - APP_URL=https://samples.${{DOMAIN}}
+          - USERNAME=sample@testuser.com
+          - PASSWORD=test
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-          - cf_export  FAILED=failed
+            - cf_export  FAILED=failed
   approval:
     type: pending-approval
     stage: qa
@@ -529,7 +549,7 @@ steps:
     description: The pipeline will fail after ${{WAIT_ON_FAIL}} minutes
     timeout:
       timeUnit: minutes
-      duration: '${{WAIT_ON_FAIL}}'
+      duration: "${{WAIT_ON_FAIL}}"
       finalState: denied
     when:
       condition:
@@ -541,5 +561,5 @@ steps:
     image: codefresh/kubectl
     stage: qa
     commands:
-    - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl delete ns test-${{NAMESPACE_BASENAME}}
+      - kubectl config use-context ${{CLUSTER_NAME}}
+      - kubectl delete ns test-${{NAMESPACE_BASENAME}}

From 8f76ae2187840f126a195d1495f12c1d9f41d3b7 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 29 Jul 2024 11:29:50 +0200
Subject: [PATCH 095/210] Fix build issue

---
 applications/samples/frontend/package.json |  1 +
 applications/samples/frontend/yarn.lock    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/applications/samples/frontend/package.json b/applications/samples/frontend/package.json
index 9ccdc4a6..aa383ae3 100644
--- a/applications/samples/frontend/package.json
+++ b/applications/samples/frontend/package.json
@@ -18,6 +18,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
+    "@types/node": "^22.0.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.15.0",
diff --git a/applications/samples/frontend/yarn.lock b/applications/samples/frontend/yarn.lock
index eae974cc..3b6f86c4 100644
--- a/applications/samples/frontend/yarn.lock
+++ b/applications/samples/frontend/yarn.lock
@@ -549,6 +549,13 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
+"@types/node@^22.0.0":
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30"
+  integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==
+  dependencies:
+    undici-types "~6.11.1"
+
 "@types/prop-types@*":
   version "15.7.12"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
@@ -1658,6 +1665,11 @@ typescript@^5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
   integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
 
+undici-types@~6.11.1:
+  version "6.11.1"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197"
+  integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==
+
 update-browserslist-db@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz"

From f58f7eddfc370a246f984568a76b0c77d9df45b9 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 29 Jul 2024 15:49:47 +0100
Subject: [PATCH 096/210] CH-91 Updated the harness model to add an envmap
 deprecating the env property

---
 .gitignore                                    |   3 +-
 docs/model/ApiTestsConfig.md                  |  46 -----
 docs/model/ApplicationAccountsConfig.md       |  44 -----
 docs/model/ApplicationConfig.md               |  17 --
 docs/model/ApplicationDependenciesConfig.md   |  72 --------
 docs/model/ApplicationHarnessConfig.md        |  93 ----------
 docs/model/ApplicationProbe.md                |  20 ---
 docs/model/ApplicationTestConfig.md           |  17 --
 docs/model/ApplicationUser.md                 |  44 -----
 docs/model/ApplicationsConfigsMap.md          |  14 --
 docs/model/AutoArtifactSpec.md                |  16 --
 docs/model/BackupConfig.md                    |  23 ---
 docs/model/CDCEvent.md                        |  21 ---
 docs/model/CDCEventMeta.md                    |  33 ----
 docs/model/CpuMemoryConfig.md                 |  16 --
 docs/model/DatabaseDeploymentConfig.md        |  37 ----
 docs/model/DeploymentAutoArtifactConfig.md    |  33 ----
 docs/model/DeploymentResourcesConf.md         |  16 --
 docs/model/DeploymentVolumeSpec.md            |  33 ----
 docs/model/E2ETestsConfig.md                  |  18 --
 docs/model/FileResourcesConfig.md             |  17 --
 docs/model/Filename.md                        |   9 -
 docs/model/FreeObject.md                      |  14 --
 docs/model/GitDependencyConfig.md             |  19 --
 docs/model/HarnessMainConfig.md               |  42 -----
 docs/model/IngressConfig.md                   |  43 -----
 docs/model/JupyterHubConfig.md                |  32 ----
 docs/model/NameValue.md                       |  16 --
 docs/model/PathSpecifier.md                   |   9 -
 docs/model/Quota.md                           |  14 --
 docs/model/RegistryConfig.md                  |  16 --
 docs/model/ServiceAutoArtifactConfig.md       |  29 ----
 docs/model/SimpleMap.md                       |  14 --
 docs/model/URL.md                             |   9 -
 docs/model/UnitTestsConfig.md                 |  30 ----
 docs/model/UriRoleMappingConfig.md            |  32 ----
 docs/model/User.md                            | 129 --------------
 docs/model/UserCredential.md                  |  23 ---
 docs/model/UserGroup.md                       |  82 ---------
 docs/model/UserRole.md                        |  33 ----
 libraries/models/api/openapi.yaml             |  92 +++++-----
 .../cloudharness_model/models/__init__.py     |   8 -
 .../models/api_tests_config.py                |  21 +--
 .../models/application_accounts_config.py     |  13 +-
 .../models/application_config.py              |   9 +-
 .../models/application_dependencies_config.py |  21 +--
 .../models/application_harness_config.py      |  89 +++++-----
 .../models/application_probe.py               |  21 +--
 .../models/application_test_config.py         |  17 +-
 .../models/application_user.py                |  21 +--
 .../models/auto_artifact_spec.py              |  13 +-
 .../models/backup_config.py                   |  41 ++---
 .../cloudharness_model/models/base_model.py   |  68 ++++++++
 .../cloudharness_model/models/cdc_event.py    |  25 ++-
 .../models/cdc_event_meta.py                  |  33 ++--
 .../models/cpu_memory_config.py               |  13 +-
 .../models/database_deployment_config.py      | 163 +++++++++---------
 .../models/deployment_auto_artifact_config.py | 147 ++++++++--------
 .../models/deployment_resources_conf.py       |  13 +-
 .../models/deployment_volume_spec.py          | 139 ++++++++-------
 .../models/e2_e_tests_config.py               |  21 +--
 .../models/file_resources_config.py           |  17 +-
 .../models/git_dependency_config.py           |  17 +-
 .../models/harness_main_config.py             |  99 +++++++----
 .../models/ingress_config.py                  | 127 +++++++-------
 .../ingress_config_all_of_letsencrypt.py      |   9 +-
 .../models/jupyter_hub_config.py              |  21 +--
 .../cloudharness_model/models/name_value.py   |  13 +-
 .../models/registry_config.py                 |  13 +-
 .../models/service_auto_artifact_config.py    |  75 ++++----
 .../models/unit_tests_config.py               |  13 +-
 .../models/uri_role_mapping_config.py         |  13 +-
 .../models/cloudharness_model/models/user.py  |  81 +++++----
 .../models/user_credential.py                 |  41 ++---
 .../cloudharness_model/models/user_group.py   |  37 ++--
 .../cloudharness_model/models/user_role.py    |  33 ++--
 .../models/cloudharness_model/typing_utils.py |   2 -
 libraries/models/tox.ini                      |   2 +-
 78 files changed, 798 insertions(+), 2031 deletions(-)
 delete mode 100644 docs/model/ApiTestsConfig.md
 delete mode 100644 docs/model/ApplicationAccountsConfig.md
 delete mode 100644 docs/model/ApplicationConfig.md
 delete mode 100644 docs/model/ApplicationDependenciesConfig.md
 delete mode 100644 docs/model/ApplicationHarnessConfig.md
 delete mode 100644 docs/model/ApplicationProbe.md
 delete mode 100644 docs/model/ApplicationTestConfig.md
 delete mode 100644 docs/model/ApplicationUser.md
 delete mode 100644 docs/model/ApplicationsConfigsMap.md
 delete mode 100644 docs/model/AutoArtifactSpec.md
 delete mode 100644 docs/model/BackupConfig.md
 delete mode 100644 docs/model/CDCEvent.md
 delete mode 100644 docs/model/CDCEventMeta.md
 delete mode 100644 docs/model/CpuMemoryConfig.md
 delete mode 100644 docs/model/DatabaseDeploymentConfig.md
 delete mode 100644 docs/model/DeploymentAutoArtifactConfig.md
 delete mode 100644 docs/model/DeploymentResourcesConf.md
 delete mode 100644 docs/model/DeploymentVolumeSpec.md
 delete mode 100644 docs/model/E2ETestsConfig.md
 delete mode 100644 docs/model/FileResourcesConfig.md
 delete mode 100644 docs/model/Filename.md
 delete mode 100644 docs/model/FreeObject.md
 delete mode 100644 docs/model/GitDependencyConfig.md
 delete mode 100644 docs/model/HarnessMainConfig.md
 delete mode 100644 docs/model/IngressConfig.md
 delete mode 100644 docs/model/JupyterHubConfig.md
 delete mode 100644 docs/model/NameValue.md
 delete mode 100644 docs/model/PathSpecifier.md
 delete mode 100644 docs/model/Quota.md
 delete mode 100644 docs/model/RegistryConfig.md
 delete mode 100644 docs/model/ServiceAutoArtifactConfig.md
 delete mode 100644 docs/model/SimpleMap.md
 delete mode 100644 docs/model/URL.md
 delete mode 100644 docs/model/UnitTestsConfig.md
 delete mode 100644 docs/model/UriRoleMappingConfig.md
 delete mode 100644 docs/model/User.md
 delete mode 100644 docs/model/UserCredential.md
 delete mode 100644 docs/model/UserGroup.md
 delete mode 100644 docs/model/UserRole.md
 create mode 100644 libraries/models/cloudharness_model/models/base_model.py

diff --git a/.gitignore b/.gitignore
index 90f643c0..774c7315 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ skaffold.yaml
 /deployment.yaml
 .hypothesis
 __pycache__
-.env
\ No newline at end of file
+.env
+/.venv
\ No newline at end of file
diff --git a/docs/model/ApiTestsConfig.md b/docs/model/ApiTestsConfig.md
deleted file mode 100644
index fab49ebc..00000000
--- a/docs/model/ApiTestsConfig.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# cloudharness_model.model.api_tests_config.ApiTestsConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[checks](#checks)** | list, tuple,  | tuple,  | One of the Schemathesis checks:  - not_a_server_error. The response has 5xx HTTP status; - status_code_conformance. The response status is not defined in the API schema; - content_type_conformance. The response content type is not defined in the API schema; - response_schema_conformance. The response content does not conform to the schema defined for this specific response; - response_headers_conformance. The response headers does not contain all defined headers. | 
-**autotest** | bool,  | BoolClass,  | Specify whether to run the common smoke tests | 
-**enabled** | bool,  | BoolClass,  | Enables api tests for this application (default: false) | 
-**[runParams](#runParams)** | list, tuple,  | tuple,  | Additional schemathesis parameters | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# checks
-
-One of the Schemathesis checks:  - not_a_server_error. The response has 5xx HTTP status; - status_code_conformance. The response status is not defined in the API schema; - content_type_conformance. The response content type is not defined in the API schema; - response_schema_conformance. The response content does not conform to the schema defined for this specific response; - response_headers_conformance. The response headers does not contain all defined headers.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | One of the Schemathesis checks:  - not_a_server_error. The response has 5xx HTTP status; - status_code_conformance. The response status is not defined in the API schema; - content_type_conformance. The response content type is not defined in the API schema; - response_schema_conformance. The response content does not conform to the schema defined for this specific response; - response_headers_conformance. The response headers does not contain all defined headers. | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# runParams
-
-Additional schemathesis parameters
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Additional schemathesis parameters | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationAccountsConfig.md b/docs/model/ApplicationAccountsConfig.md
deleted file mode 100644
index 5cbbdf7d..00000000
--- a/docs/model/ApplicationAccountsConfig.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# cloudharness_model.model.application_accounts_config.ApplicationAccountsConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[roles](#roles)** | list, tuple,  | tuple,  | Specify roles to be created in this deployment specific for this application | [optional] 
-**[users](#users)** | list, tuple,  | tuple,  | Defines test users to be added to the deployment, specific for this application | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# roles
-
-Specify roles to be created in this deployment specific for this application
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Specify roles to be created in this deployment specific for this application | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# users
-
-Defines test users to be added to the deployment, specific for this application
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Defines test users to be added to the deployment, specific for this application | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**ApplicationUser**](ApplicationUser.md) | [**ApplicationUser**](ApplicationUser.md) | [**ApplicationUser**](ApplicationUser.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationConfig.md b/docs/model/ApplicationConfig.md
deleted file mode 100644
index 667d4b9a..00000000
--- a/docs/model/ApplicationConfig.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# cloudharness_model.model.application_config.ApplicationConfig
-
-Place here the values to configure your application helm templates.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Place here the values to configure your application helm templates. | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**harness** | [**ApplicationHarnessConfig**](ApplicationHarnessConfig.md) | [**ApplicationHarnessConfig**](ApplicationHarnessConfig.md) |  | 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationDependenciesConfig.md b/docs/model/ApplicationDependenciesConfig.md
deleted file mode 100644
index a59b2cec..00000000
--- a/docs/model/ApplicationDependenciesConfig.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# cloudharness_model.model.application_dependencies_config.ApplicationDependenciesConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[hard](#hard)** | list, tuple,  | tuple,  | Hard dependencies indicate that the application may not start without these other applications. | [optional] 
-**[soft](#soft)** | list, tuple,  | tuple,  | Soft dependencies indicate that the application will work partially without these other applications. | [optional] 
-**[build](#build)** | list, tuple,  | tuple,  | Hard dependencies indicate that the application Docker image build requires these base/common images | [optional] 
-**[git](#git)** | list, tuple,  | tuple,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# hard
-
-Hard dependencies indicate that the application may not start without these other applications.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Hard dependencies indicate that the application may not start without these other applications. | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# soft
-
-Soft dependencies indicate that the application will work partially without these other applications.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Soft dependencies indicate that the application will work partially without these other applications. | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# build
-
-Hard dependencies indicate that the application Docker image build requires these base/common images
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Hard dependencies indicate that the application Docker image build requires these base/common images | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# git
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**GitDependencyConfig**](GitDependencyConfig.md) | [**GitDependencyConfig**](GitDependencyConfig.md) | [**GitDependencyConfig**](GitDependencyConfig.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationHarnessConfig.md b/docs/model/ApplicationHarnessConfig.md
deleted file mode 100644
index 8e8a251d..00000000
--- a/docs/model/ApplicationHarnessConfig.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# cloudharness_model.model.application_harness_config.ApplicationHarnessConfig
-
-Define helm variables that allow CloudHarness to enable and configure your  application's deployment
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Define helm variables that allow CloudHarness to enable and configure your  application&#x27;s deployment | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**deployment** | [**DeploymentAutoArtifactConfig**](DeploymentAutoArtifactConfig.md) | [**DeploymentAutoArtifactConfig**](DeploymentAutoArtifactConfig.md) |  | [optional] 
-**service** | [**ServiceAutoArtifactConfig**](ServiceAutoArtifactConfig.md) | [**ServiceAutoArtifactConfig**](ServiceAutoArtifactConfig.md) |  | [optional] 
-**subdomain** | str,  | str,  | If specified, an ingress will be created at [subdomain].[.Values.domain] | [optional] 
-**[aliases](#aliases)** | list, tuple,  | tuple,  | If specified, an ingress will be created at [alias].[.Values.domain] for each alias | [optional] 
-**domain** | str,  | str,  | If specified, an ingress will be created at [domain] | [optional] 
-**dependencies** | [**ApplicationDependenciesConfig**](ApplicationDependenciesConfig.md) | [**ApplicationDependenciesConfig**](ApplicationDependenciesConfig.md) |  | [optional] 
-**secured** | bool,  | BoolClass,  | When true, the application is shielded with a getekeeper | [optional] 
-**[uri_role_mapping](#uri_role_mapping)** | list, tuple,  | tuple,  | Map uri/roles to secure with the Gatekeeper (if &#x60;secured: true&#x60;) | [optional] 
-**secrets** | [**SimpleMap**](SimpleMap.md) | [**SimpleMap**](SimpleMap.md) |  | [optional] 
-**[use_services](#use_services)** | list, tuple,  | tuple,  | Specify which services this application uses in the frontend to create proxy ingresses. e.g.  &#x60;&#x60;&#x60; - name: samples &#x60;&#x60;&#x60; | [optional] 
-**database** | [**DatabaseDeploymentConfig**](DatabaseDeploymentConfig.md) | [**DatabaseDeploymentConfig**](DatabaseDeploymentConfig.md) |  | [optional] 
-**[resources](#resources)** | list, tuple,  | tuple,  | Application file resources. Maps from deploy/resources folder and mounts as configmaps | [optional] 
-**readinessProbe** | [**ApplicationProbe**](ApplicationProbe.md) | [**ApplicationProbe**](ApplicationProbe.md) |  | [optional] 
-**startupProbe** | [**ApplicationProbe**](ApplicationProbe.md) | [**ApplicationProbe**](ApplicationProbe.md) |  | [optional] 
-**livenessProbe** | [**ApplicationProbe**](ApplicationProbe.md) | [**ApplicationProbe**](ApplicationProbe.md) |  | [optional] 
-**sourceRoot** | [**Filename**](Filename.md) | [**Filename**](Filename.md) |  | [optional] 
-**name** | str,  | str,  | Application&#x27;s name. Do not edit, the value is automatically set from the application directory&#x27;s name | [optional] 
-**jupyterhub** | [**JupyterHubConfig**](JupyterHubConfig.md) | [**JupyterHubConfig**](JupyterHubConfig.md) |  | [optional] 
-**accounts** | [**ApplicationAccountsConfig**](ApplicationAccountsConfig.md) | [**ApplicationAccountsConfig**](ApplicationAccountsConfig.md) |  | [optional] 
-**test** | [**ApplicationTestConfig**](ApplicationTestConfig.md) | [**ApplicationTestConfig**](ApplicationTestConfig.md) |  | [optional] 
-**quotas** | [**Quota**](Quota.md) | [**Quota**](Quota.md) |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# aliases
-
-If specified, an ingress will be created at [alias].[.Values.domain] for each alias
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | If specified, an ingress will be created at [alias].[.Values.domain] for each alias | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# uri_role_mapping
-
-Map uri/roles to secure with the Gatekeeper (if `secured: true`)
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Map uri/roles to secure with the Gatekeeper (if &#x60;secured: true&#x60;) | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**UriRoleMappingConfig**](UriRoleMappingConfig.md) | [**UriRoleMappingConfig**](UriRoleMappingConfig.md) | [**UriRoleMappingConfig**](UriRoleMappingConfig.md) |  | 
-
-# use_services
-
-Specify which services this application uses in the frontend to create proxy ingresses. e.g.  ``` - name: samples ```
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Specify which services this application uses in the frontend to create proxy ingresses. e.g.  &#x60;&#x60;&#x60; - name: samples &#x60;&#x60;&#x60; | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# resources
-
-Application file resources. Maps from deploy/resources folder and mounts as configmaps
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Application file resources. Maps from deploy/resources folder and mounts as configmaps | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**FileResourcesConfig**](FileResourcesConfig.md) | [**FileResourcesConfig**](FileResourcesConfig.md) | [**FileResourcesConfig**](FileResourcesConfig.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationProbe.md b/docs/model/ApplicationProbe.md
deleted file mode 100644
index a3375c46..00000000
--- a/docs/model/ApplicationProbe.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# cloudharness_model.model.application_probe.ApplicationProbe
-
-Define a Kubernetes probe See also the [official documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Define a Kubernetes probe See also the [official documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**path** | str,  | str,  |  | 
-**periodSeconds** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
-**failureThreshold** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
-**initialDelaySeconds** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationTestConfig.md b/docs/model/ApplicationTestConfig.md
deleted file mode 100644
index 96aced5a..00000000
--- a/docs/model/ApplicationTestConfig.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# cloudharness_model.model.application_test_config.ApplicationTestConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**unit** | [**UnitTestsConfig**](UnitTestsConfig.md) | [**UnitTestsConfig**](UnitTestsConfig.md) |  | 
-**e2e** | [**E2ETestsConfig**](E2ETestsConfig.md) | [**E2ETestsConfig**](E2ETestsConfig.md) |  | 
-**api** | [**ApiTestsConfig**](ApiTestsConfig.md) | [**ApiTestsConfig**](ApiTestsConfig.md) |  | 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationUser.md b/docs/model/ApplicationUser.md
deleted file mode 100644
index c55a18e8..00000000
--- a/docs/model/ApplicationUser.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# cloudharness_model.model.application_user.ApplicationUser
-
-Defines a user
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Defines a user | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**username** | str,  | str,  |  | 
-**password** | str,  | str,  |  | [optional] 
-**[clientRoles](#clientRoles)** | list, tuple,  | tuple,  |  | [optional] 
-**[realmRoles](#realmRoles)** | list, tuple,  | tuple,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# clientRoles
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# realmRoles
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ApplicationsConfigsMap.md b/docs/model/ApplicationsConfigsMap.md
deleted file mode 100644
index 7bfc31e5..00000000
--- a/docs/model/ApplicationsConfigsMap.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# cloudharness_model.model.applications_configs_map.ApplicationsConfigsMap
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | [**ApplicationConfig**](ApplicationConfig.md) | [**ApplicationConfig**](ApplicationConfig.md) | any string name can be used but the value must be the correct type | [optional] 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/AutoArtifactSpec.md b/docs/model/AutoArtifactSpec.md
deleted file mode 100644
index 7d149b70..00000000
--- a/docs/model/AutoArtifactSpec.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_model.model.auto_artifact_spec.AutoArtifactSpec
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**auto** | bool,  | BoolClass,  | When true, enables automatic template | 
-**name** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/BackupConfig.md b/docs/model/BackupConfig.md
deleted file mode 100644
index 29cbce3b..00000000
--- a/docs/model/BackupConfig.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# cloudharness_model.model.backup_config.BackupConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**resources** | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) |  | 
-**dir** | [**Filename**](Filename.md) | [**Filename**](Filename.md) |  | 
-**active** | bool,  | BoolClass,  |  | [optional] 
-**keep_days** | decimal.Decimal, int,  | decimal.Decimal,  |  | [optional] 
-**keep_weeks** | decimal.Decimal, int,  | decimal.Decimal,  |  | [optional] 
-**keep_months** | decimal.Decimal, int,  | decimal.Decimal,  |  | [optional] 
-**schedule** | str,  | str,  | Cron expression | [optional] 
-**suffix** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | The file suffix added to backup files | [optional] 
-**volumesize** | str,  | str,  | The volume size for backups (all backups share the same volume) | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/CDCEvent.md b/docs/model/CDCEvent.md
deleted file mode 100644
index c33e1081..00000000
--- a/docs/model/CDCEvent.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# cloudharness_model.model.cdc_event.CDCEvent
-
-A message sent to the orchestration queue. Applications can listen to these events to react to data change events happening on other applications.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | A message sent to the orchestration queue. Applications can listen to these events to react to data change events happening on other applications. | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**uid** | str,  | str,  | the unique identifier attribute of the object | 
-**meta** | [**CDCEventMeta**](CDCEventMeta.md) | [**CDCEventMeta**](CDCEventMeta.md) |  | 
-**message_type** | str,  | str,  | the type of the message (relates to the object type) e.g. jobs | 
-**operation** | str,  | str,  | the operation on the object e.g. create / update / delete | must be one of ["create", "update", "delete", "other", ] 
-**resource** | [**FreeObject**](FreeObject.md) | [**FreeObject**](FreeObject.md) |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/CDCEventMeta.md b/docs/model/CDCEventMeta.md
deleted file mode 100644
index 747246d3..00000000
--- a/docs/model/CDCEventMeta.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# cloudharness_model.model.cdc_event_meta.CDCEventMeta
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**app_name** | str,  | str,  | The name of the application/microservice sending the message | 
-**user** | [**User**](User.md) | [**User**](User.md) |  | [optional] 
-**[args](#args)** | list, tuple,  | tuple,  | the caller function arguments | [optional] 
-**kwargs** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | the caller function keyword arguments | [optional] 
-**description** | str,  | str,  | General description -- for human consumption | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# args
-
-the caller function arguments
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | the caller function arguments | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**FreeObject**](FreeObject.md) | [**FreeObject**](FreeObject.md) | [**FreeObject**](FreeObject.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/CpuMemoryConfig.md b/docs/model/CpuMemoryConfig.md
deleted file mode 100644
index f64cd7d3..00000000
--- a/docs/model/CpuMemoryConfig.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_model.model.cpu_memory_config.CpuMemoryConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**cpu** | str,  | str,  |  | [optional] 
-**memory** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/DatabaseDeploymentConfig.md b/docs/model/DatabaseDeploymentConfig.md
deleted file mode 100644
index 864d5ef1..00000000
--- a/docs/model/DatabaseDeploymentConfig.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# cloudharness_model.model.database_deployment_config.DatabaseDeploymentConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Composed Schemas (allOf/anyOf/oneOf/not)
-#### allOf
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[all_of_0](#all_of_0) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-[AutoArtifactSpec](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) |  | 
-
-# all_of_0
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**type** | str,  | str,  | Define the database type.  One of (mongo, postgres, neo4j, sqlite3) | [optional] 
-**size** | str,  | str,  | Specify database disk size | [optional] 
-**user** | str,  | str,  | database username | [optional] 
-**pass** | str,  | str,  | Database password | [optional] 
-**image_ref** | str,  | str,  | Used for referencing images from the build | [optional] 
-**mongo** | [**FreeObject**](FreeObject.md) | [**FreeObject**](FreeObject.md) |  | [optional] 
-**postgres** | [**FreeObject**](FreeObject.md) | [**FreeObject**](FreeObject.md) |  | [optional] 
-**neo4j** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | Neo4j database specific configuration | [optional] 
-**resources** | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/DeploymentAutoArtifactConfig.md b/docs/model/DeploymentAutoArtifactConfig.md
deleted file mode 100644
index 4367e949..00000000
--- a/docs/model/DeploymentAutoArtifactConfig.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# cloudharness_model.model.deployment_auto_artifact_config.DeploymentAutoArtifactConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Composed Schemas (allOf/anyOf/oneOf/not)
-#### allOf
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[all_of_0](#all_of_0) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-[AutoArtifactSpec](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) |  | 
-
-# all_of_0
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**port** | str,  | str,  | Deployment port | [optional] 
-**replicas** | decimal.Decimal, int,  | decimal.Decimal,  | Number of replicas | [optional] 
-**image** | str,  | str,  | Image name to use in the deployment. Leave it blank to set from the application&#x27;s Docker file | [optional] 
-**resources** | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) |  | [optional] 
-**volume** | [**DeploymentVolumeSpec**](DeploymentVolumeSpec.md) | [**DeploymentVolumeSpec**](DeploymentVolumeSpec.md) |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/DeploymentResourcesConf.md b/docs/model/DeploymentResourcesConf.md
deleted file mode 100644
index 6ca517a3..00000000
--- a/docs/model/DeploymentResourcesConf.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_model.model.deployment_resources_conf.DeploymentResourcesConf
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**requests** | [**CpuMemoryConfig**](CpuMemoryConfig.md) | [**CpuMemoryConfig**](CpuMemoryConfig.md) |  | [optional] 
-**limits** | [**CpuMemoryConfig**](CpuMemoryConfig.md) | [**CpuMemoryConfig**](CpuMemoryConfig.md) |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/DeploymentVolumeSpec.md b/docs/model/DeploymentVolumeSpec.md
deleted file mode 100644
index 14900102..00000000
--- a/docs/model/DeploymentVolumeSpec.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# cloudharness_model.model.deployment_volume_spec.DeploymentVolumeSpec
-
-Defines a volume attached to the deployment. Automatically created the volume claim and mounts.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Defines a volume attached to the deployment. Automatically created the volume claim and mounts. | 
-
-### Composed Schemas (allOf/anyOf/oneOf/not)
-#### allOf
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[all_of_0](#all_of_0) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-[AutoArtifactSpec](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) |  | 
-
-# all_of_0
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**mountpath** | str,  | str,  | The mount path for the volume | 
-**size** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | The volume size.   E.g. 5Gi | [optional] 
-**usenfs** | bool,  | BoolClass,  | Set to &#x60;true&#x60; to use the nfs on the created volume and mount as ReadWriteMany. | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/E2ETestsConfig.md b/docs/model/E2ETestsConfig.md
deleted file mode 100644
index 8b7383d1..00000000
--- a/docs/model/E2ETestsConfig.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# cloudharness_model.model.e2_e_tests_config.E2ETestsConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**smoketest** | bool,  | BoolClass,  | Specify whether to run the common smoke tests | 
-**enabled** | bool,  | BoolClass,  | Enables end to end testing for this application (default: false) | 
-**ignoreConsoleErrors** | bool,  | BoolClass,  |  | [optional] 
-**ignoreRequestErrors** | bool,  | BoolClass,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/FileResourcesConfig.md b/docs/model/FileResourcesConfig.md
deleted file mode 100644
index 6936d87c..00000000
--- a/docs/model/FileResourcesConfig.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# cloudharness_model.model.file_resources_config.FileResourcesConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**dst** | str,  | str,  |  | 
-**src** | [**Filename**](Filename.md) | [**Filename**](Filename.md) |  | 
-**name** | [**Filename**](Filename.md) | [**Filename**](Filename.md) |  | 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/Filename.md b/docs/model/Filename.md
deleted file mode 100644
index ccbf7b0e..00000000
--- a/docs/model/Filename.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloudharness_model.model.filename.Filename
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/FreeObject.md b/docs/model/FreeObject.md
deleted file mode 100644
index e131e846..00000000
--- a/docs/model/FreeObject.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# cloudharness_model.model.free_object.FreeObject
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/GitDependencyConfig.md b/docs/model/GitDependencyConfig.md
deleted file mode 100644
index 5faef206..00000000
--- a/docs/model/GitDependencyConfig.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# cloudharness_model.model.git_dependency_config.GitDependencyConfig
-
-Defines a git repo to be cloned inside the application path
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Defines a git repo to be cloned inside the application path | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**branch_tag** | str,  | str,  |  | 
-**url** | str,  | str,  |  | 
-**path** | str,  | str,  | Defines the path where the repo is cloned. default: /git | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/HarnessMainConfig.md b/docs/model/HarnessMainConfig.md
deleted file mode 100644
index fc0f29da..00000000
--- a/docs/model/HarnessMainConfig.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# cloudharness_model.model.harness_main_config.HarnessMainConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**mainapp** | str,  | str,  | Defines the app to map to the root domain | 
-**domain** | str,  | str,  | The root domain | 
-**namespace** | str,  | str,  | The K8s namespace. | 
-**secured_gatekeepers** | bool,  | BoolClass,  | Enables/disables Gatekeepers on secured applications. Set to false for testing/development | 
-**local** | bool,  | BoolClass,  | If set to true, local DNS mapping is added to pods. | 
-**apps** | [**ApplicationsConfigsMap**](ApplicationsConfigsMap.md) | [**ApplicationsConfigsMap**](ApplicationsConfigsMap.md) |  | 
-**registry** | [**RegistryConfig**](RegistryConfig.md) | [**RegistryConfig**](RegistryConfig.md) |  | [optional] 
-**tag** | str,  | str,  | Docker tag used to push/pull the built images. | [optional] 
-**[env](#env)** | list, tuple,  | tuple,  | Environmental variables added to all pods | [optional] 
-**privenv** | [**NameValue**](NameValue.md) | [**NameValue**](NameValue.md) |  | [optional] 
-**backup** | [**BackupConfig**](BackupConfig.md) | [**BackupConfig**](BackupConfig.md) |  | [optional] 
-**name** | str,  | str,  | Base name | [optional] 
-**task-images** | [**SimpleMap**](SimpleMap.md) | [**SimpleMap**](SimpleMap.md) |  | [optional] 
-**build_hash** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# env
-
-Environmental variables added to all pods
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Environmental variables added to all pods | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**NameValue**](NameValue.md) | [**NameValue**](NameValue.md) | [**NameValue**](NameValue.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/IngressConfig.md b/docs/model/IngressConfig.md
deleted file mode 100644
index fcdc67ea..00000000
--- a/docs/model/IngressConfig.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# cloudharness_model.model.ingress_config.IngressConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Composed Schemas (allOf/anyOf/oneOf/not)
-#### allOf
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[all_of_0](#all_of_0) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-[AutoArtifactSpec](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) |  | 
-
-# all_of_0
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**ssl_redirect** | bool,  | BoolClass,  |  | [optional] 
-**[letsencrypt](#letsencrypt)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# letsencrypt
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**email** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/JupyterHubConfig.md b/docs/model/JupyterHubConfig.md
deleted file mode 100644
index 59ac9c84..00000000
--- a/docs/model/JupyterHubConfig.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# cloudharness_model.model.jupyter_hub_config.JupyterHubConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[args](#args)** | list, tuple,  | tuple,  | arguments passed to the container | [optional] 
-**extraConfig** | [**SimpleMap**](SimpleMap.md) | [**SimpleMap**](SimpleMap.md) |  | [optional] 
-**spawnerExtraConfig** | [**FreeObject**](FreeObject.md) | [**FreeObject**](FreeObject.md) |  | [optional] 
-**applicationHook** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | change the hook function (advanced)  Specify the Python name of the function (full module path, the module must be  installed in the Docker image) | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# args
-
-arguments passed to the container
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | arguments passed to the container | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/NameValue.md b/docs/model/NameValue.md
deleted file mode 100644
index deb57553..00000000
--- a/docs/model/NameValue.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_model.model.name_value.NameValue
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**name** | str,  | str,  |  | 
-**value** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/PathSpecifier.md b/docs/model/PathSpecifier.md
deleted file mode 100644
index e8062e36..00000000
--- a/docs/model/PathSpecifier.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloudharness_model.model.path_specifier.PathSpecifier
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/Quota.md b/docs/model/Quota.md
deleted file mode 100644
index 8124fe92..00000000
--- a/docs/model/Quota.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# cloudharness_model.model.quota.Quota
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/RegistryConfig.md b/docs/model/RegistryConfig.md
deleted file mode 100644
index c63d22b6..00000000
--- a/docs/model/RegistryConfig.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_model.model.registry_config.RegistryConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**name** | str,  | str,  |  | 
-**secret** | str,  | str,  | Optional secret used for pulling from docker registry. | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/ServiceAutoArtifactConfig.md b/docs/model/ServiceAutoArtifactConfig.md
deleted file mode 100644
index 6ac6050c..00000000
--- a/docs/model/ServiceAutoArtifactConfig.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# cloudharness_model.model.service_auto_artifact_config.ServiceAutoArtifactConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Composed Schemas (allOf/anyOf/oneOf/not)
-#### allOf
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[all_of_0](#all_of_0) | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-[AutoArtifactSpec](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) | [**AutoArtifactSpec**](AutoArtifactSpec.md) |  | 
-
-# all_of_0
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**port** | decimal.Decimal, int,  | decimal.Decimal,  | Service port | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/SimpleMap.md b/docs/model/SimpleMap.md
deleted file mode 100644
index 37074b56..00000000
--- a/docs/model/SimpleMap.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# cloudharness_model.model.simple_map.SimpleMap
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/URL.md b/docs/model/URL.md
deleted file mode 100644
index ac2bc6d8..00000000
--- a/docs/model/URL.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloudharness_model.model.url.URL
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/UnitTestsConfig.md b/docs/model/UnitTestsConfig.md
deleted file mode 100644
index 1c2f16d6..00000000
--- a/docs/model/UnitTestsConfig.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# cloudharness_model.model.unit_tests_config.UnitTestsConfig
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[commands](#commands)** | list, tuple,  | tuple,  | Commands to run unit tests | 
-**enabled** | bool,  | BoolClass,  | Enables unit tests for this application (default: true) | 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# commands
-
-Commands to run unit tests
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Commands to run unit tests | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/UriRoleMappingConfig.md b/docs/model/UriRoleMappingConfig.md
deleted file mode 100644
index ff645e73..00000000
--- a/docs/model/UriRoleMappingConfig.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# cloudharness_model.model.uri_role_mapping_config.UriRoleMappingConfig
-
-Defines the application Gatekeeper configuration, if enabled (i.e. `secured: true`.
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  | Defines the application Gatekeeper configuration, if enabled (i.e. &#x60;secured: true&#x60;. | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[roles](#roles)** | list, tuple,  | tuple,  | Roles allowed to access the present uri | 
-**uri** | [**PathSpecifier**](PathSpecifier.md) | [**PathSpecifier**](PathSpecifier.md) |  | 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# roles
-
-Roles allowed to access the present uri
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  | Roles allowed to access the present uri | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/User.md b/docs/model/User.md
deleted file mode 100644
index cd49ceaa..00000000
--- a/docs/model/User.md
+++ /dev/null
@@ -1,129 +0,0 @@
-# cloudharness_model.model.user.User
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[access](#access)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**[attributes](#attributes)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**[clientRoles](#clientRoles)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**createdTimestamp** | decimal.Decimal, int,  | decimal.Decimal,  |  | [optional] value must be a 64 bit integer
-**[credentials](#credentials)** | list, tuple,  | tuple,  |  | [optional] 
-**[disableableCredentialTypes](#disableableCredentialTypes)** | list, tuple,  | tuple,  |  | [optional] 
-**email** | str,  | str,  |  | [optional] 
-**emailVerified** | bool,  | BoolClass,  |  | [optional] 
-**enabled** | bool,  | BoolClass,  |  | [optional] 
-**federationLink** | str,  | str,  |  | [optional] 
-**firstName** | str,  | str,  |  | [optional] 
-**[groups](#groups)** | list, tuple,  | tuple,  |  | [optional] 
-**id** | str,  | str,  |  | [optional] 
-**lastName** | str,  | str,  |  | [optional] 
-**[realmRoles](#realmRoles)** | list, tuple,  | tuple,  |  | [optional] 
-**[requiredActions](#requiredActions)** | list, tuple,  | tuple,  |  | [optional] 
-**serviceAccountClientId** | str,  | str,  |  | [optional] 
-**username** | str,  | str,  |  | [optional] 
-**additionalProperties** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# access
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# attributes
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# clientRoles
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# credentials
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**UserCredential**](UserCredential.md) | [**UserCredential**](UserCredential.md) | [**UserCredential**](UserCredential.md) |  | 
-
-# disableableCredentialTypes
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# groups
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# realmRoles
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# requiredActions
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/UserCredential.md b/docs/model/UserCredential.md
deleted file mode 100644
index d29edc20..00000000
--- a/docs/model/UserCredential.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# cloudharness_model.model.user_credential.UserCredential
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**createdDate** | decimal.Decimal, int,  | decimal.Decimal,  |  | [optional] value must be a 64 bit integer
-**credentialData** | str,  | str,  |  | [optional] 
-**id** | str,  | str,  |  | [optional] 
-**priority** | decimal.Decimal, int,  | decimal.Decimal,  |  | [optional] value must be a 32 bit integer
-**secretData** | str,  | str,  |  | [optional] 
-**temporary** | bool,  | BoolClass,  |  | [optional] 
-**type** | str,  | str,  |  | [optional] 
-**userLabel** | str,  | str,  |  | [optional] 
-**value** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/UserGroup.md b/docs/model/UserGroup.md
deleted file mode 100644
index 87aee711..00000000
--- a/docs/model/UserGroup.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# cloudharness_model.model.user_group.UserGroup
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[access](#access)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**[attributes](#attributes)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**[clientRoles](#clientRoles)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**id** | str,  | str,  |  | [optional] 
-**name** | str,  | str,  |  | [optional] 
-**path** | str,  | str,  |  | [optional] 
-**[realmRoles](#realmRoles)** | list, tuple,  | tuple,  |  | [optional] 
-**[subGroups](#subGroups)** | list, tuple,  | tuple,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# access
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# attributes
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# clientRoles
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# realmRoles
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-items | str,  | str,  |  | 
-
-# subGroups
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**UserGroup**](UserGroup.md) | [**UserGroup**](UserGroup.md) | [**UserGroup**](UserGroup.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/docs/model/UserRole.md b/docs/model/UserRole.md
deleted file mode 100644
index ba0d5fe0..00000000
--- a/docs/model/UserRole.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# cloudharness_model.model.user_role.UserRole
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**[attributes](#attributes)** | dict, frozendict.frozendict,  | frozendict.frozendict,  |  | [optional] 
-**clientRole** | bool,  | BoolClass,  |  | [optional] 
-**composite** | bool,  | BoolClass,  |  | [optional] 
-**containerId** | str,  | str,  |  | [optional] 
-**description** | str,  | str,  |  | [optional] 
-**id** | str,  | str,  |  | [optional] 
-**name** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# attributes
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/models/api/openapi.yaml b/libraries/models/api/openapi.yaml
index 8b961031..3b115091 100644
--- a/libraries/models/api/openapi.yaml
+++ b/libraries/models/api/openapi.yaml
@@ -163,49 +163,6 @@ components:
             description: ''
             type: object
             additionalProperties: true
-        DatabaseDeploymentConfig:
-            description: ''
-            type: object
-            allOf:
-                -
-                    type: object
-                    properties:
-                        type:
-                            description: |-
-                                Define the database type.
-
-                                One of (mongo, postgres, neo4j, sqlite3)
-                            pattern: ^(mongo|postgres|neo4j|sqlite3)$
-                            type: string
-                            example: '"neo4j"'
-                        size:
-                            description: Specify database disk size
-                            type: string
-                            example: 1Gi
-                        user:
-                            description: database username
-                            type: string
-                        pass:
-                            format: password
-                            description: Database password
-                            type: string
-                        image_ref:
-                            description: Used for referencing images from the build
-                            type: string
-                            example: 'image_ref: myownpgimage'
-                        mongo:
-                            $ref: '#/components/schemas/FreeObject'
-                            description: Mongo db specific configuration
-                        postgres:
-                            $ref: '#/components/schemas/FreeObject'
-                            description: Postgres database specific configuration
-                        neo4j:
-                            description: Neo4j database specific configuration
-                        resources:
-                            $ref: '#/components/schemas/DeploymentResourcesConf'
-                            description: Database deployment resources
-                -
-                    $ref: '#/components/schemas/AutoArtifactSpec'
         ApplicationsConfigsMap:
             description: ''
             type: object
@@ -823,7 +780,7 @@ components:
                     $ref: '#/components/schemas/ApplicationsConfigsMap'
                     description: ''
                 env:
-                    description: Environmental variables added to all pods
+                    description: 'Environmental variables added to all pods (deprecated, please use envmap)'
                     type: array
                     items:
                         $ref: '#/components/schemas/NameValue'
@@ -842,6 +799,9 @@ components:
                 build_hash:
                     description: ''
                     type: string
+                envmap:
+                    $ref: '#/components/schemas/SimpleMap'
+                    description: Environmental variables added to all pods
             additionalProperties: true
         SimpleMap:
             description: ''
@@ -873,3 +833,47 @@ components:
                 url: 'https://github.com/MetaCell/nwb-explorer.git'
                 branch_tag: master
                 path: /git
+        DatabaseDeploymentConfig:
+            description: ''
+            type: object
+            allOf:
+                -
+                    type: object
+                    properties:
+                        type:
+                            description: |-
+                                Define the database type.
+
+                                One of (mongo, postgres, neo4j, sqlite3)
+                            pattern: ^(mongo|postgres|neo4j|sqlite3)$
+                            type: string
+                            example: '"neo4j"'
+                        size:
+                            description: Specify database disk size
+                            type: string
+                            example: 1Gi
+                        user:
+                            description: database username
+                            type: string
+                        pass:
+                            format: password
+                            description: Database password
+                            type: string
+                        image_ref:
+                            description: Used for referencing images from the build
+                            type: string
+                            example: 'image_ref: myownpgimage'
+                        mongo:
+                            $ref: '#/components/schemas/FreeObject'
+                            description: Mongo db specific configuration
+                        postgres:
+                            $ref: '#/components/schemas/FreeObject'
+                            description: Postgres database specific configuration
+                        neo4j:
+                            description: Neo4j database specific configuration
+                        resources:
+                            $ref: '#/components/schemas/DeploymentResourcesConf'
+                            description: Database deployment resources
+                -
+                    $ref: '#/components/schemas/AutoArtifactSpec'
+            additionalAttributes: true
diff --git a/libraries/models/cloudharness_model/models/__init__.py b/libraries/models/cloudharness_model/models/__init__.py
index dbfb1175..488c3e6f 100644
--- a/libraries/models/cloudharness_model/models/__init__.py
+++ b/libraries/models/cloudharness_model/models/__init__.py
@@ -1,7 +1,4 @@
-# coding: utf-8
-
 # flake8: noqa
-from __future__ import absolute_import
 # import models into model package
 from cloudharness_model.models.api_tests_config import ApiTestsConfig
 from cloudharness_model.models.application_accounts_config import ApplicationAccountsConfig
@@ -17,24 +14,19 @@
 from cloudharness_model.models.cdc_event_meta import CDCEventMeta
 from cloudharness_model.models.cpu_memory_config import CpuMemoryConfig
 from cloudharness_model.models.database_deployment_config import DatabaseDeploymentConfig
-from cloudharness_model.models.database_deployment_config_all_of import DatabaseDeploymentConfigAllOf
 from cloudharness_model.models.deployment_auto_artifact_config import DeploymentAutoArtifactConfig
-from cloudharness_model.models.deployment_auto_artifact_config_all_of import DeploymentAutoArtifactConfigAllOf
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 from cloudharness_model.models.deployment_volume_spec import DeploymentVolumeSpec
-from cloudharness_model.models.deployment_volume_spec_all_of import DeploymentVolumeSpecAllOf
 from cloudharness_model.models.e2_e_tests_config import E2ETestsConfig
 from cloudharness_model.models.file_resources_config import FileResourcesConfig
 from cloudharness_model.models.git_dependency_config import GitDependencyConfig
 from cloudharness_model.models.harness_main_config import HarnessMainConfig
 from cloudharness_model.models.ingress_config import IngressConfig
-from cloudharness_model.models.ingress_config_all_of import IngressConfigAllOf
 from cloudharness_model.models.ingress_config_all_of_letsencrypt import IngressConfigAllOfLetsencrypt
 from cloudharness_model.models.jupyter_hub_config import JupyterHubConfig
 from cloudharness_model.models.name_value import NameValue
 from cloudharness_model.models.registry_config import RegistryConfig
 from cloudharness_model.models.service_auto_artifact_config import ServiceAutoArtifactConfig
-from cloudharness_model.models.service_auto_artifact_config_all_of import ServiceAutoArtifactConfigAllOf
 from cloudharness_model.models.unit_tests_config import UnitTestsConfig
 from cloudharness_model.models.uri_role_mapping_config import UriRoleMappingConfig
 from cloudharness_model.models.user import User
diff --git a/libraries/models/cloudharness_model/models/api_tests_config.py b/libraries/models/cloudharness_model/models/api_tests_config.py
index d5b2bdf6..a4476c08 100644
--- a/libraries/models/cloudharness_model/models/api_tests_config.py
+++ b/libraries/models/cloudharness_model/models/api_tests_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -58,7 +55,7 @@ def from_dict(cls, dikt) -> 'ApiTestsConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def enabled(self):
+    def enabled(self) -> bool:
         """Gets the enabled of this ApiTestsConfig.
 
         Enables api tests for this application (default: false)  # noqa: E501
@@ -69,7 +66,7 @@ def enabled(self):
         return self._enabled
 
     @enabled.setter
-    def enabled(self, enabled):
+    def enabled(self, enabled: bool):
         """Sets the enabled of this ApiTestsConfig.
 
         Enables api tests for this application (default: false)  # noqa: E501
@@ -83,7 +80,7 @@ def enabled(self, enabled):
         self._enabled = enabled
 
     @property
-    def autotest(self):
+    def autotest(self) -> bool:
         """Gets the autotest of this ApiTestsConfig.
 
         Specify whether to run the common smoke tests  # noqa: E501
@@ -94,7 +91,7 @@ def autotest(self):
         return self._autotest
 
     @autotest.setter
-    def autotest(self, autotest):
+    def autotest(self, autotest: bool):
         """Sets the autotest of this ApiTestsConfig.
 
         Specify whether to run the common smoke tests  # noqa: E501
@@ -108,7 +105,7 @@ def autotest(self, autotest):
         self._autotest = autotest
 
     @property
-    def run_params(self):
+    def run_params(self) -> List[str]:
         """Gets the run_params of this ApiTestsConfig.
 
         Additional schemathesis parameters  # noqa: E501
@@ -119,7 +116,7 @@ def run_params(self):
         return self._run_params
 
     @run_params.setter
-    def run_params(self, run_params):
+    def run_params(self, run_params: List[str]):
         """Sets the run_params of this ApiTestsConfig.
 
         Additional schemathesis parameters  # noqa: E501
@@ -131,7 +128,7 @@ def run_params(self, run_params):
         self._run_params = run_params
 
     @property
-    def checks(self):
+    def checks(self) -> List[str]:
         """Gets the checks of this ApiTestsConfig.
 
         One of the Schemathesis checks:  - not_a_server_error. The response has 5xx HTTP status; - status_code_conformance. The response status is not defined in the API schema; - content_type_conformance. The response content type is not defined in the API schema; - response_schema_conformance. The response content does not conform to the schema defined for this specific response; - response_headers_conformance. The response headers does not contain all defined headers.  # noqa: E501
@@ -142,7 +139,7 @@ def checks(self):
         return self._checks
 
     @checks.setter
-    def checks(self, checks):
+    def checks(self, checks: List[str]):
         """Sets the checks of this ApiTestsConfig.
 
         One of the Schemathesis checks:  - not_a_server_error. The response has 5xx HTTP status; - status_code_conformance. The response status is not defined in the API schema; - content_type_conformance. The response content type is not defined in the API schema; - response_schema_conformance. The response content does not conform to the schema defined for this specific response; - response_headers_conformance. The response headers does not contain all defined headers.  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/application_accounts_config.py b/libraries/models/cloudharness_model/models/application_accounts_config.py
index 082f6853..9a97db85 100644
--- a/libraries/models/cloudharness_model/models/application_accounts_config.py
+++ b/libraries/models/cloudharness_model/models/application_accounts_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.application_user import ApplicationUser
 from cloudharness_model import util
 
@@ -50,7 +47,7 @@ def from_dict(cls, dikt) -> 'ApplicationAccountsConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def roles(self):
+    def roles(self) -> List[str]:
         """Gets the roles of this ApplicationAccountsConfig.
 
         Specify roles to be created in this deployment specific for this application  # noqa: E501
@@ -61,7 +58,7 @@ def roles(self):
         return self._roles
 
     @roles.setter
-    def roles(self, roles):
+    def roles(self, roles: List[str]):
         """Sets the roles of this ApplicationAccountsConfig.
 
         Specify roles to be created in this deployment specific for this application  # noqa: E501
@@ -73,7 +70,7 @@ def roles(self, roles):
         self._roles = roles
 
     @property
-    def users(self):
+    def users(self) -> List[ApplicationUser]:
         """Gets the users of this ApplicationAccountsConfig.
 
         Defines test users to be added to the deployment, specific for this application  # noqa: E501
@@ -84,7 +81,7 @@ def users(self):
         return self._users
 
     @users.setter
-    def users(self, users):
+    def users(self, users: List[ApplicationUser]):
         """Sets the users of this ApplicationAccountsConfig.
 
         Defines test users to be added to the deployment, specific for this application  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/application_config.py b/libraries/models/cloudharness_model/models/application_config.py
index 2ea86d6e..f423ee3b 100644
--- a/libraries/models/cloudharness_model/models/application_config.py
+++ b/libraries/models/cloudharness_model/models/application_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.application_harness_config import ApplicationHarnessConfig
 from cloudharness_model import util
 
@@ -45,7 +42,7 @@ def from_dict(cls, dikt) -> 'ApplicationConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def harness(self):
+    def harness(self) -> ApplicationHarnessConfig:
         """Gets the harness of this ApplicationConfig.
 
 
@@ -55,7 +52,7 @@ def harness(self):
         return self._harness
 
     @harness.setter
-    def harness(self, harness):
+    def harness(self, harness: ApplicationHarnessConfig):
         """Sets the harness of this ApplicationConfig.
 
 
diff --git a/libraries/models/cloudharness_model/models/application_dependencies_config.py b/libraries/models/cloudharness_model/models/application_dependencies_config.py
index 7f4df0ba..a09df86f 100644
--- a/libraries/models/cloudharness_model/models/application_dependencies_config.py
+++ b/libraries/models/cloudharness_model/models/application_dependencies_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.git_dependency_config import GitDependencyConfig
 from cloudharness_model import util
 
@@ -60,7 +57,7 @@ def from_dict(cls, dikt) -> 'ApplicationDependenciesConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def hard(self):
+    def hard(self) -> List[str]:
         """Gets the hard of this ApplicationDependenciesConfig.
 
         Hard dependencies indicate that the application may not start without these other applications.  # noqa: E501
@@ -71,7 +68,7 @@ def hard(self):
         return self._hard
 
     @hard.setter
-    def hard(self, hard):
+    def hard(self, hard: List[str]):
         """Sets the hard of this ApplicationDependenciesConfig.
 
         Hard dependencies indicate that the application may not start without these other applications.  # noqa: E501
@@ -83,7 +80,7 @@ def hard(self, hard):
         self._hard = hard
 
     @property
-    def soft(self):
+    def soft(self) -> List[str]:
         """Gets the soft of this ApplicationDependenciesConfig.
 
         Soft dependencies indicate that the application will work partially without these other applications.  # noqa: E501
@@ -94,7 +91,7 @@ def soft(self):
         return self._soft
 
     @soft.setter
-    def soft(self, soft):
+    def soft(self, soft: List[str]):
         """Sets the soft of this ApplicationDependenciesConfig.
 
         Soft dependencies indicate that the application will work partially without these other applications.  # noqa: E501
@@ -106,7 +103,7 @@ def soft(self, soft):
         self._soft = soft
 
     @property
-    def build(self):
+    def build(self) -> List[str]:
         """Gets the build of this ApplicationDependenciesConfig.
 
         Hard dependencies indicate that the application Docker image build requires these base/common images  # noqa: E501
@@ -117,7 +114,7 @@ def build(self):
         return self._build
 
     @build.setter
-    def build(self, build):
+    def build(self, build: List[str]):
         """Sets the build of this ApplicationDependenciesConfig.
 
         Hard dependencies indicate that the application Docker image build requires these base/common images  # noqa: E501
@@ -129,7 +126,7 @@ def build(self, build):
         self._build = build
 
     @property
-    def git(self):
+    def git(self) -> List[GitDependencyConfig]:
         """Gets the git of this ApplicationDependenciesConfig.
 
           # noqa: E501
@@ -140,7 +137,7 @@ def git(self):
         return self._git
 
     @git.setter
-    def git(self, git):
+    def git(self, git: List[GitDependencyConfig]):
         """Sets the git of this ApplicationDependenciesConfig.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/application_harness_config.py b/libraries/models/cloudharness_model/models/application_harness_config.py
index ba287654..ad85a40b 100644
--- a/libraries/models/cloudharness_model/models/application_harness_config.py
+++ b/libraries/models/cloudharness_model/models/application_harness_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.application_accounts_config import ApplicationAccountsConfig
 from cloudharness_model.models.application_dependencies_config import ApplicationDependenciesConfig
 from cloudharness_model.models.application_probe import ApplicationProbe
@@ -165,7 +162,7 @@ def from_dict(cls, dikt) -> 'ApplicationHarnessConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def deployment(self):
+    def deployment(self) -> DeploymentAutoArtifactConfig:
         """Gets the deployment of this ApplicationHarnessConfig.
 
 
@@ -175,7 +172,7 @@ def deployment(self):
         return self._deployment
 
     @deployment.setter
-    def deployment(self, deployment):
+    def deployment(self, deployment: DeploymentAutoArtifactConfig):
         """Sets the deployment of this ApplicationHarnessConfig.
 
 
@@ -186,7 +183,7 @@ def deployment(self, deployment):
         self._deployment = deployment
 
     @property
-    def service(self):
+    def service(self) -> ServiceAutoArtifactConfig:
         """Gets the service of this ApplicationHarnessConfig.
 
 
@@ -196,7 +193,7 @@ def service(self):
         return self._service
 
     @service.setter
-    def service(self, service):
+    def service(self, service: ServiceAutoArtifactConfig):
         """Sets the service of this ApplicationHarnessConfig.
 
 
@@ -207,7 +204,7 @@ def service(self, service):
         self._service = service
 
     @property
-    def subdomain(self):
+    def subdomain(self) -> str:
         """Gets the subdomain of this ApplicationHarnessConfig.
 
         If specified, an ingress will be created at [subdomain].[.Values.domain]  # noqa: E501
@@ -218,7 +215,7 @@ def subdomain(self):
         return self._subdomain
 
     @subdomain.setter
-    def subdomain(self, subdomain):
+    def subdomain(self, subdomain: str):
         """Sets the subdomain of this ApplicationHarnessConfig.
 
         If specified, an ingress will be created at [subdomain].[.Values.domain]  # noqa: E501
@@ -230,7 +227,7 @@ def subdomain(self, subdomain):
         self._subdomain = subdomain
 
     @property
-    def aliases(self):
+    def aliases(self) -> List[str]:
         """Gets the aliases of this ApplicationHarnessConfig.
 
         If specified, an ingress will be created at [alias].[.Values.domain] for each alias  # noqa: E501
@@ -241,7 +238,7 @@ def aliases(self):
         return self._aliases
 
     @aliases.setter
-    def aliases(self, aliases):
+    def aliases(self, aliases: List[str]):
         """Sets the aliases of this ApplicationHarnessConfig.
 
         If specified, an ingress will be created at [alias].[.Values.domain] for each alias  # noqa: E501
@@ -253,7 +250,7 @@ def aliases(self, aliases):
         self._aliases = aliases
 
     @property
-    def domain(self):
+    def domain(self) -> str:
         """Gets the domain of this ApplicationHarnessConfig.
 
         If specified, an ingress will be created at [domain]  # noqa: E501
@@ -264,7 +261,7 @@ def domain(self):
         return self._domain
 
     @domain.setter
-    def domain(self, domain):
+    def domain(self, domain: str):
         """Sets the domain of this ApplicationHarnessConfig.
 
         If specified, an ingress will be created at [domain]  # noqa: E501
@@ -276,7 +273,7 @@ def domain(self, domain):
         self._domain = domain
 
     @property
-    def dependencies(self):
+    def dependencies(self) -> ApplicationDependenciesConfig:
         """Gets the dependencies of this ApplicationHarnessConfig.
 
 
@@ -286,7 +283,7 @@ def dependencies(self):
         return self._dependencies
 
     @dependencies.setter
-    def dependencies(self, dependencies):
+    def dependencies(self, dependencies: ApplicationDependenciesConfig):
         """Sets the dependencies of this ApplicationHarnessConfig.
 
 
@@ -297,7 +294,7 @@ def dependencies(self, dependencies):
         self._dependencies = dependencies
 
     @property
-    def secured(self):
+    def secured(self) -> bool:
         """Gets the secured of this ApplicationHarnessConfig.
 
         When true, the application is shielded with a getekeeper  # noqa: E501
@@ -308,7 +305,7 @@ def secured(self):
         return self._secured
 
     @secured.setter
-    def secured(self, secured):
+    def secured(self, secured: bool):
         """Sets the secured of this ApplicationHarnessConfig.
 
         When true, the application is shielded with a getekeeper  # noqa: E501
@@ -320,7 +317,7 @@ def secured(self, secured):
         self._secured = secured
 
     @property
-    def uri_role_mapping(self):
+    def uri_role_mapping(self) -> List[UriRoleMappingConfig]:
         """Gets the uri_role_mapping of this ApplicationHarnessConfig.
 
         Map uri/roles to secure with the Gatekeeper (if `secured: true`)  # noqa: E501
@@ -331,7 +328,7 @@ def uri_role_mapping(self):
         return self._uri_role_mapping
 
     @uri_role_mapping.setter
-    def uri_role_mapping(self, uri_role_mapping):
+    def uri_role_mapping(self, uri_role_mapping: List[UriRoleMappingConfig]):
         """Sets the uri_role_mapping of this ApplicationHarnessConfig.
 
         Map uri/roles to secure with the Gatekeeper (if `secured: true`)  # noqa: E501
@@ -343,7 +340,7 @@ def uri_role_mapping(self, uri_role_mapping):
         self._uri_role_mapping = uri_role_mapping
 
     @property
-    def secrets(self):
+    def secrets(self) -> Dict[str, object]:
         """Gets the secrets of this ApplicationHarnessConfig.
 
           # noqa: E501
@@ -354,7 +351,7 @@ def secrets(self):
         return self._secrets
 
     @secrets.setter
-    def secrets(self, secrets):
+    def secrets(self, secrets: Dict[str, object]):
         """Sets the secrets of this ApplicationHarnessConfig.
 
           # noqa: E501
@@ -366,7 +363,7 @@ def secrets(self, secrets):
         self._secrets = secrets
 
     @property
-    def use_services(self):
+    def use_services(self) -> List[str]:
         """Gets the use_services of this ApplicationHarnessConfig.
 
         Specify which services this application uses in the frontend to create proxy ingresses. e.g.  ``` - name: samples ```  # noqa: E501
@@ -377,7 +374,7 @@ def use_services(self):
         return self._use_services
 
     @use_services.setter
-    def use_services(self, use_services):
+    def use_services(self, use_services: List[str]):
         """Sets the use_services of this ApplicationHarnessConfig.
 
         Specify which services this application uses in the frontend to create proxy ingresses. e.g.  ``` - name: samples ```  # noqa: E501
@@ -389,7 +386,7 @@ def use_services(self, use_services):
         self._use_services = use_services
 
     @property
-    def database(self):
+    def database(self) -> DatabaseDeploymentConfig:
         """Gets the database of this ApplicationHarnessConfig.
 
 
@@ -399,7 +396,7 @@ def database(self):
         return self._database
 
     @database.setter
-    def database(self, database):
+    def database(self, database: DatabaseDeploymentConfig):
         """Sets the database of this ApplicationHarnessConfig.
 
 
@@ -410,7 +407,7 @@ def database(self, database):
         self._database = database
 
     @property
-    def resources(self):
+    def resources(self) -> List[FileResourcesConfig]:
         """Gets the resources of this ApplicationHarnessConfig.
 
         Application file resources. Maps from deploy/resources folder and mounts as configmaps  # noqa: E501
@@ -421,7 +418,7 @@ def resources(self):
         return self._resources
 
     @resources.setter
-    def resources(self, resources):
+    def resources(self, resources: List[FileResourcesConfig]):
         """Sets the resources of this ApplicationHarnessConfig.
 
         Application file resources. Maps from deploy/resources folder and mounts as configmaps  # noqa: E501
@@ -433,7 +430,7 @@ def resources(self, resources):
         self._resources = resources
 
     @property
-    def readiness_probe(self):
+    def readiness_probe(self) -> ApplicationProbe:
         """Gets the readiness_probe of this ApplicationHarnessConfig.
 
 
@@ -443,7 +440,7 @@ def readiness_probe(self):
         return self._readiness_probe
 
     @readiness_probe.setter
-    def readiness_probe(self, readiness_probe):
+    def readiness_probe(self, readiness_probe: ApplicationProbe):
         """Sets the readiness_probe of this ApplicationHarnessConfig.
 
 
@@ -454,7 +451,7 @@ def readiness_probe(self, readiness_probe):
         self._readiness_probe = readiness_probe
 
     @property
-    def startup_probe(self):
+    def startup_probe(self) -> ApplicationProbe:
         """Gets the startup_probe of this ApplicationHarnessConfig.
 
 
@@ -464,7 +461,7 @@ def startup_probe(self):
         return self._startup_probe
 
     @startup_probe.setter
-    def startup_probe(self, startup_probe):
+    def startup_probe(self, startup_probe: ApplicationProbe):
         """Sets the startup_probe of this ApplicationHarnessConfig.
 
 
@@ -475,7 +472,7 @@ def startup_probe(self, startup_probe):
         self._startup_probe = startup_probe
 
     @property
-    def liveness_probe(self):
+    def liveness_probe(self) -> ApplicationProbe:
         """Gets the liveness_probe of this ApplicationHarnessConfig.
 
 
@@ -485,7 +482,7 @@ def liveness_probe(self):
         return self._liveness_probe
 
     @liveness_probe.setter
-    def liveness_probe(self, liveness_probe):
+    def liveness_probe(self, liveness_probe: ApplicationProbe):
         """Sets the liveness_probe of this ApplicationHarnessConfig.
 
 
@@ -496,7 +493,7 @@ def liveness_probe(self, liveness_probe):
         self._liveness_probe = liveness_probe
 
     @property
-    def source_root(self):
+    def source_root(self) -> str:
         """Gets the source_root of this ApplicationHarnessConfig.
 
           # noqa: E501
@@ -507,7 +504,7 @@ def source_root(self):
         return self._source_root
 
     @source_root.setter
-    def source_root(self, source_root):
+    def source_root(self, source_root: str):
         """Sets the source_root of this ApplicationHarnessConfig.
 
           # noqa: E501
@@ -521,7 +518,7 @@ def source_root(self, source_root):
         self._source_root = source_root
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this ApplicationHarnessConfig.
 
         Application's name. Do not edit, the value is automatically set from the application directory's name  # noqa: E501
@@ -532,7 +529,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this ApplicationHarnessConfig.
 
         Application's name. Do not edit, the value is automatically set from the application directory's name  # noqa: E501
@@ -544,7 +541,7 @@ def name(self, name):
         self._name = name
 
     @property
-    def jupyterhub(self):
+    def jupyterhub(self) -> JupyterHubConfig:
         """Gets the jupyterhub of this ApplicationHarnessConfig.
 
 
@@ -554,7 +551,7 @@ def jupyterhub(self):
         return self._jupyterhub
 
     @jupyterhub.setter
-    def jupyterhub(self, jupyterhub):
+    def jupyterhub(self, jupyterhub: JupyterHubConfig):
         """Sets the jupyterhub of this ApplicationHarnessConfig.
 
 
@@ -565,7 +562,7 @@ def jupyterhub(self, jupyterhub):
         self._jupyterhub = jupyterhub
 
     @property
-    def accounts(self):
+    def accounts(self) -> ApplicationAccountsConfig:
         """Gets the accounts of this ApplicationHarnessConfig.
 
 
@@ -575,7 +572,7 @@ def accounts(self):
         return self._accounts
 
     @accounts.setter
-    def accounts(self, accounts):
+    def accounts(self, accounts: ApplicationAccountsConfig):
         """Sets the accounts of this ApplicationHarnessConfig.
 
 
@@ -586,7 +583,7 @@ def accounts(self, accounts):
         self._accounts = accounts
 
     @property
-    def test(self):
+    def test(self) -> ApplicationTestConfig:
         """Gets the test of this ApplicationHarnessConfig.
 
 
@@ -596,7 +593,7 @@ def test(self):
         return self._test
 
     @test.setter
-    def test(self, test):
+    def test(self, test: ApplicationTestConfig):
         """Sets the test of this ApplicationHarnessConfig.
 
 
@@ -607,7 +604,7 @@ def test(self, test):
         self._test = test
 
     @property
-    def quotas(self):
+    def quotas(self) -> Dict[str, object]:
         """Gets the quotas of this ApplicationHarnessConfig.
 
           # noqa: E501
@@ -618,7 +615,7 @@ def quotas(self):
         return self._quotas
 
     @quotas.setter
-    def quotas(self, quotas):
+    def quotas(self, quotas: Dict[str, object]):
         """Sets the quotas of this ApplicationHarnessConfig.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/application_probe.py b/libraries/models/cloudharness_model/models/application_probe.py
index b1819df4..75864acc 100644
--- a/libraries/models/cloudharness_model/models/application_probe.py
+++ b/libraries/models/cloudharness_model/models/application_probe.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -58,7 +55,7 @@ def from_dict(cls, dikt) -> 'ApplicationProbe':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def path(self):
+    def path(self) -> str:
         """Gets the path of this ApplicationProbe.
 
           # noqa: E501
@@ -69,7 +66,7 @@ def path(self):
         return self._path
 
     @path.setter
-    def path(self, path):
+    def path(self, path: str):
         """Sets the path of this ApplicationProbe.
 
           # noqa: E501
@@ -83,7 +80,7 @@ def path(self, path):
         self._path = path
 
     @property
-    def period_seconds(self):
+    def period_seconds(self) -> float:
         """Gets the period_seconds of this ApplicationProbe.
 
           # noqa: E501
@@ -94,7 +91,7 @@ def period_seconds(self):
         return self._period_seconds
 
     @period_seconds.setter
-    def period_seconds(self, period_seconds):
+    def period_seconds(self, period_seconds: float):
         """Sets the period_seconds of this ApplicationProbe.
 
           # noqa: E501
@@ -106,7 +103,7 @@ def period_seconds(self, period_seconds):
         self._period_seconds = period_seconds
 
     @property
-    def failure_threshold(self):
+    def failure_threshold(self) -> float:
         """Gets the failure_threshold of this ApplicationProbe.
 
           # noqa: E501
@@ -117,7 +114,7 @@ def failure_threshold(self):
         return self._failure_threshold
 
     @failure_threshold.setter
-    def failure_threshold(self, failure_threshold):
+    def failure_threshold(self, failure_threshold: float):
         """Sets the failure_threshold of this ApplicationProbe.
 
           # noqa: E501
@@ -129,7 +126,7 @@ def failure_threshold(self, failure_threshold):
         self._failure_threshold = failure_threshold
 
     @property
-    def initial_delay_seconds(self):
+    def initial_delay_seconds(self) -> float:
         """Gets the initial_delay_seconds of this ApplicationProbe.
 
           # noqa: E501
@@ -140,7 +137,7 @@ def initial_delay_seconds(self):
         return self._initial_delay_seconds
 
     @initial_delay_seconds.setter
-    def initial_delay_seconds(self, initial_delay_seconds):
+    def initial_delay_seconds(self, initial_delay_seconds: float):
         """Sets the initial_delay_seconds of this ApplicationProbe.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/application_test_config.py b/libraries/models/cloudharness_model/models/application_test_config.py
index a9133dd0..3ad31523 100644
--- a/libraries/models/cloudharness_model/models/application_test_config.py
+++ b/libraries/models/cloudharness_model/models/application_test_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.api_tests_config import ApiTestsConfig
 from cloudharness_model.models.e2_e_tests_config import E2ETestsConfig
 from cloudharness_model.models.unit_tests_config import UnitTestsConfig
@@ -59,7 +56,7 @@ def from_dict(cls, dikt) -> 'ApplicationTestConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def unit(self):
+    def unit(self) -> UnitTestsConfig:
         """Gets the unit of this ApplicationTestConfig.
 
 
@@ -69,7 +66,7 @@ def unit(self):
         return self._unit
 
     @unit.setter
-    def unit(self, unit):
+    def unit(self, unit: UnitTestsConfig):
         """Sets the unit of this ApplicationTestConfig.
 
 
@@ -82,7 +79,7 @@ def unit(self, unit):
         self._unit = unit
 
     @property
-    def api(self):
+    def api(self) -> ApiTestsConfig:
         """Gets the api of this ApplicationTestConfig.
 
 
@@ -92,7 +89,7 @@ def api(self):
         return self._api
 
     @api.setter
-    def api(self, api):
+    def api(self, api: ApiTestsConfig):
         """Sets the api of this ApplicationTestConfig.
 
 
@@ -105,7 +102,7 @@ def api(self, api):
         self._api = api
 
     @property
-    def e2e(self):
+    def e2e(self) -> E2ETestsConfig:
         """Gets the e2e of this ApplicationTestConfig.
 
 
@@ -115,7 +112,7 @@ def e2e(self):
         return self._e2e
 
     @e2e.setter
-    def e2e(self, e2e):
+    def e2e(self, e2e: E2ETestsConfig):
         """Sets the e2e of this ApplicationTestConfig.
 
 
diff --git a/libraries/models/cloudharness_model/models/application_user.py b/libraries/models/cloudharness_model/models/application_user.py
index 823be12b..991d8ea3 100644
--- a/libraries/models/cloudharness_model/models/application_user.py
+++ b/libraries/models/cloudharness_model/models/application_user.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -58,7 +55,7 @@ def from_dict(cls, dikt) -> 'ApplicationUser':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def username(self):
+    def username(self) -> str:
         """Gets the username of this ApplicationUser.
 
           # noqa: E501
@@ -69,7 +66,7 @@ def username(self):
         return self._username
 
     @username.setter
-    def username(self, username):
+    def username(self, username: str):
         """Sets the username of this ApplicationUser.
 
           # noqa: E501
@@ -83,7 +80,7 @@ def username(self, username):
         self._username = username
 
     @property
-    def password(self):
+    def password(self) -> str:
         """Gets the password of this ApplicationUser.
 
           # noqa: E501
@@ -94,7 +91,7 @@ def password(self):
         return self._password
 
     @password.setter
-    def password(self, password):
+    def password(self, password: str):
         """Sets the password of this ApplicationUser.
 
           # noqa: E501
@@ -106,7 +103,7 @@ def password(self, password):
         self._password = password
 
     @property
-    def client_roles(self):
+    def client_roles(self) -> List[str]:
         """Gets the client_roles of this ApplicationUser.
 
           # noqa: E501
@@ -117,7 +114,7 @@ def client_roles(self):
         return self._client_roles
 
     @client_roles.setter
-    def client_roles(self, client_roles):
+    def client_roles(self, client_roles: List[str]):
         """Sets the client_roles of this ApplicationUser.
 
           # noqa: E501
@@ -129,7 +126,7 @@ def client_roles(self, client_roles):
         self._client_roles = client_roles
 
     @property
-    def realm_roles(self):
+    def realm_roles(self) -> List[str]:
         """Gets the realm_roles of this ApplicationUser.
 
           # noqa: E501
@@ -140,7 +137,7 @@ def realm_roles(self):
         return self._realm_roles
 
     @realm_roles.setter
-    def realm_roles(self, realm_roles):
+    def realm_roles(self, realm_roles: List[str]):
         """Sets the realm_roles of this ApplicationUser.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/auto_artifact_spec.py b/libraries/models/cloudharness_model/models/auto_artifact_spec.py
index 9aebfd4f..c0c89ac3 100644
--- a/libraries/models/cloudharness_model/models/auto_artifact_spec.py
+++ b/libraries/models/cloudharness_model/models/auto_artifact_spec.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -48,7 +45,7 @@ def from_dict(cls, dikt) -> 'AutoArtifactSpec':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def auto(self):
+    def auto(self) -> bool:
         """Gets the auto of this AutoArtifactSpec.
 
         When true, enables automatic template  # noqa: E501
@@ -59,7 +56,7 @@ def auto(self):
         return self._auto
 
     @auto.setter
-    def auto(self, auto):
+    def auto(self, auto: bool):
         """Sets the auto of this AutoArtifactSpec.
 
         When true, enables automatic template  # noqa: E501
@@ -73,7 +70,7 @@ def auto(self, auto):
         self._auto = auto
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this AutoArtifactSpec.
 
           # noqa: E501
@@ -84,7 +81,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this AutoArtifactSpec.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/backup_config.py b/libraries/models/cloudharness_model/models/backup_config.py
index 254c52f7..0613c70d 100644
--- a/libraries/models/cloudharness_model/models/backup_config.py
+++ b/libraries/models/cloudharness_model/models/backup_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 import re
 from cloudharness_model import util
@@ -87,7 +84,7 @@ def from_dict(cls, dikt) -> 'BackupConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def active(self):
+    def active(self) -> bool:
         """Gets the active of this BackupConfig.
 
           # noqa: E501
@@ -98,7 +95,7 @@ def active(self):
         return self._active
 
     @active.setter
-    def active(self, active):
+    def active(self, active: bool):
         """Sets the active of this BackupConfig.
 
           # noqa: E501
@@ -110,7 +107,7 @@ def active(self, active):
         self._active = active
 
     @property
-    def keep_days(self):
+    def keep_days(self) -> int:
         """Gets the keep_days of this BackupConfig.
 
           # noqa: E501
@@ -121,7 +118,7 @@ def keep_days(self):
         return self._keep_days
 
     @keep_days.setter
-    def keep_days(self, keep_days):
+    def keep_days(self, keep_days: int):
         """Sets the keep_days of this BackupConfig.
 
           # noqa: E501
@@ -133,7 +130,7 @@ def keep_days(self, keep_days):
         self._keep_days = keep_days
 
     @property
-    def keep_weeks(self):
+    def keep_weeks(self) -> int:
         """Gets the keep_weeks of this BackupConfig.
 
           # noqa: E501
@@ -144,7 +141,7 @@ def keep_weeks(self):
         return self._keep_weeks
 
     @keep_weeks.setter
-    def keep_weeks(self, keep_weeks):
+    def keep_weeks(self, keep_weeks: int):
         """Sets the keep_weeks of this BackupConfig.
 
           # noqa: E501
@@ -156,7 +153,7 @@ def keep_weeks(self, keep_weeks):
         self._keep_weeks = keep_weeks
 
     @property
-    def keep_months(self):
+    def keep_months(self) -> int:
         """Gets the keep_months of this BackupConfig.
 
           # noqa: E501
@@ -167,7 +164,7 @@ def keep_months(self):
         return self._keep_months
 
     @keep_months.setter
-    def keep_months(self, keep_months):
+    def keep_months(self, keep_months: int):
         """Sets the keep_months of this BackupConfig.
 
           # noqa: E501
@@ -179,7 +176,7 @@ def keep_months(self, keep_months):
         self._keep_months = keep_months
 
     @property
-    def schedule(self):
+    def schedule(self) -> str:
         """Gets the schedule of this BackupConfig.
 
         Cron expression  # noqa: E501
@@ -190,7 +187,7 @@ def schedule(self):
         return self._schedule
 
     @schedule.setter
-    def schedule(self, schedule):
+    def schedule(self, schedule: str):
         """Sets the schedule of this BackupConfig.
 
         Cron expression  # noqa: E501
@@ -204,7 +201,7 @@ def schedule(self, schedule):
         self._schedule = schedule
 
     @property
-    def suffix(self):
+    def suffix(self) -> object:
         """Gets the suffix of this BackupConfig.
 
         The file suffix added to backup files  # noqa: E501
@@ -215,7 +212,7 @@ def suffix(self):
         return self._suffix
 
     @suffix.setter
-    def suffix(self, suffix):
+    def suffix(self, suffix: object):
         """Sets the suffix of this BackupConfig.
 
         The file suffix added to backup files  # noqa: E501
@@ -227,7 +224,7 @@ def suffix(self, suffix):
         self._suffix = suffix
 
     @property
-    def volumesize(self):
+    def volumesize(self) -> str:
         """Gets the volumesize of this BackupConfig.
 
         The volume size for backups (all backups share the same volume)  # noqa: E501
@@ -238,7 +235,7 @@ def volumesize(self):
         return self._volumesize
 
     @volumesize.setter
-    def volumesize(self, volumesize):
+    def volumesize(self, volumesize: str):
         """Sets the volumesize of this BackupConfig.
 
         The volume size for backups (all backups share the same volume)  # noqa: E501
@@ -250,7 +247,7 @@ def volumesize(self, volumesize):
         self._volumesize = volumesize
 
     @property
-    def dir(self):
+    def dir(self) -> str:
         """Gets the dir of this BackupConfig.
 
           # noqa: E501
@@ -261,7 +258,7 @@ def dir(self):
         return self._dir
 
     @dir.setter
-    def dir(self, dir):
+    def dir(self, dir: str):
         """Sets the dir of this BackupConfig.
 
           # noqa: E501
@@ -277,7 +274,7 @@ def dir(self, dir):
         self._dir = dir
 
     @property
-    def resources(self):
+    def resources(self) -> DeploymentResourcesConf:
         """Gets the resources of this BackupConfig.
 
 
@@ -287,7 +284,7 @@ def resources(self):
         return self._resources
 
     @resources.setter
-    def resources(self, resources):
+    def resources(self, resources: DeploymentResourcesConf):
         """Sets the resources of this BackupConfig.
 
 
diff --git a/libraries/models/cloudharness_model/models/base_model.py b/libraries/models/cloudharness_model/models/base_model.py
new file mode 100644
index 00000000..0938bbc9
--- /dev/null
+++ b/libraries/models/cloudharness_model/models/base_model.py
@@ -0,0 +1,68 @@
+import pprint
+
+import typing
+
+from cloudharness_model import util
+
+T = typing.TypeVar('T')
+
+
+class Model:
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types: typing.Dict[str, type] = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map: typing.Dict[str, str] = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr in self.openapi_types:
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/libraries/models/cloudharness_model/models/cdc_event.py b/libraries/models/cloudharness_model/models/cdc_event.py
index 1ba4f017..b8861ad1 100644
--- a/libraries/models/cloudharness_model/models/cdc_event.py
+++ b/libraries/models/cloudharness_model/models/cdc_event.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.cdc_event_meta import CDCEventMeta
 from cloudharness_model import util
 
@@ -65,7 +62,7 @@ def from_dict(cls, dikt) -> 'CDCEvent':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def operation(self):
+    def operation(self) -> str:
         """Gets the operation of this CDCEvent.
 
         the operation on the object e.g. create / update / delete  # noqa: E501
@@ -76,7 +73,7 @@ def operation(self):
         return self._operation
 
     @operation.setter
-    def operation(self, operation):
+    def operation(self, operation: str):
         """Sets the operation of this CDCEvent.
 
         the operation on the object e.g. create / update / delete  # noqa: E501
@@ -94,7 +91,7 @@ def operation(self, operation):
         self._operation = operation
 
     @property
-    def uid(self):
+    def uid(self) -> str:
         """Gets the uid of this CDCEvent.
 
         the unique identifier attribute of the object  # noqa: E501
@@ -105,7 +102,7 @@ def uid(self):
         return self._uid
 
     @uid.setter
-    def uid(self, uid):
+    def uid(self, uid: str):
         """Sets the uid of this CDCEvent.
 
         the unique identifier attribute of the object  # noqa: E501
@@ -119,7 +116,7 @@ def uid(self, uid):
         self._uid = uid
 
     @property
-    def message_type(self):
+    def message_type(self) -> str:
         """Gets the message_type of this CDCEvent.
 
         the type of the message (relates to the object type) e.g. jobs  # noqa: E501
@@ -130,7 +127,7 @@ def message_type(self):
         return self._message_type
 
     @message_type.setter
-    def message_type(self, message_type):
+    def message_type(self, message_type: str):
         """Sets the message_type of this CDCEvent.
 
         the type of the message (relates to the object type) e.g. jobs  # noqa: E501
@@ -144,7 +141,7 @@ def message_type(self, message_type):
         self._message_type = message_type
 
     @property
-    def resource(self):
+    def resource(self) -> Dict[str, object]:
         """Gets the resource of this CDCEvent.
 
           # noqa: E501
@@ -155,7 +152,7 @@ def resource(self):
         return self._resource
 
     @resource.setter
-    def resource(self, resource):
+    def resource(self, resource: Dict[str, object]):
         """Sets the resource of this CDCEvent.
 
           # noqa: E501
@@ -167,7 +164,7 @@ def resource(self, resource):
         self._resource = resource
 
     @property
-    def meta(self):
+    def meta(self) -> CDCEventMeta:
         """Gets the meta of this CDCEvent.
 
 
@@ -177,7 +174,7 @@ def meta(self):
         return self._meta
 
     @meta.setter
-    def meta(self, meta):
+    def meta(self, meta: CDCEventMeta):
         """Sets the meta of this CDCEvent.
 
 
diff --git a/libraries/models/cloudharness_model/models/cdc_event_meta.py b/libraries/models/cloudharness_model/models/cdc_event_meta.py
index d88e57d1..78db4e05 100644
--- a/libraries/models/cloudharness_model/models/cdc_event_meta.py
+++ b/libraries/models/cloudharness_model/models/cdc_event_meta.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.user import User
 from cloudharness_model import util
 
@@ -25,7 +22,7 @@ def __init__(self, app_name=None, user=None, args=None, kwargs=None, description
         :param user: The user of this CDCEventMeta.  # noqa: E501
         :type user: User
         :param args: The args of this CDCEventMeta.  # noqa: E501
-        :type args: List[Dict]
+        :type args: List[Dict[str, object]]
         :param kwargs: The kwargs of this CDCEventMeta.  # noqa: E501
         :type kwargs: object
         :param description: The description of this CDCEventMeta.  # noqa: E501
@@ -34,7 +31,7 @@ def __init__(self, app_name=None, user=None, args=None, kwargs=None, description
         self.openapi_types = {
             'app_name': str,
             'user': User,
-            'args': List[Dict],
+            'args': List[Dict[str, object]],
             'kwargs': object,
             'description': str
         }
@@ -65,7 +62,7 @@ def from_dict(cls, dikt) -> 'CDCEventMeta':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def app_name(self):
+    def app_name(self) -> str:
         """Gets the app_name of this CDCEventMeta.
 
         The name of the application/microservice sending the message  # noqa: E501
@@ -76,7 +73,7 @@ def app_name(self):
         return self._app_name
 
     @app_name.setter
-    def app_name(self, app_name):
+    def app_name(self, app_name: str):
         """Sets the app_name of this CDCEventMeta.
 
         The name of the application/microservice sending the message  # noqa: E501
@@ -90,7 +87,7 @@ def app_name(self, app_name):
         self._app_name = app_name
 
     @property
-    def user(self):
+    def user(self) -> User:
         """Gets the user of this CDCEventMeta.
 
 
@@ -100,7 +97,7 @@ def user(self):
         return self._user
 
     @user.setter
-    def user(self, user):
+    def user(self, user: User):
         """Sets the user of this CDCEventMeta.
 
 
@@ -111,30 +108,30 @@ def user(self, user):
         self._user = user
 
     @property
-    def args(self):
+    def args(self) -> List[Dict[str, object]]:
         """Gets the args of this CDCEventMeta.
 
         the caller function arguments  # noqa: E501
 
         :return: The args of this CDCEventMeta.
-        :rtype: List[Dict]
+        :rtype: List[Dict[str, object]]
         """
         return self._args
 
     @args.setter
-    def args(self, args):
+    def args(self, args: List[Dict[str, object]]):
         """Sets the args of this CDCEventMeta.
 
         the caller function arguments  # noqa: E501
 
         :param args: The args of this CDCEventMeta.
-        :type args: List[Dict]
+        :type args: List[Dict[str, object]]
         """
 
         self._args = args
 
     @property
-    def kwargs(self):
+    def kwargs(self) -> object:
         """Gets the kwargs of this CDCEventMeta.
 
         the caller function keyword arguments  # noqa: E501
@@ -145,7 +142,7 @@ def kwargs(self):
         return self._kwargs
 
     @kwargs.setter
-    def kwargs(self, kwargs):
+    def kwargs(self, kwargs: object):
         """Sets the kwargs of this CDCEventMeta.
 
         the caller function keyword arguments  # noqa: E501
@@ -157,7 +154,7 @@ def kwargs(self, kwargs):
         self._kwargs = kwargs
 
     @property
-    def description(self):
+    def description(self) -> str:
         """Gets the description of this CDCEventMeta.
 
         General description -- for human consumption  # noqa: E501
@@ -168,7 +165,7 @@ def description(self):
         return self._description
 
     @description.setter
-    def description(self, description):
+    def description(self, description: str):
         """Sets the description of this CDCEventMeta.
 
         General description -- for human consumption  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/cpu_memory_config.py b/libraries/models/cloudharness_model/models/cpu_memory_config.py
index cab9bf7c..8f4f1e70 100644
--- a/libraries/models/cloudharness_model/models/cpu_memory_config.py
+++ b/libraries/models/cloudharness_model/models/cpu_memory_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -48,7 +45,7 @@ def from_dict(cls, dikt) -> 'CpuMemoryConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def cpu(self):
+    def cpu(self) -> str:
         """Gets the cpu of this CpuMemoryConfig.
 
           # noqa: E501
@@ -59,7 +56,7 @@ def cpu(self):
         return self._cpu
 
     @cpu.setter
-    def cpu(self, cpu):
+    def cpu(self, cpu: str):
         """Sets the cpu of this CpuMemoryConfig.
 
           # noqa: E501
@@ -71,7 +68,7 @@ def cpu(self, cpu):
         self._cpu = cpu
 
     @property
-    def memory(self):
+    def memory(self) -> str:
         """Gets the memory of this CpuMemoryConfig.
 
           # noqa: E501
@@ -82,7 +79,7 @@ def memory(self):
         return self._memory
 
     @memory.setter
-    def memory(self, memory):
+    def memory(self, memory: str):
         """Sets the memory of this CpuMemoryConfig.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/database_deployment_config.py b/libraries/models/cloudharness_model/models/database_deployment_config.py
index 3786fb89..1be424a2 100644
--- a/libraries/models/cloudharness_model/models/database_deployment_config.py
+++ b/libraries/models/cloudharness_model/models/database_deployment_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 import re
 from cloudharness_model import util
@@ -19,9 +16,13 @@ class DatabaseDeploymentConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, type=None, size=None, user=None, _pass=None, image_ref=None, mongo=None, postgres=None, neo4j=None, resources=None, auto=None, name=None):  # noqa: E501
+    def __init__(self, auto=None, name=None, type=None, size=None, user=None, _pass=None, image_ref=None, mongo=None, postgres=None, neo4j=None, resources=None):  # noqa: E501
         """DatabaseDeploymentConfig - a model defined in OpenAPI
 
+        :param auto: The auto of this DatabaseDeploymentConfig.  # noqa: E501
+        :type auto: bool
+        :param name: The name of this DatabaseDeploymentConfig.  # noqa: E501
+        :type name: str
         :param type: The type of this DatabaseDeploymentConfig.  # noqa: E501
         :type type: str
         :param size: The size of this DatabaseDeploymentConfig.  # noqa: E501
@@ -40,12 +41,10 @@ def __init__(self, type=None, size=None, user=None, _pass=None, image_ref=None,
         :type neo4j: object
         :param resources: The resources of this DatabaseDeploymentConfig.  # noqa: E501
         :type resources: DeploymentResourcesConf
-        :param auto: The auto of this DatabaseDeploymentConfig.  # noqa: E501
-        :type auto: bool
-        :param name: The name of this DatabaseDeploymentConfig.  # noqa: E501
-        :type name: str
         """
         self.openapi_types = {
+            'auto': bool,
+            'name': str,
             'type': str,
             'size': str,
             'user': str,
@@ -54,12 +53,12 @@ def __init__(self, type=None, size=None, user=None, _pass=None, image_ref=None,
             'mongo': Dict[str, object],
             'postgres': Dict[str, object],
             'neo4j': object,
-            'resources': DeploymentResourcesConf,
-            'auto': bool,
-            'name': str
+            'resources': DeploymentResourcesConf
         }
 
         self.attribute_map = {
+            'auto': 'auto',
+            'name': 'name',
             'type': 'type',
             'size': 'size',
             'user': 'user',
@@ -68,11 +67,11 @@ def __init__(self, type=None, size=None, user=None, _pass=None, image_ref=None,
             'mongo': 'mongo',
             'postgres': 'postgres',
             'neo4j': 'neo4j',
-            'resources': 'resources',
-            'auto': 'auto',
-            'name': 'name'
+            'resources': 'resources'
         }
 
+        self._auto = auto
+        self._name = name
         self._type = type
         self._size = size
         self._user = user
@@ -82,8 +81,6 @@ def __init__(self, type=None, size=None, user=None, _pass=None, image_ref=None,
         self._postgres = postgres
         self._neo4j = neo4j
         self._resources = resources
-        self._auto = auto
-        self._name = name
 
     @classmethod
     def from_dict(cls, dikt) -> 'DatabaseDeploymentConfig':
@@ -97,7 +94,55 @@ def from_dict(cls, dikt) -> 'DatabaseDeploymentConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def type(self):
+    def auto(self) -> bool:
+        """Gets the auto of this DatabaseDeploymentConfig.
+
+        When true, enables automatic template  # noqa: E501
+
+        :return: The auto of this DatabaseDeploymentConfig.
+        :rtype: bool
+        """
+        return self._auto
+
+    @auto.setter
+    def auto(self, auto: bool):
+        """Sets the auto of this DatabaseDeploymentConfig.
+
+        When true, enables automatic template  # noqa: E501
+
+        :param auto: The auto of this DatabaseDeploymentConfig.
+        :type auto: bool
+        """
+        if auto is None:
+            raise ValueError("Invalid value for `auto`, must not be `None`")  # noqa: E501
+
+        self._auto = auto
+
+    @property
+    def name(self) -> str:
+        """Gets the name of this DatabaseDeploymentConfig.
+
+          # noqa: E501
+
+        :return: The name of this DatabaseDeploymentConfig.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name: str):
+        """Sets the name of this DatabaseDeploymentConfig.
+
+          # noqa: E501
+
+        :param name: The name of this DatabaseDeploymentConfig.
+        :type name: str
+        """
+
+        self._name = name
+
+    @property
+    def type(self) -> str:
         """Gets the type of this DatabaseDeploymentConfig.
 
         Define the database type.  One of (mongo, postgres, neo4j, sqlite3)  # noqa: E501
@@ -108,7 +153,7 @@ def type(self):
         return self._type
 
     @type.setter
-    def type(self, type):
+    def type(self, type: str):
         """Sets the type of this DatabaseDeploymentConfig.
 
         Define the database type.  One of (mongo, postgres, neo4j, sqlite3)  # noqa: E501
@@ -122,7 +167,7 @@ def type(self, type):
         self._type = type
 
     @property
-    def size(self):
+    def size(self) -> str:
         """Gets the size of this DatabaseDeploymentConfig.
 
         Specify database disk size  # noqa: E501
@@ -133,7 +178,7 @@ def size(self):
         return self._size
 
     @size.setter
-    def size(self, size):
+    def size(self, size: str):
         """Sets the size of this DatabaseDeploymentConfig.
 
         Specify database disk size  # noqa: E501
@@ -145,7 +190,7 @@ def size(self, size):
         self._size = size
 
     @property
-    def user(self):
+    def user(self) -> str:
         """Gets the user of this DatabaseDeploymentConfig.
 
         database username  # noqa: E501
@@ -156,7 +201,7 @@ def user(self):
         return self._user
 
     @user.setter
-    def user(self, user):
+    def user(self, user: str):
         """Sets the user of this DatabaseDeploymentConfig.
 
         database username  # noqa: E501
@@ -168,7 +213,7 @@ def user(self, user):
         self._user = user
 
     @property
-    def _pass(self):
+    def _pass(self) -> str:
         """Gets the _pass of this DatabaseDeploymentConfig.
 
         Database password  # noqa: E501
@@ -179,7 +224,7 @@ def _pass(self):
         return self.__pass
 
     @_pass.setter
-    def _pass(self, _pass):
+    def _pass(self, _pass: str):
         """Sets the _pass of this DatabaseDeploymentConfig.
 
         Database password  # noqa: E501
@@ -191,7 +236,7 @@ def _pass(self, _pass):
         self.__pass = _pass
 
     @property
-    def image_ref(self):
+    def image_ref(self) -> str:
         """Gets the image_ref of this DatabaseDeploymentConfig.
 
         Used for referencing images from the build  # noqa: E501
@@ -202,7 +247,7 @@ def image_ref(self):
         return self._image_ref
 
     @image_ref.setter
-    def image_ref(self, image_ref):
+    def image_ref(self, image_ref: str):
         """Sets the image_ref of this DatabaseDeploymentConfig.
 
         Used for referencing images from the build  # noqa: E501
@@ -214,7 +259,7 @@ def image_ref(self, image_ref):
         self._image_ref = image_ref
 
     @property
-    def mongo(self):
+    def mongo(self) -> Dict[str, object]:
         """Gets the mongo of this DatabaseDeploymentConfig.
 
           # noqa: E501
@@ -225,7 +270,7 @@ def mongo(self):
         return self._mongo
 
     @mongo.setter
-    def mongo(self, mongo):
+    def mongo(self, mongo: Dict[str, object]):
         """Sets the mongo of this DatabaseDeploymentConfig.
 
           # noqa: E501
@@ -237,7 +282,7 @@ def mongo(self, mongo):
         self._mongo = mongo
 
     @property
-    def postgres(self):
+    def postgres(self) -> Dict[str, object]:
         """Gets the postgres of this DatabaseDeploymentConfig.
 
           # noqa: E501
@@ -248,7 +293,7 @@ def postgres(self):
         return self._postgres
 
     @postgres.setter
-    def postgres(self, postgres):
+    def postgres(self, postgres: Dict[str, object]):
         """Sets the postgres of this DatabaseDeploymentConfig.
 
           # noqa: E501
@@ -260,7 +305,7 @@ def postgres(self, postgres):
         self._postgres = postgres
 
     @property
-    def neo4j(self):
+    def neo4j(self) -> object:
         """Gets the neo4j of this DatabaseDeploymentConfig.
 
         Neo4j database specific configuration  # noqa: E501
@@ -271,7 +316,7 @@ def neo4j(self):
         return self._neo4j
 
     @neo4j.setter
-    def neo4j(self, neo4j):
+    def neo4j(self, neo4j: object):
         """Sets the neo4j of this DatabaseDeploymentConfig.
 
         Neo4j database specific configuration  # noqa: E501
@@ -283,7 +328,7 @@ def neo4j(self, neo4j):
         self._neo4j = neo4j
 
     @property
-    def resources(self):
+    def resources(self) -> DeploymentResourcesConf:
         """Gets the resources of this DatabaseDeploymentConfig.
 
 
@@ -293,7 +338,7 @@ def resources(self):
         return self._resources
 
     @resources.setter
-    def resources(self, resources):
+    def resources(self, resources: DeploymentResourcesConf):
         """Sets the resources of this DatabaseDeploymentConfig.
 
 
@@ -302,51 +347,3 @@ def resources(self, resources):
         """
 
         self._resources = resources
-
-    @property
-    def auto(self):
-        """Gets the auto of this DatabaseDeploymentConfig.
-
-        When true, enables automatic template  # noqa: E501
-
-        :return: The auto of this DatabaseDeploymentConfig.
-        :rtype: bool
-        """
-        return self._auto
-
-    @auto.setter
-    def auto(self, auto):
-        """Sets the auto of this DatabaseDeploymentConfig.
-
-        When true, enables automatic template  # noqa: E501
-
-        :param auto: The auto of this DatabaseDeploymentConfig.
-        :type auto: bool
-        """
-        if auto is None:
-            raise ValueError("Invalid value for `auto`, must not be `None`")  # noqa: E501
-
-        self._auto = auto
-
-    @property
-    def name(self):
-        """Gets the name of this DatabaseDeploymentConfig.
-
-          # noqa: E501
-
-        :return: The name of this DatabaseDeploymentConfig.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this DatabaseDeploymentConfig.
-
-          # noqa: E501
-
-        :param name: The name of this DatabaseDeploymentConfig.
-        :type name: str
-        """
-
-        self._name = name
diff --git a/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py b/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py
index c72ac477..ab31de80 100644
--- a/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py
+++ b/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 from cloudharness_model.models.deployment_volume_spec import DeploymentVolumeSpec
 import re
@@ -21,9 +18,13 @@ class DeploymentAutoArtifactConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, port=None, replicas=None, image=None, resources=None, volume=None, auto=None, name=None):  # noqa: E501
+    def __init__(self, auto=None, name=None, port=None, replicas=None, image=None, resources=None, volume=None):  # noqa: E501
         """DeploymentAutoArtifactConfig - a model defined in OpenAPI
 
+        :param auto: The auto of this DeploymentAutoArtifactConfig.  # noqa: E501
+        :type auto: bool
+        :param name: The name of this DeploymentAutoArtifactConfig.  # noqa: E501
+        :type name: str
         :param port: The port of this DeploymentAutoArtifactConfig.  # noqa: E501
         :type port: str
         :param replicas: The replicas of this DeploymentAutoArtifactConfig.  # noqa: E501
@@ -34,38 +35,34 @@ def __init__(self, port=None, replicas=None, image=None, resources=None, volume=
         :type resources: DeploymentResourcesConf
         :param volume: The volume of this DeploymentAutoArtifactConfig.  # noqa: E501
         :type volume: DeploymentVolumeSpec
-        :param auto: The auto of this DeploymentAutoArtifactConfig.  # noqa: E501
-        :type auto: bool
-        :param name: The name of this DeploymentAutoArtifactConfig.  # noqa: E501
-        :type name: str
         """
         self.openapi_types = {
+            'auto': bool,
+            'name': str,
             'port': str,
             'replicas': int,
             'image': str,
             'resources': DeploymentResourcesConf,
-            'volume': DeploymentVolumeSpec,
-            'auto': bool,
-            'name': str
+            'volume': DeploymentVolumeSpec
         }
 
         self.attribute_map = {
+            'auto': 'auto',
+            'name': 'name',
             'port': 'port',
             'replicas': 'replicas',
             'image': 'image',
             'resources': 'resources',
-            'volume': 'volume',
-            'auto': 'auto',
-            'name': 'name'
+            'volume': 'volume'
         }
 
+        self._auto = auto
+        self._name = name
         self._port = port
         self._replicas = replicas
         self._image = image
         self._resources = resources
         self._volume = volume
-        self._auto = auto
-        self._name = name
 
     @classmethod
     def from_dict(cls, dikt) -> 'DeploymentAutoArtifactConfig':
@@ -79,7 +76,55 @@ def from_dict(cls, dikt) -> 'DeploymentAutoArtifactConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def port(self):
+    def auto(self) -> bool:
+        """Gets the auto of this DeploymentAutoArtifactConfig.
+
+        When true, enables automatic template  # noqa: E501
+
+        :return: The auto of this DeploymentAutoArtifactConfig.
+        :rtype: bool
+        """
+        return self._auto
+
+    @auto.setter
+    def auto(self, auto: bool):
+        """Sets the auto of this DeploymentAutoArtifactConfig.
+
+        When true, enables automatic template  # noqa: E501
+
+        :param auto: The auto of this DeploymentAutoArtifactConfig.
+        :type auto: bool
+        """
+        if auto is None:
+            raise ValueError("Invalid value for `auto`, must not be `None`")  # noqa: E501
+
+        self._auto = auto
+
+    @property
+    def name(self) -> str:
+        """Gets the name of this DeploymentAutoArtifactConfig.
+
+          # noqa: E501
+
+        :return: The name of this DeploymentAutoArtifactConfig.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name: str):
+        """Sets the name of this DeploymentAutoArtifactConfig.
+
+          # noqa: E501
+
+        :param name: The name of this DeploymentAutoArtifactConfig.
+        :type name: str
+        """
+
+        self._name = name
+
+    @property
+    def port(self) -> str:
         """Gets the port of this DeploymentAutoArtifactConfig.
 
         Deployment port  # noqa: E501
@@ -90,7 +135,7 @@ def port(self):
         return self._port
 
     @port.setter
-    def port(self, port):
+    def port(self, port: str):
         """Sets the port of this DeploymentAutoArtifactConfig.
 
         Deployment port  # noqa: E501
@@ -102,7 +147,7 @@ def port(self, port):
         self._port = port
 
     @property
-    def replicas(self):
+    def replicas(self) -> int:
         """Gets the replicas of this DeploymentAutoArtifactConfig.
 
         Number of replicas  # noqa: E501
@@ -113,7 +158,7 @@ def replicas(self):
         return self._replicas
 
     @replicas.setter
-    def replicas(self, replicas):
+    def replicas(self, replicas: int):
         """Sets the replicas of this DeploymentAutoArtifactConfig.
 
         Number of replicas  # noqa: E501
@@ -125,7 +170,7 @@ def replicas(self, replicas):
         self._replicas = replicas
 
     @property
-    def image(self):
+    def image(self) -> str:
         """Gets the image of this DeploymentAutoArtifactConfig.
 
         Image name to use in the deployment. Leave it blank to set from the application's Docker file  # noqa: E501
@@ -136,7 +181,7 @@ def image(self):
         return self._image
 
     @image.setter
-    def image(self, image):
+    def image(self, image: str):
         """Sets the image of this DeploymentAutoArtifactConfig.
 
         Image name to use in the deployment. Leave it blank to set from the application's Docker file  # noqa: E501
@@ -150,7 +195,7 @@ def image(self, image):
         self._image = image
 
     @property
-    def resources(self):
+    def resources(self) -> DeploymentResourcesConf:
         """Gets the resources of this DeploymentAutoArtifactConfig.
 
 
@@ -160,7 +205,7 @@ def resources(self):
         return self._resources
 
     @resources.setter
-    def resources(self, resources):
+    def resources(self, resources: DeploymentResourcesConf):
         """Sets the resources of this DeploymentAutoArtifactConfig.
 
 
@@ -171,7 +216,7 @@ def resources(self, resources):
         self._resources = resources
 
     @property
-    def volume(self):
+    def volume(self) -> DeploymentVolumeSpec:
         """Gets the volume of this DeploymentAutoArtifactConfig.
 
 
@@ -181,7 +226,7 @@ def volume(self):
         return self._volume
 
     @volume.setter
-    def volume(self, volume):
+    def volume(self, volume: DeploymentVolumeSpec):
         """Sets the volume of this DeploymentAutoArtifactConfig.
 
 
@@ -190,51 +235,3 @@ def volume(self, volume):
         """
 
         self._volume = volume
-
-    @property
-    def auto(self):
-        """Gets the auto of this DeploymentAutoArtifactConfig.
-
-        When true, enables automatic template  # noqa: E501
-
-        :return: The auto of this DeploymentAutoArtifactConfig.
-        :rtype: bool
-        """
-        return self._auto
-
-    @auto.setter
-    def auto(self, auto):
-        """Sets the auto of this DeploymentAutoArtifactConfig.
-
-        When true, enables automatic template  # noqa: E501
-
-        :param auto: The auto of this DeploymentAutoArtifactConfig.
-        :type auto: bool
-        """
-        if auto is None:
-            raise ValueError("Invalid value for `auto`, must not be `None`")  # noqa: E501
-
-        self._auto = auto
-
-    @property
-    def name(self):
-        """Gets the name of this DeploymentAutoArtifactConfig.
-
-          # noqa: E501
-
-        :return: The name of this DeploymentAutoArtifactConfig.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this DeploymentAutoArtifactConfig.
-
-          # noqa: E501
-
-        :param name: The name of this DeploymentAutoArtifactConfig.
-        :type name: str
-        """
-
-        self._name = name
diff --git a/libraries/models/cloudharness_model/models/deployment_resources_conf.py b/libraries/models/cloudharness_model/models/deployment_resources_conf.py
index 520e2008..27c09148 100644
--- a/libraries/models/cloudharness_model/models/deployment_resources_conf.py
+++ b/libraries/models/cloudharness_model/models/deployment_resources_conf.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.cpu_memory_config import CpuMemoryConfig
 from cloudharness_model import util
 
@@ -50,7 +47,7 @@ def from_dict(cls, dikt) -> 'DeploymentResourcesConf':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def requests(self):
+    def requests(self) -> CpuMemoryConfig:
         """Gets the requests of this DeploymentResourcesConf.
 
 
@@ -60,7 +57,7 @@ def requests(self):
         return self._requests
 
     @requests.setter
-    def requests(self, requests):
+    def requests(self, requests: CpuMemoryConfig):
         """Sets the requests of this DeploymentResourcesConf.
 
 
@@ -71,7 +68,7 @@ def requests(self, requests):
         self._requests = requests
 
     @property
-    def limits(self):
+    def limits(self) -> CpuMemoryConfig:
         """Gets the limits of this DeploymentResourcesConf.
 
 
@@ -81,7 +78,7 @@ def limits(self):
         return self._limits
 
     @limits.setter
-    def limits(self, limits):
+    def limits(self, limits: CpuMemoryConfig):
         """Sets the limits of this DeploymentResourcesConf.
 
 
diff --git a/libraries/models/cloudharness_model/models/deployment_volume_spec.py b/libraries/models/cloudharness_model/models/deployment_volume_spec.py
index 631bc55d..7fc64914 100644
--- a/libraries/models/cloudharness_model/models/deployment_volume_spec.py
+++ b/libraries/models/cloudharness_model/models/deployment_volume_spec.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -15,41 +12,41 @@ class DeploymentVolumeSpec(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, mountpath=None, size=None, usenfs=None, auto=None, name=None):  # noqa: E501
+    def __init__(self, auto=None, name=None, mountpath=None, size=None, usenfs=None):  # noqa: E501
         """DeploymentVolumeSpec - a model defined in OpenAPI
 
+        :param auto: The auto of this DeploymentVolumeSpec.  # noqa: E501
+        :type auto: bool
+        :param name: The name of this DeploymentVolumeSpec.  # noqa: E501
+        :type name: str
         :param mountpath: The mountpath of this DeploymentVolumeSpec.  # noqa: E501
         :type mountpath: str
         :param size: The size of this DeploymentVolumeSpec.  # noqa: E501
         :type size: object
         :param usenfs: The usenfs of this DeploymentVolumeSpec.  # noqa: E501
         :type usenfs: bool
-        :param auto: The auto of this DeploymentVolumeSpec.  # noqa: E501
-        :type auto: bool
-        :param name: The name of this DeploymentVolumeSpec.  # noqa: E501
-        :type name: str
         """
         self.openapi_types = {
+            'auto': bool,
+            'name': str,
             'mountpath': str,
             'size': object,
-            'usenfs': bool,
-            'auto': bool,
-            'name': str
+            'usenfs': bool
         }
 
         self.attribute_map = {
+            'auto': 'auto',
+            'name': 'name',
             'mountpath': 'mountpath',
             'size': 'size',
-            'usenfs': 'usenfs',
-            'auto': 'auto',
-            'name': 'name'
+            'usenfs': 'usenfs'
         }
 
+        self._auto = auto
+        self._name = name
         self._mountpath = mountpath
         self._size = size
         self._usenfs = usenfs
-        self._auto = auto
-        self._name = name
 
     @classmethod
     def from_dict(cls, dikt) -> 'DeploymentVolumeSpec':
@@ -63,7 +60,55 @@ def from_dict(cls, dikt) -> 'DeploymentVolumeSpec':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def mountpath(self):
+    def auto(self) -> bool:
+        """Gets the auto of this DeploymentVolumeSpec.
+
+        When true, enables automatic template  # noqa: E501
+
+        :return: The auto of this DeploymentVolumeSpec.
+        :rtype: bool
+        """
+        return self._auto
+
+    @auto.setter
+    def auto(self, auto: bool):
+        """Sets the auto of this DeploymentVolumeSpec.
+
+        When true, enables automatic template  # noqa: E501
+
+        :param auto: The auto of this DeploymentVolumeSpec.
+        :type auto: bool
+        """
+        if auto is None:
+            raise ValueError("Invalid value for `auto`, must not be `None`")  # noqa: E501
+
+        self._auto = auto
+
+    @property
+    def name(self) -> str:
+        """Gets the name of this DeploymentVolumeSpec.
+
+          # noqa: E501
+
+        :return: The name of this DeploymentVolumeSpec.
+        :rtype: str
+        """
+        return self._name
+
+    @name.setter
+    def name(self, name: str):
+        """Sets the name of this DeploymentVolumeSpec.
+
+          # noqa: E501
+
+        :param name: The name of this DeploymentVolumeSpec.
+        :type name: str
+        """
+
+        self._name = name
+
+    @property
+    def mountpath(self) -> str:
         """Gets the mountpath of this DeploymentVolumeSpec.
 
         The mount path for the volume  # noqa: E501
@@ -74,7 +119,7 @@ def mountpath(self):
         return self._mountpath
 
     @mountpath.setter
-    def mountpath(self, mountpath):
+    def mountpath(self, mountpath: str):
         """Sets the mountpath of this DeploymentVolumeSpec.
 
         The mount path for the volume  # noqa: E501
@@ -88,7 +133,7 @@ def mountpath(self, mountpath):
         self._mountpath = mountpath
 
     @property
-    def size(self):
+    def size(self) -> object:
         """Gets the size of this DeploymentVolumeSpec.
 
         The volume size.   E.g. 5Gi  # noqa: E501
@@ -99,7 +144,7 @@ def size(self):
         return self._size
 
     @size.setter
-    def size(self, size):
+    def size(self, size: object):
         """Sets the size of this DeploymentVolumeSpec.
 
         The volume size.   E.g. 5Gi  # noqa: E501
@@ -111,7 +156,7 @@ def size(self, size):
         self._size = size
 
     @property
-    def usenfs(self):
+    def usenfs(self) -> bool:
         """Gets the usenfs of this DeploymentVolumeSpec.
 
         Set to `true` to use the nfs on the created volume and mount as ReadWriteMany.  # noqa: E501
@@ -122,7 +167,7 @@ def usenfs(self):
         return self._usenfs
 
     @usenfs.setter
-    def usenfs(self, usenfs):
+    def usenfs(self, usenfs: bool):
         """Sets the usenfs of this DeploymentVolumeSpec.
 
         Set to `true` to use the nfs on the created volume and mount as ReadWriteMany.  # noqa: E501
@@ -132,51 +177,3 @@ def usenfs(self, usenfs):
         """
 
         self._usenfs = usenfs
-
-    @property
-    def auto(self):
-        """Gets the auto of this DeploymentVolumeSpec.
-
-        When true, enables automatic template  # noqa: E501
-
-        :return: The auto of this DeploymentVolumeSpec.
-        :rtype: bool
-        """
-        return self._auto
-
-    @auto.setter
-    def auto(self, auto):
-        """Sets the auto of this DeploymentVolumeSpec.
-
-        When true, enables automatic template  # noqa: E501
-
-        :param auto: The auto of this DeploymentVolumeSpec.
-        :type auto: bool
-        """
-        if auto is None:
-            raise ValueError("Invalid value for `auto`, must not be `None`")  # noqa: E501
-
-        self._auto = auto
-
-    @property
-    def name(self):
-        """Gets the name of this DeploymentVolumeSpec.
-
-          # noqa: E501
-
-        :return: The name of this DeploymentVolumeSpec.
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this DeploymentVolumeSpec.
-
-          # noqa: E501
-
-        :param name: The name of this DeploymentVolumeSpec.
-        :type name: str
-        """
-
-        self._name = name
diff --git a/libraries/models/cloudharness_model/models/e2_e_tests_config.py b/libraries/models/cloudharness_model/models/e2_e_tests_config.py
index e856fe9d..6ae48d93 100644
--- a/libraries/models/cloudharness_model/models/e2_e_tests_config.py
+++ b/libraries/models/cloudharness_model/models/e2_e_tests_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -58,7 +55,7 @@ def from_dict(cls, dikt) -> 'E2ETestsConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def enabled(self):
+    def enabled(self) -> bool:
         """Gets the enabled of this E2ETestsConfig.
 
         Enables end to end testing for this application (default: false)  # noqa: E501
@@ -69,7 +66,7 @@ def enabled(self):
         return self._enabled
 
     @enabled.setter
-    def enabled(self, enabled):
+    def enabled(self, enabled: bool):
         """Sets the enabled of this E2ETestsConfig.
 
         Enables end to end testing for this application (default: false)  # noqa: E501
@@ -83,7 +80,7 @@ def enabled(self, enabled):
         self._enabled = enabled
 
     @property
-    def smoketest(self):
+    def smoketest(self) -> bool:
         """Gets the smoketest of this E2ETestsConfig.
 
         Specify whether to run the common smoke tests  # noqa: E501
@@ -94,7 +91,7 @@ def smoketest(self):
         return self._smoketest
 
     @smoketest.setter
-    def smoketest(self, smoketest):
+    def smoketest(self, smoketest: bool):
         """Sets the smoketest of this E2ETestsConfig.
 
         Specify whether to run the common smoke tests  # noqa: E501
@@ -108,7 +105,7 @@ def smoketest(self, smoketest):
         self._smoketest = smoketest
 
     @property
-    def ignore_console_errors(self):
+    def ignore_console_errors(self) -> bool:
         """Gets the ignore_console_errors of this E2ETestsConfig.
 
           # noqa: E501
@@ -119,7 +116,7 @@ def ignore_console_errors(self):
         return self._ignore_console_errors
 
     @ignore_console_errors.setter
-    def ignore_console_errors(self, ignore_console_errors):
+    def ignore_console_errors(self, ignore_console_errors: bool):
         """Sets the ignore_console_errors of this E2ETestsConfig.
 
           # noqa: E501
@@ -131,7 +128,7 @@ def ignore_console_errors(self, ignore_console_errors):
         self._ignore_console_errors = ignore_console_errors
 
     @property
-    def ignore_request_errors(self):
+    def ignore_request_errors(self) -> bool:
         """Gets the ignore_request_errors of this E2ETestsConfig.
 
           # noqa: E501
@@ -142,7 +139,7 @@ def ignore_request_errors(self):
         return self._ignore_request_errors
 
     @ignore_request_errors.setter
-    def ignore_request_errors(self, ignore_request_errors):
+    def ignore_request_errors(self, ignore_request_errors: bool):
         """Sets the ignore_request_errors of this E2ETestsConfig.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/file_resources_config.py b/libraries/models/cloudharness_model/models/file_resources_config.py
index da5993b4..fff73422 100644
--- a/libraries/models/cloudharness_model/models/file_resources_config.py
+++ b/libraries/models/cloudharness_model/models/file_resources_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 import re
 from cloudharness_model import util
 
@@ -55,7 +52,7 @@ def from_dict(cls, dikt) -> 'FileResourcesConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this FileResourcesConfig.
 
           # noqa: E501
@@ -66,7 +63,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this FileResourcesConfig.
 
           # noqa: E501
@@ -82,7 +79,7 @@ def name(self, name):
         self._name = name
 
     @property
-    def src(self):
+    def src(self) -> str:
         """Gets the src of this FileResourcesConfig.
 
           # noqa: E501
@@ -93,7 +90,7 @@ def src(self):
         return self._src
 
     @src.setter
-    def src(self, src):
+    def src(self, src: str):
         """Sets the src of this FileResourcesConfig.
 
           # noqa: E501
@@ -109,7 +106,7 @@ def src(self, src):
         self._src = src
 
     @property
-    def dst(self):
+    def dst(self) -> str:
         """Gets the dst of this FileResourcesConfig.
 
           # noqa: E501
@@ -120,7 +117,7 @@ def dst(self):
         return self._dst
 
     @dst.setter
-    def dst(self, dst):
+    def dst(self, dst: str):
         """Sets the dst of this FileResourcesConfig.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/git_dependency_config.py b/libraries/models/cloudharness_model/models/git_dependency_config.py
index b2a17690..8e3acf61 100644
--- a/libraries/models/cloudharness_model/models/git_dependency_config.py
+++ b/libraries/models/cloudharness_model/models/git_dependency_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -53,7 +50,7 @@ def from_dict(cls, dikt) -> 'GitDependencyConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def url(self):
+    def url(self) -> str:
         """Gets the url of this GitDependencyConfig.
 
 
@@ -63,7 +60,7 @@ def url(self):
         return self._url
 
     @url.setter
-    def url(self, url):
+    def url(self, url: str):
         """Sets the url of this GitDependencyConfig.
 
 
@@ -76,7 +73,7 @@ def url(self, url):
         self._url = url
 
     @property
-    def branch_tag(self):
+    def branch_tag(self) -> str:
         """Gets the branch_tag of this GitDependencyConfig.
 
 
@@ -86,7 +83,7 @@ def branch_tag(self):
         return self._branch_tag
 
     @branch_tag.setter
-    def branch_tag(self, branch_tag):
+    def branch_tag(self, branch_tag: str):
         """Sets the branch_tag of this GitDependencyConfig.
 
 
@@ -99,7 +96,7 @@ def branch_tag(self, branch_tag):
         self._branch_tag = branch_tag
 
     @property
-    def path(self):
+    def path(self) -> str:
         """Gets the path of this GitDependencyConfig.
 
         Defines the path where the repo is cloned. default: /git  # noqa: E501
@@ -110,7 +107,7 @@ def path(self):
         return self._path
 
     @path.setter
-    def path(self, path):
+    def path(self, path: str):
         """Sets the path of this GitDependencyConfig.
 
         Defines the path where the repo is cloned. default: /git  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/harness_main_config.py b/libraries/models/cloudharness_model/models/harness_main_config.py
index 7f18e82d..6691ed07 100644
--- a/libraries/models/cloudharness_model/models/harness_main_config.py
+++ b/libraries/models/cloudharness_model/models/harness_main_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.application_config import ApplicationConfig
 from cloudharness_model.models.backup_config import BackupConfig
 from cloudharness_model.models.name_value import NameValue
@@ -23,7 +20,7 @@ class HarnessMainConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=None, mainapp=None, registry=None, tag=None, apps=None, env=None, privenv=None, backup=None, name=None, task_images=None, build_hash=None):  # noqa: E501
+    def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=None, mainapp=None, registry=None, tag=None, apps=None, env=None, privenv=None, backup=None, name=None, task_images=None, build_hash=None, envmap=None):  # noqa: E501
         """HarnessMainConfig - a model defined in OpenAPI
 
         :param local: The local of this HarnessMainConfig.  # noqa: E501
@@ -54,6 +51,8 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
         :type task_images: Dict[str, object]
         :param build_hash: The build_hash of this HarnessMainConfig.  # noqa: E501
         :type build_hash: str
+        :param envmap: The envmap of this HarnessMainConfig.  # noqa: E501
+        :type envmap: Dict[str, object]
         """
         self.openapi_types = {
             'local': bool,
@@ -69,7 +68,8 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
             'backup': BackupConfig,
             'name': str,
             'task_images': Dict[str, object],
-            'build_hash': str
+            'build_hash': str,
+            'envmap': Dict[str, object]
         }
 
         self.attribute_map = {
@@ -86,7 +86,8 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
             'backup': 'backup',
             'name': 'name',
             'task_images': 'task-images',
-            'build_hash': 'build_hash'
+            'build_hash': 'build_hash',
+            'envmap': 'envmap'
         }
 
         self._local = local
@@ -103,6 +104,7 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
         self._name = name
         self._task_images = task_images
         self._build_hash = build_hash
+        self._envmap = envmap
 
     @classmethod
     def from_dict(cls, dikt) -> 'HarnessMainConfig':
@@ -116,7 +118,7 @@ def from_dict(cls, dikt) -> 'HarnessMainConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def local(self):
+    def local(self) -> bool:
         """Gets the local of this HarnessMainConfig.
 
         If set to true, local DNS mapping is added to pods.  # noqa: E501
@@ -127,7 +129,7 @@ def local(self):
         return self._local
 
     @local.setter
-    def local(self, local):
+    def local(self, local: bool):
         """Sets the local of this HarnessMainConfig.
 
         If set to true, local DNS mapping is added to pods.  # noqa: E501
@@ -141,7 +143,7 @@ def local(self, local):
         self._local = local
 
     @property
-    def secured_gatekeepers(self):
+    def secured_gatekeepers(self) -> bool:
         """Gets the secured_gatekeepers of this HarnessMainConfig.
 
         Enables/disables Gatekeepers on secured applications. Set to false for testing/development  # noqa: E501
@@ -152,7 +154,7 @@ def secured_gatekeepers(self):
         return self._secured_gatekeepers
 
     @secured_gatekeepers.setter
-    def secured_gatekeepers(self, secured_gatekeepers):
+    def secured_gatekeepers(self, secured_gatekeepers: bool):
         """Sets the secured_gatekeepers of this HarnessMainConfig.
 
         Enables/disables Gatekeepers on secured applications. Set to false for testing/development  # noqa: E501
@@ -166,7 +168,7 @@ def secured_gatekeepers(self, secured_gatekeepers):
         self._secured_gatekeepers = secured_gatekeepers
 
     @property
-    def domain(self):
+    def domain(self) -> str:
         """Gets the domain of this HarnessMainConfig.
 
         The root domain  # noqa: E501
@@ -177,7 +179,7 @@ def domain(self):
         return self._domain
 
     @domain.setter
-    def domain(self, domain):
+    def domain(self, domain: str):
         """Sets the domain of this HarnessMainConfig.
 
         The root domain  # noqa: E501
@@ -191,7 +193,7 @@ def domain(self, domain):
         self._domain = domain
 
     @property
-    def namespace(self):
+    def namespace(self) -> str:
         """Gets the namespace of this HarnessMainConfig.
 
         The K8s namespace.  # noqa: E501
@@ -202,7 +204,7 @@ def namespace(self):
         return self._namespace
 
     @namespace.setter
-    def namespace(self, namespace):
+    def namespace(self, namespace: str):
         """Sets the namespace of this HarnessMainConfig.
 
         The K8s namespace.  # noqa: E501
@@ -216,7 +218,7 @@ def namespace(self, namespace):
         self._namespace = namespace
 
     @property
-    def mainapp(self):
+    def mainapp(self) -> str:
         """Gets the mainapp of this HarnessMainConfig.
 
         Defines the app to map to the root domain  # noqa: E501
@@ -227,7 +229,7 @@ def mainapp(self):
         return self._mainapp
 
     @mainapp.setter
-    def mainapp(self, mainapp):
+    def mainapp(self, mainapp: str):
         """Sets the mainapp of this HarnessMainConfig.
 
         Defines the app to map to the root domain  # noqa: E501
@@ -241,7 +243,7 @@ def mainapp(self, mainapp):
         self._mainapp = mainapp
 
     @property
-    def registry(self):
+    def registry(self) -> RegistryConfig:
         """Gets the registry of this HarnessMainConfig.
 
 
@@ -251,7 +253,7 @@ def registry(self):
         return self._registry
 
     @registry.setter
-    def registry(self, registry):
+    def registry(self, registry: RegistryConfig):
         """Sets the registry of this HarnessMainConfig.
 
 
@@ -262,7 +264,7 @@ def registry(self, registry):
         self._registry = registry
 
     @property
-    def tag(self):
+    def tag(self) -> str:
         """Gets the tag of this HarnessMainConfig.
 
         Docker tag used to push/pull the built images.  # noqa: E501
@@ -273,7 +275,7 @@ def tag(self):
         return self._tag
 
     @tag.setter
-    def tag(self, tag):
+    def tag(self, tag: str):
         """Sets the tag of this HarnessMainConfig.
 
         Docker tag used to push/pull the built images.  # noqa: E501
@@ -285,7 +287,7 @@ def tag(self, tag):
         self._tag = tag
 
     @property
-    def apps(self):
+    def apps(self) -> Dict[str, ApplicationConfig]:
         """Gets the apps of this HarnessMainConfig.
 
           # noqa: E501
@@ -296,7 +298,7 @@ def apps(self):
         return self._apps
 
     @apps.setter
-    def apps(self, apps):
+    def apps(self, apps: Dict[str, ApplicationConfig]):
         """Sets the apps of this HarnessMainConfig.
 
           # noqa: E501
@@ -310,10 +312,10 @@ def apps(self, apps):
         self._apps = apps
 
     @property
-    def env(self):
+    def env(self) -> List[NameValue]:
         """Gets the env of this HarnessMainConfig.
 
-        Environmental variables added to all pods  # noqa: E501
+        Environmental variables added to all pods (deprecated, please use envmap)  # noqa: E501
 
         :return: The env of this HarnessMainConfig.
         :rtype: List[NameValue]
@@ -321,10 +323,10 @@ def env(self):
         return self._env
 
     @env.setter
-    def env(self, env):
+    def env(self, env: List[NameValue]):
         """Sets the env of this HarnessMainConfig.
 
-        Environmental variables added to all pods  # noqa: E501
+        Environmental variables added to all pods (deprecated, please use envmap)  # noqa: E501
 
         :param env: The env of this HarnessMainConfig.
         :type env: List[NameValue]
@@ -333,7 +335,7 @@ def env(self, env):
         self._env = env
 
     @property
-    def privenv(self):
+    def privenv(self) -> NameValue:
         """Gets the privenv of this HarnessMainConfig.
 
 
@@ -343,7 +345,7 @@ def privenv(self):
         return self._privenv
 
     @privenv.setter
-    def privenv(self, privenv):
+    def privenv(self, privenv: NameValue):
         """Sets the privenv of this HarnessMainConfig.
 
 
@@ -354,7 +356,7 @@ def privenv(self, privenv):
         self._privenv = privenv
 
     @property
-    def backup(self):
+    def backup(self) -> BackupConfig:
         """Gets the backup of this HarnessMainConfig.
 
 
@@ -364,7 +366,7 @@ def backup(self):
         return self._backup
 
     @backup.setter
-    def backup(self, backup):
+    def backup(self, backup: BackupConfig):
         """Sets the backup of this HarnessMainConfig.
 
 
@@ -375,7 +377,7 @@ def backup(self, backup):
         self._backup = backup
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this HarnessMainConfig.
 
         Base name  # noqa: E501
@@ -386,7 +388,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this HarnessMainConfig.
 
         Base name  # noqa: E501
@@ -398,7 +400,7 @@ def name(self, name):
         self._name = name
 
     @property
-    def task_images(self):
+    def task_images(self) -> Dict[str, object]:
         """Gets the task_images of this HarnessMainConfig.
 
           # noqa: E501
@@ -409,7 +411,7 @@ def task_images(self):
         return self._task_images
 
     @task_images.setter
-    def task_images(self, task_images):
+    def task_images(self, task_images: Dict[str, object]):
         """Sets the task_images of this HarnessMainConfig.
 
           # noqa: E501
@@ -421,7 +423,7 @@ def task_images(self, task_images):
         self._task_images = task_images
 
     @property
-    def build_hash(self):
+    def build_hash(self) -> str:
         """Gets the build_hash of this HarnessMainConfig.
 
           # noqa: E501
@@ -432,7 +434,7 @@ def build_hash(self):
         return self._build_hash
 
     @build_hash.setter
-    def build_hash(self, build_hash):
+    def build_hash(self, build_hash: str):
         """Sets the build_hash of this HarnessMainConfig.
 
           # noqa: E501
@@ -442,3 +444,26 @@ def build_hash(self, build_hash):
         """
 
         self._build_hash = build_hash
+
+    @property
+    def envmap(self) -> Dict[str, object]:
+        """Gets the envmap of this HarnessMainConfig.
+
+          # noqa: E501
+
+        :return: The envmap of this HarnessMainConfig.
+        :rtype: Dict[str, object]
+        """
+        return self._envmap
+
+    @envmap.setter
+    def envmap(self, envmap: Dict[str, object]):
+        """Sets the envmap of this HarnessMainConfig.
+
+          # noqa: E501
+
+        :param envmap: The envmap of this HarnessMainConfig.
+        :type envmap: Dict[str, object]
+        """
+
+        self._envmap = envmap
diff --git a/libraries/models/cloudharness_model/models/ingress_config.py b/libraries/models/cloudharness_model/models/ingress_config.py
index 6253941a..e0da288f 100644
--- a/libraries/models/cloudharness_model/models/ingress_config.py
+++ b/libraries/models/cloudharness_model/models/ingress_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.ingress_config_all_of_letsencrypt import IngressConfigAllOfLetsencrypt
 from cloudharness_model import util
 
@@ -17,36 +14,36 @@ class IngressConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, ssl_redirect=None, letsencrypt=None, auto=None, name=None):  # noqa: E501
+    def __init__(self, auto=None, name=None, ssl_redirect=None, letsencrypt=None):  # noqa: E501
         """IngressConfig - a model defined in OpenAPI
 
-        :param ssl_redirect: The ssl_redirect of this IngressConfig.  # noqa: E501
-        :type ssl_redirect: bool
-        :param letsencrypt: The letsencrypt of this IngressConfig.  # noqa: E501
-        :type letsencrypt: IngressConfigAllOfLetsencrypt
         :param auto: The auto of this IngressConfig.  # noqa: E501
         :type auto: bool
         :param name: The name of this IngressConfig.  # noqa: E501
         :type name: str
+        :param ssl_redirect: The ssl_redirect of this IngressConfig.  # noqa: E501
+        :type ssl_redirect: bool
+        :param letsencrypt: The letsencrypt of this IngressConfig.  # noqa: E501
+        :type letsencrypt: IngressConfigAllOfLetsencrypt
         """
         self.openapi_types = {
-            'ssl_redirect': bool,
-            'letsencrypt': IngressConfigAllOfLetsencrypt,
             'auto': bool,
-            'name': str
+            'name': str,
+            'ssl_redirect': bool,
+            'letsencrypt': IngressConfigAllOfLetsencrypt
         }
 
         self.attribute_map = {
-            'ssl_redirect': 'ssl_redirect',
-            'letsencrypt': 'letsencrypt',
             'auto': 'auto',
-            'name': 'name'
+            'name': 'name',
+            'ssl_redirect': 'ssl_redirect',
+            'letsencrypt': 'letsencrypt'
         }
 
-        self._ssl_redirect = ssl_redirect
-        self._letsencrypt = letsencrypt
         self._auto = auto
         self._name = name
+        self._ssl_redirect = ssl_redirect
+        self._letsencrypt = letsencrypt
 
     @classmethod
     def from_dict(cls, dikt) -> 'IngressConfig':
@@ -60,51 +57,7 @@ def from_dict(cls, dikt) -> 'IngressConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def ssl_redirect(self):
-        """Gets the ssl_redirect of this IngressConfig.
-
-          # noqa: E501
-
-        :return: The ssl_redirect of this IngressConfig.
-        :rtype: bool
-        """
-        return self._ssl_redirect
-
-    @ssl_redirect.setter
-    def ssl_redirect(self, ssl_redirect):
-        """Sets the ssl_redirect of this IngressConfig.
-
-          # noqa: E501
-
-        :param ssl_redirect: The ssl_redirect of this IngressConfig.
-        :type ssl_redirect: bool
-        """
-
-        self._ssl_redirect = ssl_redirect
-
-    @property
-    def letsencrypt(self):
-        """Gets the letsencrypt of this IngressConfig.
-
-
-        :return: The letsencrypt of this IngressConfig.
-        :rtype: IngressConfigAllOfLetsencrypt
-        """
-        return self._letsencrypt
-
-    @letsencrypt.setter
-    def letsencrypt(self, letsencrypt):
-        """Sets the letsencrypt of this IngressConfig.
-
-
-        :param letsencrypt: The letsencrypt of this IngressConfig.
-        :type letsencrypt: IngressConfigAllOfLetsencrypt
-        """
-
-        self._letsencrypt = letsencrypt
-
-    @property
-    def auto(self):
+    def auto(self) -> bool:
         """Gets the auto of this IngressConfig.
 
         When true, enables automatic template  # noqa: E501
@@ -115,7 +68,7 @@ def auto(self):
         return self._auto
 
     @auto.setter
-    def auto(self, auto):
+    def auto(self, auto: bool):
         """Sets the auto of this IngressConfig.
 
         When true, enables automatic template  # noqa: E501
@@ -129,7 +82,7 @@ def auto(self, auto):
         self._auto = auto
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this IngressConfig.
 
           # noqa: E501
@@ -140,7 +93,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this IngressConfig.
 
           # noqa: E501
@@ -150,3 +103,47 @@ def name(self, name):
         """
 
         self._name = name
+
+    @property
+    def ssl_redirect(self) -> bool:
+        """Gets the ssl_redirect of this IngressConfig.
+
+          # noqa: E501
+
+        :return: The ssl_redirect of this IngressConfig.
+        :rtype: bool
+        """
+        return self._ssl_redirect
+
+    @ssl_redirect.setter
+    def ssl_redirect(self, ssl_redirect: bool):
+        """Sets the ssl_redirect of this IngressConfig.
+
+          # noqa: E501
+
+        :param ssl_redirect: The ssl_redirect of this IngressConfig.
+        :type ssl_redirect: bool
+        """
+
+        self._ssl_redirect = ssl_redirect
+
+    @property
+    def letsencrypt(self) -> IngressConfigAllOfLetsencrypt:
+        """Gets the letsencrypt of this IngressConfig.
+
+
+        :return: The letsencrypt of this IngressConfig.
+        :rtype: IngressConfigAllOfLetsencrypt
+        """
+        return self._letsencrypt
+
+    @letsencrypt.setter
+    def letsencrypt(self, letsencrypt: IngressConfigAllOfLetsencrypt):
+        """Sets the letsencrypt of this IngressConfig.
+
+
+        :param letsencrypt: The letsencrypt of this IngressConfig.
+        :type letsencrypt: IngressConfigAllOfLetsencrypt
+        """
+
+        self._letsencrypt = letsencrypt
diff --git a/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py b/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py
index 0e8a5ab8..467e18a2 100644
--- a/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py
+++ b/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -43,7 +40,7 @@ def from_dict(cls, dikt) -> 'IngressConfigAllOfLetsencrypt':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def email(self):
+    def email(self) -> str:
         """Gets the email of this IngressConfigAllOfLetsencrypt.
 
 
@@ -53,7 +50,7 @@ def email(self):
         return self._email
 
     @email.setter
-    def email(self, email):
+    def email(self, email: str):
         """Sets the email of this IngressConfigAllOfLetsencrypt.
 
 
diff --git a/libraries/models/cloudharness_model/models/jupyter_hub_config.py b/libraries/models/cloudharness_model/models/jupyter_hub_config.py
index 1f04fa73..5aaa9850 100644
--- a/libraries/models/cloudharness_model/models/jupyter_hub_config.py
+++ b/libraries/models/cloudharness_model/models/jupyter_hub_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -58,7 +55,7 @@ def from_dict(cls, dikt) -> 'JupyterHubConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def args(self):
+    def args(self) -> List[str]:
         """Gets the args of this JupyterHubConfig.
 
         arguments passed to the container  # noqa: E501
@@ -69,7 +66,7 @@ def args(self):
         return self._args
 
     @args.setter
-    def args(self, args):
+    def args(self, args: List[str]):
         """Sets the args of this JupyterHubConfig.
 
         arguments passed to the container  # noqa: E501
@@ -81,7 +78,7 @@ def args(self, args):
         self._args = args
 
     @property
-    def extra_config(self):
+    def extra_config(self) -> Dict[str, object]:
         """Gets the extra_config of this JupyterHubConfig.
 
           # noqa: E501
@@ -92,7 +89,7 @@ def extra_config(self):
         return self._extra_config
 
     @extra_config.setter
-    def extra_config(self, extra_config):
+    def extra_config(self, extra_config: Dict[str, object]):
         """Sets the extra_config of this JupyterHubConfig.
 
           # noqa: E501
@@ -104,7 +101,7 @@ def extra_config(self, extra_config):
         self._extra_config = extra_config
 
     @property
-    def spawner_extra_config(self):
+    def spawner_extra_config(self) -> Dict[str, object]:
         """Gets the spawner_extra_config of this JupyterHubConfig.
 
           # noqa: E501
@@ -115,7 +112,7 @@ def spawner_extra_config(self):
         return self._spawner_extra_config
 
     @spawner_extra_config.setter
-    def spawner_extra_config(self, spawner_extra_config):
+    def spawner_extra_config(self, spawner_extra_config: Dict[str, object]):
         """Sets the spawner_extra_config of this JupyterHubConfig.
 
           # noqa: E501
@@ -127,7 +124,7 @@ def spawner_extra_config(self, spawner_extra_config):
         self._spawner_extra_config = spawner_extra_config
 
     @property
-    def application_hook(self):
+    def application_hook(self) -> object:
         """Gets the application_hook of this JupyterHubConfig.
 
         change the hook function (advanced)  Specify the Python name of the function (full module path, the module must be  installed in the Docker image)  # noqa: E501
@@ -138,7 +135,7 @@ def application_hook(self):
         return self._application_hook
 
     @application_hook.setter
-    def application_hook(self, application_hook):
+    def application_hook(self, application_hook: object):
         """Sets the application_hook of this JupyterHubConfig.
 
         change the hook function (advanced)  Specify the Python name of the function (full module path, the module must be  installed in the Docker image)  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/name_value.py b/libraries/models/cloudharness_model/models/name_value.py
index f4b75cdd..abf07fe6 100644
--- a/libraries/models/cloudharness_model/models/name_value.py
+++ b/libraries/models/cloudharness_model/models/name_value.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -48,7 +45,7 @@ def from_dict(cls, dikt) -> 'NameValue':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this NameValue.
 
           # noqa: E501
@@ -59,7 +56,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this NameValue.
 
           # noqa: E501
@@ -73,7 +70,7 @@ def name(self, name):
         self._name = name
 
     @property
-    def value(self):
+    def value(self) -> str:
         """Gets the value of this NameValue.
 
           # noqa: E501
@@ -84,7 +81,7 @@ def value(self):
         return self._value
 
     @value.setter
-    def value(self, value):
+    def value(self, value: str):
         """Sets the value of this NameValue.
 
           # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/registry_config.py b/libraries/models/cloudharness_model/models/registry_config.py
index 79f27027..7ce48e9c 100644
--- a/libraries/models/cloudharness_model/models/registry_config.py
+++ b/libraries/models/cloudharness_model/models/registry_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -48,7 +45,7 @@ def from_dict(cls, dikt) -> 'RegistryConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this RegistryConfig.
 
           # noqa: E501
@@ -59,7 +56,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this RegistryConfig.
 
           # noqa: E501
@@ -73,7 +70,7 @@ def name(self, name):
         self._name = name
 
     @property
-    def secret(self):
+    def secret(self) -> str:
         """Gets the secret of this RegistryConfig.
 
         Optional secret used for pulling from docker registry.  # noqa: E501
@@ -84,7 +81,7 @@ def secret(self):
         return self._secret
 
     @secret.setter
-    def secret(self, secret):
+    def secret(self, secret: str):
         """Sets the secret of this RegistryConfig.
 
         Optional secret used for pulling from docker registry.  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/service_auto_artifact_config.py b/libraries/models/cloudharness_model/models/service_auto_artifact_config.py
index 8d14ac42..77bded86 100644
--- a/libraries/models/cloudharness_model/models/service_auto_artifact_config.py
+++ b/libraries/models/cloudharness_model/models/service_auto_artifact_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -15,31 +12,31 @@ class ServiceAutoArtifactConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, port=None, auto=None, name=None):  # noqa: E501
+    def __init__(self, auto=None, name=None, port=None):  # noqa: E501
         """ServiceAutoArtifactConfig - a model defined in OpenAPI
 
-        :param port: The port of this ServiceAutoArtifactConfig.  # noqa: E501
-        :type port: int
         :param auto: The auto of this ServiceAutoArtifactConfig.  # noqa: E501
         :type auto: bool
         :param name: The name of this ServiceAutoArtifactConfig.  # noqa: E501
         :type name: str
+        :param port: The port of this ServiceAutoArtifactConfig.  # noqa: E501
+        :type port: int
         """
         self.openapi_types = {
-            'port': int,
             'auto': bool,
-            'name': str
+            'name': str,
+            'port': int
         }
 
         self.attribute_map = {
-            'port': 'port',
             'auto': 'auto',
-            'name': 'name'
+            'name': 'name',
+            'port': 'port'
         }
 
-        self._port = port
         self._auto = auto
         self._name = name
+        self._port = port
 
     @classmethod
     def from_dict(cls, dikt) -> 'ServiceAutoArtifactConfig':
@@ -53,30 +50,7 @@ def from_dict(cls, dikt) -> 'ServiceAutoArtifactConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def port(self):
-        """Gets the port of this ServiceAutoArtifactConfig.
-
-        Service port  # noqa: E501
-
-        :return: The port of this ServiceAutoArtifactConfig.
-        :rtype: int
-        """
-        return self._port
-
-    @port.setter
-    def port(self, port):
-        """Sets the port of this ServiceAutoArtifactConfig.
-
-        Service port  # noqa: E501
-
-        :param port: The port of this ServiceAutoArtifactConfig.
-        :type port: int
-        """
-
-        self._port = port
-
-    @property
-    def auto(self):
+    def auto(self) -> bool:
         """Gets the auto of this ServiceAutoArtifactConfig.
 
         When true, enables automatic template  # noqa: E501
@@ -87,7 +61,7 @@ def auto(self):
         return self._auto
 
     @auto.setter
-    def auto(self, auto):
+    def auto(self, auto: bool):
         """Sets the auto of this ServiceAutoArtifactConfig.
 
         When true, enables automatic template  # noqa: E501
@@ -101,7 +75,7 @@ def auto(self, auto):
         self._auto = auto
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this ServiceAutoArtifactConfig.
 
           # noqa: E501
@@ -112,7 +86,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this ServiceAutoArtifactConfig.
 
           # noqa: E501
@@ -122,3 +96,26 @@ def name(self, name):
         """
 
         self._name = name
+
+    @property
+    def port(self) -> int:
+        """Gets the port of this ServiceAutoArtifactConfig.
+
+        Service port  # noqa: E501
+
+        :return: The port of this ServiceAutoArtifactConfig.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port: int):
+        """Sets the port of this ServiceAutoArtifactConfig.
+
+        Service port  # noqa: E501
+
+        :param port: The port of this ServiceAutoArtifactConfig.
+        :type port: int
+        """
+
+        self._port = port
diff --git a/libraries/models/cloudharness_model/models/unit_tests_config.py b/libraries/models/cloudharness_model/models/unit_tests_config.py
index 9b7813c8..680d984a 100644
--- a/libraries/models/cloudharness_model/models/unit_tests_config.py
+++ b/libraries/models/cloudharness_model/models/unit_tests_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -48,7 +45,7 @@ def from_dict(cls, dikt) -> 'UnitTestsConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def enabled(self):
+    def enabled(self) -> bool:
         """Gets the enabled of this UnitTestsConfig.
 
         Enables unit tests for this application (default: true)  # noqa: E501
@@ -59,7 +56,7 @@ def enabled(self):
         return self._enabled
 
     @enabled.setter
-    def enabled(self, enabled):
+    def enabled(self, enabled: bool):
         """Sets the enabled of this UnitTestsConfig.
 
         Enables unit tests for this application (default: true)  # noqa: E501
@@ -73,7 +70,7 @@ def enabled(self, enabled):
         self._enabled = enabled
 
     @property
-    def commands(self):
+    def commands(self) -> List[str]:
         """Gets the commands of this UnitTestsConfig.
 
         Commands to run unit tests  # noqa: E501
@@ -84,7 +81,7 @@ def commands(self):
         return self._commands
 
     @commands.setter
-    def commands(self, commands):
+    def commands(self, commands: List[str]):
         """Sets the commands of this UnitTestsConfig.
 
         Commands to run unit tests  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/uri_role_mapping_config.py b/libraries/models/cloudharness_model/models/uri_role_mapping_config.py
index 046becca..649ae22e 100644
--- a/libraries/models/cloudharness_model/models/uri_role_mapping_config.py
+++ b/libraries/models/cloudharness_model/models/uri_role_mapping_config.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 import re
 from cloudharness_model import util
 
@@ -50,7 +47,7 @@ def from_dict(cls, dikt) -> 'UriRoleMappingConfig':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def uri(self):
+    def uri(self) -> str:
         """Gets the uri of this UriRoleMappingConfig.
 
           # noqa: E501
@@ -61,7 +58,7 @@ def uri(self):
         return self._uri
 
     @uri.setter
-    def uri(self, uri):
+    def uri(self, uri: str):
         """Sets the uri of this UriRoleMappingConfig.
 
           # noqa: E501
@@ -77,7 +74,7 @@ def uri(self, uri):
         self._uri = uri
 
     @property
-    def roles(self):
+    def roles(self) -> List[str]:
         """Gets the roles of this UriRoleMappingConfig.
 
         Roles allowed to access the present uri  # noqa: E501
@@ -88,7 +85,7 @@ def roles(self):
         return self._roles
 
     @roles.setter
-    def roles(self, roles):
+    def roles(self, roles: List[str]):
         """Sets the roles of this UriRoleMappingConfig.
 
         Roles allowed to access the present uri  # noqa: E501
diff --git a/libraries/models/cloudharness_model/models/user.py b/libraries/models/cloudharness_model/models/user.py
index 3d1c1895..0676fbae 100644
--- a/libraries/models/cloudharness_model/models/user.py
+++ b/libraries/models/cloudharness_model/models/user.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model.models.user_credential import UserCredential
 from cloudharness_model import util
 
@@ -135,7 +132,7 @@ def from_dict(cls, dikt) -> 'User':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def access(self):
+    def access(self) -> Dict[str, object]:
         """Gets the access of this User.
 
 
@@ -145,7 +142,7 @@ def access(self):
         return self._access
 
     @access.setter
-    def access(self, access):
+    def access(self, access: Dict[str, object]):
         """Sets the access of this User.
 
 
@@ -156,7 +153,7 @@ def access(self, access):
         self._access = access
 
     @property
-    def attributes(self):
+    def attributes(self) -> Dict[str, object]:
         """Gets the attributes of this User.
 
 
@@ -166,7 +163,7 @@ def attributes(self):
         return self._attributes
 
     @attributes.setter
-    def attributes(self, attributes):
+    def attributes(self, attributes: Dict[str, object]):
         """Sets the attributes of this User.
 
 
@@ -177,7 +174,7 @@ def attributes(self, attributes):
         self._attributes = attributes
 
     @property
-    def client_roles(self):
+    def client_roles(self) -> Dict[str, object]:
         """Gets the client_roles of this User.
 
 
@@ -187,7 +184,7 @@ def client_roles(self):
         return self._client_roles
 
     @client_roles.setter
-    def client_roles(self, client_roles):
+    def client_roles(self, client_roles: Dict[str, object]):
         """Sets the client_roles of this User.
 
 
@@ -198,7 +195,7 @@ def client_roles(self, client_roles):
         self._client_roles = client_roles
 
     @property
-    def created_timestamp(self):
+    def created_timestamp(self) -> int:
         """Gets the created_timestamp of this User.
 
 
@@ -208,7 +205,7 @@ def created_timestamp(self):
         return self._created_timestamp
 
     @created_timestamp.setter
-    def created_timestamp(self, created_timestamp):
+    def created_timestamp(self, created_timestamp: int):
         """Sets the created_timestamp of this User.
 
 
@@ -219,7 +216,7 @@ def created_timestamp(self, created_timestamp):
         self._created_timestamp = created_timestamp
 
     @property
-    def credentials(self):
+    def credentials(self) -> List[UserCredential]:
         """Gets the credentials of this User.
 
 
@@ -229,7 +226,7 @@ def credentials(self):
         return self._credentials
 
     @credentials.setter
-    def credentials(self, credentials):
+    def credentials(self, credentials: List[UserCredential]):
         """Sets the credentials of this User.
 
 
@@ -240,7 +237,7 @@ def credentials(self, credentials):
         self._credentials = credentials
 
     @property
-    def disableable_credential_types(self):
+    def disableable_credential_types(self) -> List[str]:
         """Gets the disableable_credential_types of this User.
 
 
@@ -250,7 +247,7 @@ def disableable_credential_types(self):
         return self._disableable_credential_types
 
     @disableable_credential_types.setter
-    def disableable_credential_types(self, disableable_credential_types):
+    def disableable_credential_types(self, disableable_credential_types: List[str]):
         """Sets the disableable_credential_types of this User.
 
 
@@ -261,7 +258,7 @@ def disableable_credential_types(self, disableable_credential_types):
         self._disableable_credential_types = disableable_credential_types
 
     @property
-    def email(self):
+    def email(self) -> str:
         """Gets the email of this User.
 
 
@@ -271,7 +268,7 @@ def email(self):
         return self._email
 
     @email.setter
-    def email(self, email):
+    def email(self, email: str):
         """Sets the email of this User.
 
 
@@ -282,7 +279,7 @@ def email(self, email):
         self._email = email
 
     @property
-    def email_verified(self):
+    def email_verified(self) -> bool:
         """Gets the email_verified of this User.
 
 
@@ -292,7 +289,7 @@ def email_verified(self):
         return self._email_verified
 
     @email_verified.setter
-    def email_verified(self, email_verified):
+    def email_verified(self, email_verified: bool):
         """Sets the email_verified of this User.
 
 
@@ -303,7 +300,7 @@ def email_verified(self, email_verified):
         self._email_verified = email_verified
 
     @property
-    def enabled(self):
+    def enabled(self) -> bool:
         """Gets the enabled of this User.
 
 
@@ -313,7 +310,7 @@ def enabled(self):
         return self._enabled
 
     @enabled.setter
-    def enabled(self, enabled):
+    def enabled(self, enabled: bool):
         """Sets the enabled of this User.
 
 
@@ -324,7 +321,7 @@ def enabled(self, enabled):
         self._enabled = enabled
 
     @property
-    def federation_link(self):
+    def federation_link(self) -> str:
         """Gets the federation_link of this User.
 
 
@@ -334,7 +331,7 @@ def federation_link(self):
         return self._federation_link
 
     @federation_link.setter
-    def federation_link(self, federation_link):
+    def federation_link(self, federation_link: str):
         """Sets the federation_link of this User.
 
 
@@ -345,7 +342,7 @@ def federation_link(self, federation_link):
         self._federation_link = federation_link
 
     @property
-    def first_name(self):
+    def first_name(self) -> str:
         """Gets the first_name of this User.
 
 
@@ -355,7 +352,7 @@ def first_name(self):
         return self._first_name
 
     @first_name.setter
-    def first_name(self, first_name):
+    def first_name(self, first_name: str):
         """Sets the first_name of this User.
 
 
@@ -366,7 +363,7 @@ def first_name(self, first_name):
         self._first_name = first_name
 
     @property
-    def groups(self):
+    def groups(self) -> List[str]:
         """Gets the groups of this User.
 
 
@@ -376,7 +373,7 @@ def groups(self):
         return self._groups
 
     @groups.setter
-    def groups(self, groups):
+    def groups(self, groups: List[str]):
         """Sets the groups of this User.
 
 
@@ -387,7 +384,7 @@ def groups(self, groups):
         self._groups = groups
 
     @property
-    def id(self):
+    def id(self) -> str:
         """Gets the id of this User.
 
 
@@ -397,7 +394,7 @@ def id(self):
         return self._id
 
     @id.setter
-    def id(self, id):
+    def id(self, id: str):
         """Sets the id of this User.
 
 
@@ -408,7 +405,7 @@ def id(self, id):
         self._id = id
 
     @property
-    def last_name(self):
+    def last_name(self) -> str:
         """Gets the last_name of this User.
 
 
@@ -418,7 +415,7 @@ def last_name(self):
         return self._last_name
 
     @last_name.setter
-    def last_name(self, last_name):
+    def last_name(self, last_name: str):
         """Sets the last_name of this User.
 
 
@@ -429,7 +426,7 @@ def last_name(self, last_name):
         self._last_name = last_name
 
     @property
-    def realm_roles(self):
+    def realm_roles(self) -> List[str]:
         """Gets the realm_roles of this User.
 
 
@@ -439,7 +436,7 @@ def realm_roles(self):
         return self._realm_roles
 
     @realm_roles.setter
-    def realm_roles(self, realm_roles):
+    def realm_roles(self, realm_roles: List[str]):
         """Sets the realm_roles of this User.
 
 
@@ -450,7 +447,7 @@ def realm_roles(self, realm_roles):
         self._realm_roles = realm_roles
 
     @property
-    def required_actions(self):
+    def required_actions(self) -> List[str]:
         """Gets the required_actions of this User.
 
 
@@ -460,7 +457,7 @@ def required_actions(self):
         return self._required_actions
 
     @required_actions.setter
-    def required_actions(self, required_actions):
+    def required_actions(self, required_actions: List[str]):
         """Sets the required_actions of this User.
 
 
@@ -471,7 +468,7 @@ def required_actions(self, required_actions):
         self._required_actions = required_actions
 
     @property
-    def service_account_client_id(self):
+    def service_account_client_id(self) -> str:
         """Gets the service_account_client_id of this User.
 
 
@@ -481,7 +478,7 @@ def service_account_client_id(self):
         return self._service_account_client_id
 
     @service_account_client_id.setter
-    def service_account_client_id(self, service_account_client_id):
+    def service_account_client_id(self, service_account_client_id: str):
         """Sets the service_account_client_id of this User.
 
 
@@ -492,7 +489,7 @@ def service_account_client_id(self, service_account_client_id):
         self._service_account_client_id = service_account_client_id
 
     @property
-    def username(self):
+    def username(self) -> str:
         """Gets the username of this User.
 
 
@@ -502,7 +499,7 @@ def username(self):
         return self._username
 
     @username.setter
-    def username(self, username):
+    def username(self, username: str):
         """Sets the username of this User.
 
 
@@ -513,7 +510,7 @@ def username(self, username):
         self._username = username
 
     @property
-    def additional_properties(self):
+    def additional_properties(self) -> object:
         """Gets the additional_properties of this User.
 
 
@@ -523,7 +520,7 @@ def additional_properties(self):
         return self._additional_properties
 
     @additional_properties.setter
-    def additional_properties(self, additional_properties):
+    def additional_properties(self, additional_properties: object):
         """Sets the additional_properties of this User.
 
 
diff --git a/libraries/models/cloudharness_model/models/user_credential.py b/libraries/models/cloudharness_model/models/user_credential.py
index 4f54ddf5..1b692f8f 100644
--- a/libraries/models/cloudharness_model/models/user_credential.py
+++ b/libraries/models/cloudharness_model/models/user_credential.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -83,7 +80,7 @@ def from_dict(cls, dikt) -> 'UserCredential':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def created_date(self):
+    def created_date(self) -> int:
         """Gets the created_date of this UserCredential.
 
 
@@ -93,7 +90,7 @@ def created_date(self):
         return self._created_date
 
     @created_date.setter
-    def created_date(self, created_date):
+    def created_date(self, created_date: int):
         """Sets the created_date of this UserCredential.
 
 
@@ -104,7 +101,7 @@ def created_date(self, created_date):
         self._created_date = created_date
 
     @property
-    def credential_data(self):
+    def credential_data(self) -> str:
         """Gets the credential_data of this UserCredential.
 
 
@@ -114,7 +111,7 @@ def credential_data(self):
         return self._credential_data
 
     @credential_data.setter
-    def credential_data(self, credential_data):
+    def credential_data(self, credential_data: str):
         """Sets the credential_data of this UserCredential.
 
 
@@ -125,7 +122,7 @@ def credential_data(self, credential_data):
         self._credential_data = credential_data
 
     @property
-    def id(self):
+    def id(self) -> str:
         """Gets the id of this UserCredential.
 
 
@@ -135,7 +132,7 @@ def id(self):
         return self._id
 
     @id.setter
-    def id(self, id):
+    def id(self, id: str):
         """Sets the id of this UserCredential.
 
 
@@ -146,7 +143,7 @@ def id(self, id):
         self._id = id
 
     @property
-    def priority(self):
+    def priority(self) -> int:
         """Gets the priority of this UserCredential.
 
 
@@ -156,7 +153,7 @@ def priority(self):
         return self._priority
 
     @priority.setter
-    def priority(self, priority):
+    def priority(self, priority: int):
         """Sets the priority of this UserCredential.
 
 
@@ -167,7 +164,7 @@ def priority(self, priority):
         self._priority = priority
 
     @property
-    def secret_data(self):
+    def secret_data(self) -> str:
         """Gets the secret_data of this UserCredential.
 
 
@@ -177,7 +174,7 @@ def secret_data(self):
         return self._secret_data
 
     @secret_data.setter
-    def secret_data(self, secret_data):
+    def secret_data(self, secret_data: str):
         """Sets the secret_data of this UserCredential.
 
 
@@ -188,7 +185,7 @@ def secret_data(self, secret_data):
         self._secret_data = secret_data
 
     @property
-    def temporary(self):
+    def temporary(self) -> bool:
         """Gets the temporary of this UserCredential.
 
 
@@ -198,7 +195,7 @@ def temporary(self):
         return self._temporary
 
     @temporary.setter
-    def temporary(self, temporary):
+    def temporary(self, temporary: bool):
         """Sets the temporary of this UserCredential.
 
 
@@ -209,7 +206,7 @@ def temporary(self, temporary):
         self._temporary = temporary
 
     @property
-    def type(self):
+    def type(self) -> str:
         """Gets the type of this UserCredential.
 
 
@@ -219,7 +216,7 @@ def type(self):
         return self._type
 
     @type.setter
-    def type(self, type):
+    def type(self, type: str):
         """Sets the type of this UserCredential.
 
 
@@ -230,7 +227,7 @@ def type(self, type):
         self._type = type
 
     @property
-    def user_label(self):
+    def user_label(self) -> str:
         """Gets the user_label of this UserCredential.
 
 
@@ -240,7 +237,7 @@ def user_label(self):
         return self._user_label
 
     @user_label.setter
-    def user_label(self, user_label):
+    def user_label(self, user_label: str):
         """Sets the user_label of this UserCredential.
 
 
@@ -251,7 +248,7 @@ def user_label(self, user_label):
         self._user_label = user_label
 
     @property
-    def value(self):
+    def value(self) -> str:
         """Gets the value of this UserCredential.
 
 
@@ -261,7 +258,7 @@ def value(self):
         return self._value
 
     @value.setter
-    def value(self, value):
+    def value(self, value: str):
         """Sets the value of this UserCredential.
 
 
diff --git a/libraries/models/cloudharness_model/models/user_group.py b/libraries/models/cloudharness_model/models/user_group.py
index 72e135ef..0cf48e99 100644
--- a/libraries/models/cloudharness_model/models/user_group.py
+++ b/libraries/models/cloudharness_model/models/user_group.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -78,7 +75,7 @@ def from_dict(cls, dikt) -> 'UserGroup':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def access(self):
+    def access(self) -> Dict[str, object]:
         """Gets the access of this UserGroup.
 
 
@@ -88,7 +85,7 @@ def access(self):
         return self._access
 
     @access.setter
-    def access(self, access):
+    def access(self, access: Dict[str, object]):
         """Sets the access of this UserGroup.
 
 
@@ -99,7 +96,7 @@ def access(self, access):
         self._access = access
 
     @property
-    def attributes(self):
+    def attributes(self) -> Dict[str, object]:
         """Gets the attributes of this UserGroup.
 
           # noqa: E501
@@ -110,7 +107,7 @@ def attributes(self):
         return self._attributes
 
     @attributes.setter
-    def attributes(self, attributes):
+    def attributes(self, attributes: Dict[str, object]):
         """Sets the attributes of this UserGroup.
 
           # noqa: E501
@@ -122,7 +119,7 @@ def attributes(self, attributes):
         self._attributes = attributes
 
     @property
-    def client_roles(self):
+    def client_roles(self) -> Dict[str, object]:
         """Gets the client_roles of this UserGroup.
 
 
@@ -132,7 +129,7 @@ def client_roles(self):
         return self._client_roles
 
     @client_roles.setter
-    def client_roles(self, client_roles):
+    def client_roles(self, client_roles: Dict[str, object]):
         """Sets the client_roles of this UserGroup.
 
 
@@ -143,7 +140,7 @@ def client_roles(self, client_roles):
         self._client_roles = client_roles
 
     @property
-    def id(self):
+    def id(self) -> str:
         """Gets the id of this UserGroup.
 
 
@@ -153,7 +150,7 @@ def id(self):
         return self._id
 
     @id.setter
-    def id(self, id):
+    def id(self, id: str):
         """Sets the id of this UserGroup.
 
 
@@ -164,7 +161,7 @@ def id(self, id):
         self._id = id
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this UserGroup.
 
 
@@ -174,7 +171,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this UserGroup.
 
 
@@ -185,7 +182,7 @@ def name(self, name):
         self._name = name
 
     @property
-    def path(self):
+    def path(self) -> str:
         """Gets the path of this UserGroup.
 
 
@@ -195,7 +192,7 @@ def path(self):
         return self._path
 
     @path.setter
-    def path(self, path):
+    def path(self, path: str):
         """Sets the path of this UserGroup.
 
 
@@ -206,7 +203,7 @@ def path(self, path):
         self._path = path
 
     @property
-    def realm_roles(self):
+    def realm_roles(self) -> List[str]:
         """Gets the realm_roles of this UserGroup.
 
 
@@ -216,7 +213,7 @@ def realm_roles(self):
         return self._realm_roles
 
     @realm_roles.setter
-    def realm_roles(self, realm_roles):
+    def realm_roles(self, realm_roles: List[str]):
         """Sets the realm_roles of this UserGroup.
 
 
@@ -227,7 +224,7 @@ def realm_roles(self, realm_roles):
         self._realm_roles = realm_roles
 
     @property
-    def sub_groups(self):
+    def sub_groups(self) -> List[UserGroup]:
         """Gets the sub_groups of this UserGroup.
 
 
@@ -237,7 +234,7 @@ def sub_groups(self):
         return self._sub_groups
 
     @sub_groups.setter
-    def sub_groups(self, sub_groups):
+    def sub_groups(self, sub_groups: List[UserGroup]):
         """Sets the sub_groups of this UserGroup.
 
 
diff --git a/libraries/models/cloudharness_model/models/user_role.py b/libraries/models/cloudharness_model/models/user_role.py
index dfa7e529..8cbc7d00 100644
--- a/libraries/models/cloudharness_model/models/user_role.py
+++ b/libraries/models/cloudharness_model/models/user_role.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model_ import Model
+from cloudharness_model.models.base_model import Model
 from cloudharness_model import util
 
 
@@ -73,7 +70,7 @@ def from_dict(cls, dikt) -> 'UserRole':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def attributes(self):
+    def attributes(self) -> Dict[str, object]:
         """Gets the attributes of this UserRole.
 
 
@@ -83,7 +80,7 @@ def attributes(self):
         return self._attributes
 
     @attributes.setter
-    def attributes(self, attributes):
+    def attributes(self, attributes: Dict[str, object]):
         """Sets the attributes of this UserRole.
 
 
@@ -94,7 +91,7 @@ def attributes(self, attributes):
         self._attributes = attributes
 
     @property
-    def client_role(self):
+    def client_role(self) -> bool:
         """Gets the client_role of this UserRole.
 
 
@@ -104,7 +101,7 @@ def client_role(self):
         return self._client_role
 
     @client_role.setter
-    def client_role(self, client_role):
+    def client_role(self, client_role: bool):
         """Sets the client_role of this UserRole.
 
 
@@ -115,7 +112,7 @@ def client_role(self, client_role):
         self._client_role = client_role
 
     @property
-    def composite(self):
+    def composite(self) -> bool:
         """Gets the composite of this UserRole.
 
 
@@ -125,7 +122,7 @@ def composite(self):
         return self._composite
 
     @composite.setter
-    def composite(self, composite):
+    def composite(self, composite: bool):
         """Sets the composite of this UserRole.
 
 
@@ -136,7 +133,7 @@ def composite(self, composite):
         self._composite = composite
 
     @property
-    def container_id(self):
+    def container_id(self) -> str:
         """Gets the container_id of this UserRole.
 
 
@@ -146,7 +143,7 @@ def container_id(self):
         return self._container_id
 
     @container_id.setter
-    def container_id(self, container_id):
+    def container_id(self, container_id: str):
         """Sets the container_id of this UserRole.
 
 
@@ -157,7 +154,7 @@ def container_id(self, container_id):
         self._container_id = container_id
 
     @property
-    def description(self):
+    def description(self) -> str:
         """Gets the description of this UserRole.
 
 
@@ -167,7 +164,7 @@ def description(self):
         return self._description
 
     @description.setter
-    def description(self, description):
+    def description(self, description: str):
         """Sets the description of this UserRole.
 
 
@@ -178,7 +175,7 @@ def description(self, description):
         self._description = description
 
     @property
-    def id(self):
+    def id(self) -> str:
         """Gets the id of this UserRole.
 
 
@@ -188,7 +185,7 @@ def id(self):
         return self._id
 
     @id.setter
-    def id(self, id):
+    def id(self, id: str):
         """Sets the id of this UserRole.
 
 
@@ -199,7 +196,7 @@ def id(self, id):
         self._id = id
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this UserRole.
 
 
@@ -209,7 +206,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this UserRole.
 
 
diff --git a/libraries/models/cloudharness_model/typing_utils.py b/libraries/models/cloudharness_model/typing_utils.py
index 0563f81f..74e3c913 100644
--- a/libraries/models/cloudharness_model/typing_utils.py
+++ b/libraries/models/cloudharness_model/typing_utils.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 import sys
 
 if sys.version_info < (3, 7):
diff --git a/libraries/models/tox.ini b/libraries/models/tox.ini
index e76b6dbf..132efa3e 100644
--- a/libraries/models/tox.ini
+++ b/libraries/models/tox.ini
@@ -5,7 +5,7 @@ skipsdist=True
 [testenv]
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
-	 {toxinidir}
+     {toxinidir}
 
 commands=
    pytest --cov=cloudharness_model

From 831bd1c5644d1aa88af48c6a4195f810da952244 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 29 Jul 2024 16:06:29 +0100
Subject: [PATCH 097/210] CH-91 Updated the auto deployment template to include
 the envmap and added an example to samples

---
 .../samples/controllers/test_controller.py       | 16 ++++++++++++++++
 applications/samples/deploy/values.yaml          |  3 +++
 .../helm/templates/auto-deployments.yaml         |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/applications/samples/backend/samples/controllers/test_controller.py b/applications/samples/backend/samples/controllers/test_controller.py
index e792c99e..3fb922f2 100644
--- a/applications/samples/backend/samples/controllers/test_controller.py
+++ b/applications/samples/backend/samples/controllers/test_controller.py
@@ -22,6 +22,22 @@ def ping():  # noqa: E501
 
     :rtype: str
     """
+
+    import os
+    
+    expected_environment_variables = {
+        'ENVIRONMENT_TEST_A': 'value',
+        'ENVIRONMENT_TEST_B': '123',
+    }
+    
+    for key, expected_value in expected_environment_variables.items():
+        try:
+            environment_value = os.environ[key]
+            if environment_value != expected_value:
+                raise Exception(f'Expected environment variable {key} to be {expected_value}, but got {environment_value}')
+        except KeyError:
+            raise Exception(f'Expected to have an environment variable {key} defined')
+            
     import time
     return time.time()
 
diff --git a/applications/samples/deploy/values.yaml b/applications/samples/deploy/values.yaml
index 6265c681..ab22f1e5 100644
--- a/applications/samples/deploy/values.yaml
+++ b/applications/samples/deploy/values.yaml
@@ -39,6 +39,9 @@ harness:
   env:
     - name: WORKERS
       value: "3"
+  envmap:
+    ENVIRONMENT_TEST_A: "value"
+    ENVIRONMENT_TEST_B: 123
   dependencies:
     soft:
       - workflows
diff --git a/deployment-configuration/helm/templates/auto-deployments.yaml b/deployment-configuration/helm/templates/auto-deployments.yaml
index 23d4f61c..6981c2fd 100644
--- a/deployment-configuration/helm/templates/auto-deployments.yaml
+++ b/deployment-configuration/helm/templates/auto-deployments.yaml
@@ -66,6 +66,10 @@ spec:
           {{- if .app.harness.env }}
             {{- .app.harness.env | toYaml | nindent 8 }}
           {{- end }}
+          {{- range $name, $value := .app.harness.envmap }}
+        - name: {{ $name | quote }}
+          value: {{ $value | quote }}
+          {{- end }}
 {{ if .app.harness.livenessProbe }}
         livenessProbe:
           httpGet:

From 9d7a648789908d6c2c5484b204e06f6df3c3c640 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 29 Jul 2024 16:56:01 +0100
Subject: [PATCH 098/210] CH-91 Updated documentation around environment
 variables

---
 docs/applications/README.md                |  5 ++-
 docs/applications/environment-variables.md | 46 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 docs/applications/environment-variables.md

diff --git a/docs/applications/README.md b/docs/applications/README.md
index e76bd861..da0c44fa 100644
--- a/docs/applications/README.md
+++ b/docs/applications/README.md
@@ -109,7 +109,10 @@ The most important configuration entries are the following:
     - `postgres`: postgres specific configurations
     - `mongo`: mongo specific configurations
     - `neo4j`: neo4j specific configurations
-  - `env` (`{name, value}[]`): add custom environment variables 
+  - `envmap`: add custom environment variables
+    - `<environment_variable_name>`: `<environment_variable_value>`
+    - ...
+  - `env` (`{name, value}[]`): add custom environment variables (deprecated, please use `envmap`)
   - `resources`: mount files from  
   - `use_services` (`{name, src, dst}[]`): create reverse proxy endpoints in the ingress for the listed applications on [subdomain].[Values.domain]/proxy/[name]. Useful to avoid CORS requests from frontend clients
   - `readinessProbe`: defines a a url to use as a readiness probe
diff --git a/docs/applications/environment-variables.md b/docs/applications/environment-variables.md
new file mode 100644
index 00000000..f986ec38
--- /dev/null
+++ b/docs/applications/environment-variables.md
@@ -0,0 +1,46 @@
+# CloudHarness Environment Variables
+
+CloudHarness has support for adding environment variables for an application which will be available to all containers within the application pod.
+
+## Automatically included environment variables
+
+The following environment variables are included in each container by default:
+- `CH_CURRENT_APP_NAME`: the name of the application
+- Any environment variables defined in the root `.Values.env`
+- If `accounts` is an included application:
+    - `CH_ACCOUNTS_CLIENT_SECRET`: the client secret for the accounts
+    - `CH_ACCOUNTS_REALM`: the accounts realm
+    - `CH_ACCOUNTS_AUTH_DOMAIN`: the auth domain for the accounts
+    - `CH_ACCOUNTS_CLIENT_ID`: the client id for the accounts
+    - `DOMAIN`: the domain for the accounts
+
+## Environment variables definition in CloudHarness
+
+Environment variables are defined in the application values.yaml file in the `envmap` section under the `harness` section.
+Example
+
+```yaml
+harness:
+  envmap:
+    ENV_VARIABLE_A: <value>
+    ...
+```
+
+Each key in the `envmap` will add an environment variable with a name matching the key and a value equal to the value provided. The value can be any primitive type, but will be quoted as a string within the deployment template.
+
+### (Deprecated) Setting with `env`
+
+Environment variables can be defined by using the `env` section under the `harness` section. This functionality is deprecated but not yet obsoleted, and use of `envmap` should be preferred over this approach.
+Example
+
+```yaml
+harness:
+  env:
+  - name: ENV_VARIABLE_A
+    value: <value>
+  ...
+```
+
+Each element of the `env` sequence will add an environment variable named `name` with value set from `value`.
+
+This functionality was deprecated as cloud harness cannot merge arrays, so if an environment variable needed changing in a specific environment the entire array must be reproduced to change the single variable.
\ No newline at end of file

From aec6e664b55150b5810b2897016d6292f4f5e02c Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 29 Jul 2024 18:53:28 +0200
Subject: [PATCH 099/210] CH-140 fixes

---
 applications/samples/api/openapi.yaml         |   4 +-
 applications/samples/backend/requirements.txt |   1 -
 .../controllers/resource_controller.py        |   4 +-
 .../samples/backend/samples/encoder.py        |   8 +-
 .../backend/samples/models/__init__.py        |   3 -
 .../backend/samples/models/base_model.py      |  68 +++
 .../samples/models/inline_response202.py      |   9 +-
 .../samples/models/inline_response202_task.py |  13 +-
 .../backend/samples/models/sample_resource.py |  17 +-
 .../backend/samples/openapi/openapi.yaml      |   2 +-
 .../samples/backend/samples/typing_utils.py   |   2 -
 applications/samples/backend/samples/util.py  |   9 +-
 applications/samples/backend/setup.py         |   1 -
 applications/samples/backend/tox.ini          |   2 +-
 .../backend/www/assets/index-Cyl2oP5E.css     |   1 +
 .../backend/www/assets/index-DtmKuX2X.js      | 209 +++++++++
 applications/samples/backend/www/favicon.png  | Bin 0 -> 5899 bytes
 applications/samples/backend/www/index.html   |  17 +
 applications/samples/backend/www/logo.png     | Bin 0 -> 180296 bytes
 applications/samples/deploy/values.yaml       |  32 +-
 applications/samples/frontend/src/rest/api.ts | 132 +++---
 .../samples/frontend/src/rest/base.ts         |  25 +-
 .../samples/frontend/src/rest/common.ts       |  10 +-
 .../frontend/src/rest/configuration.ts        |   9 +
 applications/samples/test/e2e/samples.spec.ts |   2 +-
 applications/workflows/api/openapi.yaml       | 183 ++++----
 deployment/codefresh-test.yaml                | 421 ++++++++----------
 .../cloudharness/utils/server.py              |  11 +-
 .../cloudharness/workflows/operations.py      |  47 +-
 libraries/cloudharness-common/setup.py        |   2 +-
 libraries/cloudharness-utils/setup.py         |   2 +-
 .../cloudharness_test/apitest_init.py         |   4 +-
 .../ch_cli_tools/openapi.py                   |  27 +-
 33 files changed, 783 insertions(+), 494 deletions(-)
 create mode 100644 applications/samples/backend/samples/models/base_model.py
 create mode 100644 applications/samples/backend/www/assets/index-Cyl2oP5E.css
 create mode 100644 applications/samples/backend/www/assets/index-DtmKuX2X.js
 create mode 100644 applications/samples/backend/www/favicon.png
 create mode 100644 applications/samples/backend/www/index.html
 create mode 100644 applications/samples/backend/www/logo.png

diff --git a/applications/samples/api/openapi.yaml b/applications/samples/api/openapi.yaml
index ac78581f..3332cd2b 100644
--- a/applications/samples/api/openapi.yaml
+++ b/applications/samples/api/openapi.yaml
@@ -1,4 +1,4 @@
-openapi: 3.0.0
+openapi: "3.0.3"
 info:
   title: CloudHarness Sample API
   version: 0.1.0
@@ -27,7 +27,7 @@ paths:
       operationId: error
       summary: test sentry is working
       x-openapi-router-controller: samples.controllers.test_controller
-  
+
   /ping:
     get:
       tags:
diff --git a/applications/samples/backend/requirements.txt b/applications/samples/backend/requirements.txt
index b3db72c8..a5ddff35 100644
--- a/applications/samples/backend/requirements.txt
+++ b/applications/samples/backend/requirements.txt
@@ -1,5 +1,4 @@
 connexion[swagger-ui]==2.14.2
-swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0
 Flask<3.0.0
diff --git a/applications/samples/backend/samples/controllers/resource_controller.py b/applications/samples/backend/samples/controllers/resource_controller.py
index 3204708b..4f17d3da 100644
--- a/applications/samples/backend/samples/controllers/resource_controller.py
+++ b/applications/samples/backend/samples/controllers/resource_controller.py
@@ -23,9 +23,9 @@ def create_sample_resource(sample_resource=None):  # noqa: E501
             return "Payload is not of type SampleResource", 400
 
     # Create a file inside the nfs
-    with open("/mnt/myvolume/myfile", "w") as f:
+    with open("/tmp/myvolume/myfile", "w") as f:
         print("test", file=f)
-            
+
     return resource_service.create_sample_resource(sample_resource), 201
 
 
diff --git a/applications/samples/backend/samples/encoder.py b/applications/samples/backend/samples/encoder.py
index fe2c3b18..ce94c8c8 100644
--- a/applications/samples/backend/samples/encoder.py
+++ b/applications/samples/backend/samples/encoder.py
@@ -1,8 +1,6 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
 
-import six
-
-from samples.models.base_model_ import Model
-from flask.json import FlaskJSONEncoder
+from samples.models.base_model import Model
 
 
 class JSONEncoder(FlaskJSONEncoder):
@@ -11,7 +9,7 @@ class JSONEncoder(FlaskJSONEncoder):
     def default(self, o):
         if isinstance(o, Model):
             dikt = {}
-            for attr, _ in six.iteritems(o.openapi_types):
+            for attr in o.openapi_types:
                 value = getattr(o, attr)
                 if value is None and not self.include_nulls:
                     continue
diff --git a/applications/samples/backend/samples/models/__init__.py b/applications/samples/backend/samples/models/__init__.py
index 4034deb6..94617398 100644
--- a/applications/samples/backend/samples/models/__init__.py
+++ b/applications/samples/backend/samples/models/__init__.py
@@ -1,7 +1,4 @@
-# coding: utf-8
-
 # flake8: noqa
-from __future__ import absolute_import
 # import models into model package
 from samples.models.inline_response202 import InlineResponse202
 from samples.models.inline_response202_task import InlineResponse202Task
diff --git a/applications/samples/backend/samples/models/base_model.py b/applications/samples/backend/samples/models/base_model.py
new file mode 100644
index 00000000..30bbbb63
--- /dev/null
+++ b/applications/samples/backend/samples/models/base_model.py
@@ -0,0 +1,68 @@
+import pprint
+
+import typing
+
+from samples import util
+
+T = typing.TypeVar('T')
+
+
+class Model:
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types: typing.Dict[str, type] = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map: typing.Dict[str, str] = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr in self.openapi_types:
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/applications/samples/backend/samples/models/inline_response202.py b/applications/samples/backend/samples/models/inline_response202.py
index b6d2a3ca..e98cb00e 100644
--- a/applications/samples/backend/samples/models/inline_response202.py
+++ b/applications/samples/backend/samples/models/inline_response202.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from samples.models.base_model_ import Model
+from samples.models.base_model import Model
 from samples.models.inline_response202_task import InlineResponse202Task
 from samples import util
 
@@ -45,7 +42,7 @@ def from_dict(cls, dikt) -> 'InlineResponse202':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def task(self):
+    def task(self) -> InlineResponse202Task:
         """Gets the task of this InlineResponse202.
 
 
@@ -55,7 +52,7 @@ def task(self):
         return self._task
 
     @task.setter
-    def task(self, task):
+    def task(self, task: InlineResponse202Task):
         """Sets the task of this InlineResponse202.
 
 
diff --git a/applications/samples/backend/samples/models/inline_response202_task.py b/applications/samples/backend/samples/models/inline_response202_task.py
index e9a53b7f..2c4af7a0 100644
--- a/applications/samples/backend/samples/models/inline_response202_task.py
+++ b/applications/samples/backend/samples/models/inline_response202_task.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from samples.models.base_model_ import Model
+from samples.models.base_model import Model
 from samples import util
 
 
@@ -48,7 +45,7 @@ def from_dict(cls, dikt) -> 'InlineResponse202Task':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def href(self):
+    def href(self) -> str:
         """Gets the href of this InlineResponse202Task.
 
         the url where to check the operation status  # noqa: E501
@@ -59,7 +56,7 @@ def href(self):
         return self._href
 
     @href.setter
-    def href(self, href):
+    def href(self, href: str):
         """Sets the href of this InlineResponse202Task.
 
         the url where to check the operation status  # noqa: E501
@@ -71,7 +68,7 @@ def href(self, href):
         self._href = href
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Gets the name of this InlineResponse202Task.
 
 
@@ -81,7 +78,7 @@ def name(self):
         return self._name
 
     @name.setter
-    def name(self, name):
+    def name(self, name: str):
         """Sets the name of this InlineResponse202Task.
 
 
diff --git a/applications/samples/backend/samples/models/sample_resource.py b/applications/samples/backend/samples/models/sample_resource.py
index 1deca853..d5477452 100644
--- a/applications/samples/backend/samples/models/sample_resource.py
+++ b/applications/samples/backend/samples/models/sample_resource.py
@@ -1,11 +1,8 @@
-# coding: utf-8
-
-from __future__ import absolute_import
 from datetime import date, datetime  # noqa: F401
 
 from typing import List, Dict  # noqa: F401
 
-from samples.models.base_model_ import Model
+from samples.models.base_model import Model
 from samples import util
 
 
@@ -53,7 +50,7 @@ def from_dict(cls, dikt) -> 'SampleResource':
         return util.deserialize_model(dikt, cls)
 
     @property
-    def a(self):
+    def a(self) -> float:
         """Gets the a of this SampleResource.
 
           # noqa: E501
@@ -64,7 +61,7 @@ def a(self):
         return self._a
 
     @a.setter
-    def a(self, a):
+    def a(self, a: float):
         """Sets the a of this SampleResource.
 
           # noqa: E501
@@ -78,7 +75,7 @@ def a(self, a):
         self._a = a
 
     @property
-    def b(self):
+    def b(self) -> float:
         """Gets the b of this SampleResource.
 
           # noqa: E501
@@ -89,7 +86,7 @@ def b(self):
         return self._b
 
     @b.setter
-    def b(self, b):
+    def b(self, b: float):
         """Sets the b of this SampleResource.
 
           # noqa: E501
@@ -101,7 +98,7 @@ def b(self, b):
         self._b = b
 
     @property
-    def id(self):
+    def id(self) -> float:
         """Gets the id of this SampleResource.
 
           # noqa: E501
@@ -112,7 +109,7 @@ def id(self):
         return self._id
 
     @id.setter
-    def id(self, id):
+    def id(self, id: float):
         """Sets the id of this SampleResource.
 
           # noqa: E501
diff --git a/applications/samples/backend/samples/openapi/openapi.yaml b/applications/samples/backend/samples/openapi/openapi.yaml
index 4e63db55..6a875771 100644
--- a/applications/samples/backend/samples/openapi/openapi.yaml
+++ b/applications/samples/backend/samples/openapi/openapi.yaml
@@ -1,4 +1,4 @@
-openapi: 3.0.0
+openapi: 3.0.3
 info:
   contact:
     email: cloudharness@metacell.us
diff --git a/applications/samples/backend/samples/typing_utils.py b/applications/samples/backend/samples/typing_utils.py
index 0563f81f..74e3c913 100644
--- a/applications/samples/backend/samples/typing_utils.py
+++ b/applications/samples/backend/samples/typing_utils.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 import sys
 
 if sys.version_info < (3, 7):
diff --git a/applications/samples/backend/samples/util.py b/applications/samples/backend/samples/util.py
index 96a83499..5b241814 100644
--- a/applications/samples/backend/samples/util.py
+++ b/applications/samples/backend/samples/util.py
@@ -1,6 +1,5 @@
 import datetime
 
-import six
 import typing
 from samples import typing_utils
 
@@ -16,7 +15,7 @@ def _deserialize(data, klass):
     if data is None:
         return None
 
-    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+    if klass in (int, float, str, bool, bytearray):
         return _deserialize_primitive(data, klass)
     elif klass == object:
         return _deserialize_object(data)
@@ -45,7 +44,7 @@ def _deserialize_primitive(data, klass):
     try:
         value = klass(data)
     except UnicodeEncodeError:
-        value = six.u(data)
+        value = data
     except TypeError:
         value = data
     return value
@@ -110,7 +109,7 @@ def deserialize_model(data, klass):
     if not instance.openapi_types:
         return data
 
-    for attr, attr_type in six.iteritems(instance.openapi_types):
+    for attr, attr_type in instance.openapi_types.items():
         if data is not None \
                 and instance.attribute_map[attr] in data \
                 and isinstance(data, (list, dict)):
@@ -145,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
     :rtype: dict
     """
     return {k: _deserialize(v, boxed_type)
-            for k, v in six.iteritems(data)}
+            for k, v in data.items() }
diff --git a/applications/samples/backend/setup.py b/applications/samples/backend/setup.py
index 471cf86b..16908eb6 100644
--- a/applications/samples/backend/setup.py
+++ b/applications/samples/backend/setup.py
@@ -15,7 +15,6 @@
 
 REQUIRES = [
     "connexion>=2.0.2",
-    "swagger-ui-bundle>=0.0.2",
     "python_dateutil>=2.6.0",
     "pyjwt>=2.6.0",
     "cloudharness"
diff --git a/applications/samples/backend/tox.ini b/applications/samples/backend/tox.ini
index df3f1773..5d5ecced 100644
--- a/applications/samples/backend/tox.ini
+++ b/applications/samples/backend/tox.ini
@@ -5,7 +5,7 @@ skipsdist=True
 [testenv]
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
-	 {toxinidir}
+     {toxinidir}
 
 commands=
    pytest --cov=samples
diff --git a/applications/samples/backend/www/assets/index-Cyl2oP5E.css b/applications/samples/backend/www/assets/index-Cyl2oP5E.css
new file mode 100644
index 00000000..aef4555b
--- /dev/null
+++ b/applications/samples/backend/www/assets/index-Cyl2oP5E.css
@@ -0,0 +1 @@
+body{text-align:center;background-color:"#eeeeee";font-family:Roboto,Helvetica,sans-serif}
diff --git a/applications/samples/backend/www/assets/index-DtmKuX2X.js b/applications/samples/backend/www/assets/index-DtmKuX2X.js
new file mode 100644
index 00000000..19bf27f5
--- /dev/null
+++ b/applications/samples/backend/www/assets/index-DtmKuX2X.js
@@ -0,0 +1,209 @@
+(function(){const s=document.createElement("link").relList;if(s&&s.supports&&s.supports("modulepreload"))return;for(const y of document.querySelectorAll('link[rel="modulepreload"]'))v(y);new MutationObserver(y=>{for(const S of y)if(S.type==="childList")for(const f of S.addedNodes)f.tagName==="LINK"&&f.rel==="modulepreload"&&v(f)}).observe(document,{childList:!0,subtree:!0});function p(y){const S={};return y.integrity&&(S.integrity=y.integrity),y.referrerPolicy&&(S.referrerPolicy=y.referrerPolicy),y.crossOrigin==="use-credentials"?S.credentials="include":y.crossOrigin==="anonymous"?S.credentials="omit":S.credentials="same-origin",S}function v(y){if(y.ep)return;y.ep=!0;const S=p(y);fetch(y.href,S)}})();function cA(l){return l&&l.__esModule&&Object.prototype.hasOwnProperty.call(l,"default")?l.default:l}var SE={exports:{}},Uh={},EE={exports:{}},hf={exports:{}};hf.exports;(function(l,s){/**
+ * @license React
+ * react.development.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */(function(){typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart=="function"&&__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error);var p="18.3.1",v=Symbol.for("react.element"),y=Symbol.for("react.portal"),S=Symbol.for("react.fragment"),f=Symbol.for("react.strict_mode"),N=Symbol.for("react.profiler"),z=Symbol.for("react.provider"),U=Symbol.for("react.context"),M=Symbol.for("react.forward_ref"),F=Symbol.for("react.suspense"),ee=Symbol.for("react.suspense_list"),$=Symbol.for("react.memo"),B=Symbol.for("react.lazy"),ce=Symbol.for("react.offscreen"),Je=Symbol.iterator,Ye="@@iterator";function Ce(d){if(d===null||typeof d!="object")return null;var g=Je&&d[Je]||d[Ye];return typeof g=="function"?g:null}var ne={current:null},Ke={transition:null},de={current:null,isBatchingLegacy:!1,didScheduleLegacyUpdate:!1},Fe={current:null},ge={},Gt=null;function Cn(d){Gt=d}ge.setExtraStackFrame=function(d){Gt=d},ge.getCurrentStack=null,ge.getStackAddendum=function(){var d="";Gt&&(d+=Gt);var g=ge.getCurrentStack;return g&&(d+=g()||""),d};var Rt=!1,rt=!1,Fn=!1,xe=!1,Ve=!1,yt={ReactCurrentDispatcher:ne,ReactCurrentBatchConfig:Ke,ReactCurrentOwner:Fe};yt.ReactDebugCurrentFrame=ge,yt.ReactCurrentActQueue=de;function gt(d){{for(var g=arguments.length,D=new Array(g>1?g-1:0),O=1;O<g;O++)D[O-1]=arguments[O];It("warn",d,D)}}function be(d){{for(var g=arguments.length,D=new Array(g>1?g-1:0),O=1;O<g;O++)D[O-1]=arguments[O];It("error",d,D)}}function It(d,g,D){{var O=yt.ReactDebugCurrentFrame,P=O.getStackAddendum();P!==""&&(g+="%s",D=D.concat([P]));var le=D.map(function(Z){return String(Z)});le.unshift("Warning: "+g),Function.prototype.apply.call(console[d],console,le)}}var jr={};function er(d,g){{var D=d.constructor,O=D&&(D.displayName||D.name)||"ReactClass",P=O+"."+g;if(jr[P])return;be("Can't call %s on a component that is not yet mounted. This is a no-op, but it might indicate a bug in your application. Instead, assign to `this.state` directly or define a `state = {};` class property with the desired state in the %s component.",g,O),jr[P]=!0}}var hr={isMounted:function(d){return!1},enqueueForceUpdate:function(d,g,D){er(d,"forceUpdate")},enqueueReplaceState:function(d,g,D,O){er(d,"replaceState")},enqueueSetState:function(d,g,D,O){er(d,"setState")}},Ht=Object.assign,Tn={};Object.freeze(Tn);function Hn(d,g,D){this.props=d,this.context=g,this.refs=Tn,this.updater=D||hr}Hn.prototype.isReactComponent={},Hn.prototype.setState=function(d,g){if(typeof d!="object"&&typeof d!="function"&&d!=null)throw new Error("setState(...): takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,d,g,"setState")},Hn.prototype.forceUpdate=function(d){this.updater.enqueueForceUpdate(this,d,"forceUpdate")};{var Vr={isMounted:["isMounted","Instead, make sure to clean up subscriptions and pending requests in componentWillUnmount to prevent memory leaks."],replaceState:["replaceState","Refactor your code to use setState instead (see https://github.com/facebook/react/issues/3236)."]},mr=function(d,g){Object.defineProperty(Hn.prototype,d,{get:function(){gt("%s(...) is deprecated in plain JavaScript React classes. %s",g[0],g[1])}})};for(var yr in Vr)Vr.hasOwnProperty(yr)&&mr(yr,Vr[yr])}function tr(){}tr.prototype=Hn.prototype;function Wt(d,g,D){this.props=d,this.context=g,this.refs=Tn,this.updater=D||hr}var xn=Wt.prototype=new tr;xn.constructor=Wt,Ht(xn,Hn.prototype),xn.isPureReactComponent=!0;function jn(){var d={current:null};return Object.seal(d),d}var Vn=Array.isArray;function Ct(d){return Vn(d)}function an(d){{var g=typeof Symbol=="function"&&Symbol.toStringTag,D=g&&d[Symbol.toStringTag]||d.constructor.name||"Object";return D}}function jt(d){try{return wt(d),!1}catch{return!0}}function wt(d){return""+d}function Ot(d){if(jt(d))return be("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.",an(d)),wt(d)}function Bn(d,g,D){var O=d.displayName;if(O)return O;var P=g.displayName||g.name||"";return P!==""?D+"("+P+")":D}function nr(d){return d.displayName||"Context"}function Dn(d){if(d==null)return null;if(typeof d.tag=="number"&&be("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."),typeof d=="function")return d.displayName||d.name||null;if(typeof d=="string")return d;switch(d){case S:return"Fragment";case y:return"Portal";case N:return"Profiler";case f:return"StrictMode";case F:return"Suspense";case ee:return"SuspenseList"}if(typeof d=="object")switch(d.$$typeof){case U:var g=d;return nr(g)+".Consumer";case z:var D=d;return nr(D._context)+".Provider";case M:return Bn(d,d.render,"ForwardRef");case $:var O=d.displayName||null;return O!==null?O:Dn(d.type)||"Memo";case B:{var P=d,le=P._payload,Z=P._init;try{return Dn(Z(le))}catch{return null}}}return null}var gr=Object.prototype.hasOwnProperty,rr={key:!0,ref:!0,__self:!0,__source:!0},hn,ar,on;on={};function Pn(d){if(gr.call(d,"ref")){var g=Object.getOwnPropertyDescriptor(d,"ref").get;if(g&&g.isReactWarning)return!1}return d.ref!==void 0}function bt(d){if(gr.call(d,"key")){var g=Object.getOwnPropertyDescriptor(d,"key").get;if(g&&g.isReactWarning)return!1}return d.key!==void 0}function ir(d,g){var D=function(){hn||(hn=!0,be("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)",g))};D.isReactWarning=!0,Object.defineProperty(d,"key",{get:D,configurable:!0})}function ra(d,g){var D=function(){ar||(ar=!0,be("%s: `ref` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)",g))};D.isReactWarning=!0,Object.defineProperty(d,"ref",{get:D,configurable:!0})}function aa(d){if(typeof d.ref=="string"&&Fe.current&&d.__self&&Fe.current.stateNode!==d.__self){var g=Dn(Fe.current.type);on[g]||(be('Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. This case cannot be automatically converted to an arrow function. We ask you to manually fix this case by using useRef() or createRef() instead. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-string-ref',g,d.ref),on[g]=!0)}}var q=function(d,g,D,O,P,le,Z){var pe={$$typeof:v,type:d,key:g,ref:D,props:Z,_owner:le};return pe._store={},Object.defineProperty(pe._store,"validated",{configurable:!1,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(pe,"_self",{configurable:!1,enumerable:!1,writable:!1,value:O}),Object.defineProperty(pe,"_source",{configurable:!1,enumerable:!1,writable:!1,value:P}),Object.freeze&&(Object.freeze(pe.props),Object.freeze(pe)),pe};function re(d,g,D){var O,P={},le=null,Z=null,pe=null,Le=null;if(g!=null){Pn(g)&&(Z=g.ref,aa(g)),bt(g)&&(Ot(g.key),le=""+g.key),pe=g.__self===void 0?null:g.__self,Le=g.__source===void 0?null:g.__source;for(O in g)gr.call(g,O)&&!rr.hasOwnProperty(O)&&(P[O]=g[O])}var Ie=arguments.length-2;if(Ie===1)P.children=D;else if(Ie>1){for(var et=Array(Ie),tt=0;tt<Ie;tt++)et[tt]=arguments[tt+2];Object.freeze&&Object.freeze(et),P.children=et}if(d&&d.defaultProps){var ut=d.defaultProps;for(O in ut)P[O]===void 0&&(P[O]=ut[O])}if(le||Z){var pt=typeof d=="function"?d.displayName||d.name||"Unknown":d;le&&ir(P,pt),Z&&ra(P,pt)}return q(d,le,Z,pe,Le,Fe.current,P)}function De(d,g){var D=q(d.type,g,d.ref,d._self,d._source,d._owner,d.props);return D}function qe(d,g,D){if(d==null)throw new Error("React.cloneElement(...): The argument must be a React element, but you passed "+d+".");var O,P=Ht({},d.props),le=d.key,Z=d.ref,pe=d._self,Le=d._source,Ie=d._owner;if(g!=null){Pn(g)&&(Z=g.ref,Ie=Fe.current),bt(g)&&(Ot(g.key),le=""+g.key);var et;d.type&&d.type.defaultProps&&(et=d.type.defaultProps);for(O in g)gr.call(g,O)&&!rr.hasOwnProperty(O)&&(g[O]===void 0&&et!==void 0?P[O]=et[O]:P[O]=g[O])}var tt=arguments.length-2;if(tt===1)P.children=D;else if(tt>1){for(var ut=Array(tt),pt=0;pt<tt;pt++)ut[pt]=arguments[pt+2];P.children=ut}return q(d.type,le,Z,pe,Le,Ie,P)}function Ge(d){return typeof d=="object"&&d!==null&&d.$$typeof===v}var _t=".",St=":";function wn(d){var g=/[=:]/g,D={"=":"=0",":":"=2"},O=d.replace(g,function(P){return D[P]});return"$"+O}var Ze=!1,$n=/\/+/g;function it(d){return d.replace($n,"$&/")}function ot(d,g){return typeof d=="object"&&d!==null&&d.key!=null?(Ot(d.key),wn(""+d.key)):g.toString(36)}function Br(d,g,D,O,P){var le=typeof d;(le==="undefined"||le==="boolean")&&(d=null);var Z=!1;if(d===null)Z=!0;else switch(le){case"string":case"number":Z=!0;break;case"object":switch(d.$$typeof){case v:case y:Z=!0}}if(Z){var pe=d,Le=P(pe),Ie=O===""?_t+ot(pe,0):O;if(Ct(Le)){var et="";Ie!=null&&(et=it(Ie)+"/"),Br(Le,g,et,"",function(wf){return wf})}else Le!=null&&(Ge(Le)&&(Le.key&&(!pe||pe.key!==Le.key)&&Ot(Le.key),Le=De(Le,D+(Le.key&&(!pe||pe.key!==Le.key)?it(""+Le.key)+"/":"")+Ie)),g.push(Le));return 1}var tt,ut,pt=0,Be=O===""?_t:O+St;if(Ct(d))for(var Va=0;Va<d.length;Va++)tt=d[Va],ut=Be+ot(tt,Va),pt+=Br(tt,g,D,ut,P);else{var ao=Ce(d);if(typeof ao=="function"){var mu=d;ao===mu.entries&&(Ze||gt("Using Maps as children is not supported. Use an array of keyed ReactElements instead."),Ze=!0);for(var Df=ao.call(mu),sa,yu=0;!(sa=Df.next()).done;)tt=sa.value,ut=Be+ot(tt,yu++),pt+=Br(tt,g,D,ut,P)}else if(le==="object"){var gu=String(d);throw new Error("Objects are not valid as a React child (found: "+(gu==="[object Object]"?"object with keys {"+Object.keys(d).join(", ")+"}":gu)+"). If you meant to render a collection of children, use an array instead.")}}return pt}function br(d,g,D){if(d==null)return d;var O=[],P=0;return Br(d,O,"","",function(le){return g.call(D,le,P++)}),O}function fi(d){var g=0;return br(d,function(){g++}),g}function Ki(d,g,D){br(d,function(){g.apply(this,arguments)},D)}function tu(d){return br(d,function(g){return g})||[]}function di(d){if(!Ge(d))throw new Error("React.Children.only expected to receive a single React element child.");return d}function pi(d){var g={$$typeof:U,_currentValue:d,_currentValue2:d,_threadCount:0,Provider:null,Consumer:null,_defaultValue:null,_globalName:null};g.Provider={$$typeof:z,_context:g};var D=!1,O=!1,P=!1;{var le={$$typeof:U,_context:g};Object.defineProperties(le,{Provider:{get:function(){return O||(O=!0,be("Rendering <Context.Consumer.Provider> is not supported and will be removed in a future major release. Did you mean to render <Context.Provider> instead?")),g.Provider},set:function(Z){g.Provider=Z}},_currentValue:{get:function(){return g._currentValue},set:function(Z){g._currentValue=Z}},_currentValue2:{get:function(){return g._currentValue2},set:function(Z){g._currentValue2=Z}},_threadCount:{get:function(){return g._threadCount},set:function(Z){g._threadCount=Z}},Consumer:{get:function(){return D||(D=!0,be("Rendering <Context.Consumer.Consumer> is not supported and will be removed in a future major release. Did you mean to render <Context.Consumer> instead?")),g.Consumer}},displayName:{get:function(){return g.displayName},set:function(Z){P||(gt("Setting `displayName` on Context.Consumer has no effect. You should set it directly on the context with Context.displayName = '%s'.",Z),P=!0)}}}),g.Consumer=le}return g._currentRenderer=null,g._currentRenderer2=null,g}var ia=-1,Ma=0,oa=1,Pr=2;function Sr(d){if(d._status===ia){var g=d._result,D=g();if(D.then(function(le){if(d._status===Ma||d._status===ia){var Z=d;Z._status=oa,Z._result=le}},function(le){if(d._status===Ma||d._status===ia){var Z=d;Z._status=Pr,Z._result=le}}),d._status===ia){var O=d;O._status=Ma,O._result=D}}if(d._status===oa){var P=d._result;return P===void 0&&be(`lazy: Expected the result of a dynamic import() call. Instead received: %s
+
+Your code should look like: 
+  const MyComponent = lazy(() => import('./MyComponent'))
+
+Did you accidentally put curly braces around the import?`,P),"default"in P||be(`lazy: Expected the result of a dynamic import() call. Instead received: %s
+
+Your code should look like: 
+  const MyComponent = lazy(() => import('./MyComponent'))`,P),P.default}else throw d._result}function b(d){var g={_status:ia,_result:d},D={$$typeof:B,_payload:g,_init:Sr};{var O,P;Object.defineProperties(D,{defaultProps:{configurable:!0,get:function(){return O},set:function(le){be("React.lazy(...): It is not supported to assign `defaultProps` to a lazy component import. Either specify them where the component is defined, or create a wrapping component around it."),O=le,Object.defineProperty(D,"defaultProps",{enumerable:!0})}},propTypes:{configurable:!0,get:function(){return P},set:function(le){be("React.lazy(...): It is not supported to assign `propTypes` to a lazy component import. Either specify them where the component is defined, or create a wrapping component around it."),P=le,Object.defineProperty(D,"propTypes",{enumerable:!0})}}})}return D}function j(d){d!=null&&d.$$typeof===$?be("forwardRef requires a render function but received a `memo` component. Instead of forwardRef(memo(...)), use memo(forwardRef(...))."):typeof d!="function"?be("forwardRef requires a render function but was given %s.",d===null?"null":typeof d):d.length!==0&&d.length!==2&&be("forwardRef render functions accept exactly two parameters: props and ref. %s",d.length===1?"Did you forget to use the ref parameter?":"Any additional parameter will be undefined."),d!=null&&(d.defaultProps!=null||d.propTypes!=null)&&be("forwardRef render functions do not support propTypes or defaultProps. Did you accidentally pass a React component?");var g={$$typeof:M,render:d};{var D;Object.defineProperty(g,"displayName",{enumerable:!1,configurable:!0,get:function(){return D},set:function(O){D=O,!d.name&&!d.displayName&&(d.displayName=O)}})}return g}var G;G=Symbol.for("react.module.reference");function oe(d){return!!(typeof d=="string"||typeof d=="function"||d===S||d===N||Ve||d===f||d===F||d===ee||xe||d===ce||Rt||rt||Fn||typeof d=="object"&&d!==null&&(d.$$typeof===B||d.$$typeof===$||d.$$typeof===z||d.$$typeof===U||d.$$typeof===M||d.$$typeof===G||d.getModuleId!==void 0))}function Ae(d,g){oe(d)||be("memo: The first argument must be a component. Instead received: %s",d===null?"null":typeof d);var D={$$typeof:$,type:d,compare:g===void 0?null:g};{var O;Object.defineProperty(D,"displayName",{enumerable:!1,configurable:!0,get:function(){return O},set:function(P){O=P,!d.name&&!d.displayName&&(d.displayName=P)}})}return D}function fe(){var d=ne.current;return d===null&&be(`Invalid hook call. Hooks can only be called inside of the body of a function component. This could happen for one of the following reasons:
+1. You might have mismatching versions of React and the renderer (such as React DOM)
+2. You might be breaking the Rules of Hooks
+3. You might have more than one copy of React in the same app
+See https://reactjs.org/link/invalid-hook-call for tips about how to debug and fix this problem.`),d}function Te(d){var g=fe();if(d._context!==void 0){var D=d._context;D.Consumer===d?be("Calling useContext(Context.Consumer) is not supported, may cause bugs, and will be removed in a future major release. Did you mean to call useContext(Context) instead?"):D.Provider===d&&be("Calling useContext(Context.Provider) is not supported. Did you mean to call useContext(Context) instead?")}return g.useContext(d)}function Se(d){var g=fe();return g.useState(d)}function ct(d,g,D){var O=fe();return O.useReducer(d,g,D)}function we(d){var g=fe();return g.useRef(d)}function st(d,g){var D=fe();return D.useEffect(d,g)}function un(d,g){var D=fe();return D.useInsertionEffect(d,g)}function Er(d,g){var D=fe();return D.useLayoutEffect(d,g)}function Rr(d,g){var D=fe();return D.useCallback(d,g)}function Vt(d,g){var D=fe();return D.useMemo(d,g)}function vi(d,g,D){var O=fe();return O.useImperativeHandle(d,g,D)}function Ji(d,g){{var D=fe();return D.useDebugValue(d,g)}}function nu(){var d=fe();return d.useTransition()}function ua(d){var g=fe();return g.useDeferredValue(d)}function _e(){var d=fe();return d.useId()}function hi(d,g,D){var O=fe();return O.useSyncExternalStore(d,g,D)}var Ua=0,ru,au,iu,ou,uu,lu,su;function Jl(){}Jl.__reactDisabledLog=!0;function Cf(){{if(Ua===0){ru=console.log,au=console.info,iu=console.warn,ou=console.error,uu=console.group,lu=console.groupCollapsed,su=console.groupEnd;var d={configurable:!0,enumerable:!0,value:Jl,writable:!0};Object.defineProperties(console,{info:d,log:d,warn:d,error:d,group:d,groupCollapsed:d,groupEnd:d})}Ua++}}function cu(){{if(Ua--,Ua===0){var d={configurable:!0,enumerable:!0,writable:!0};Object.defineProperties(console,{log:Ht({},d,{value:ru}),info:Ht({},d,{value:au}),warn:Ht({},d,{value:iu}),error:Ht({},d,{value:ou}),group:Ht({},d,{value:uu}),groupCollapsed:Ht({},d,{value:lu}),groupEnd:Ht({},d,{value:su})})}Ua<0&&be("disabledDepth fell below zero. This is a bug in React. Please file an issue.")}}var mi=yt.ReactCurrentDispatcher,or;function Na(d,g,D){{if(or===void 0)try{throw Error()}catch(P){var O=P.stack.trim().match(/\n( *(at )?)/);or=O&&O[1]||""}return`
+`+or+d}}var ka=!1,Zi;{var fu=typeof WeakMap=="function"?WeakMap:Map;Zi=new fu}function Zl(d,g){if(!d||ka)return"";{var D=Zi.get(d);if(D!==void 0)return D}var O;ka=!0;var P=Error.prepareStackTrace;Error.prepareStackTrace=void 0;var le;le=mi.current,mi.current=null,Cf();try{if(g){var Z=function(){throw Error()};if(Object.defineProperty(Z.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(Z,[])}catch(Be){O=Be}Reflect.construct(d,[],Z)}else{try{Z.call()}catch(Be){O=Be}d.call(Z.prototype)}}else{try{throw Error()}catch(Be){O=Be}d()}}catch(Be){if(Be&&O&&typeof Be.stack=="string"){for(var pe=Be.stack.split(`
+`),Le=O.stack.split(`
+`),Ie=pe.length-1,et=Le.length-1;Ie>=1&&et>=0&&pe[Ie]!==Le[et];)et--;for(;Ie>=1&&et>=0;Ie--,et--)if(pe[Ie]!==Le[et]){if(Ie!==1||et!==1)do if(Ie--,et--,et<0||pe[Ie]!==Le[et]){var tt=`
+`+pe[Ie].replace(" at new "," at ");return d.displayName&&tt.includes("<anonymous>")&&(tt=tt.replace("<anonymous>",d.displayName)),typeof d=="function"&&Zi.set(d,tt),tt}while(Ie>=1&&et>=0);break}}}finally{ka=!1,mi.current=le,cu(),Error.prepareStackTrace=P}var ut=d?d.displayName||d.name:"",pt=ut?Na(ut):"";return typeof d=="function"&&Zi.set(d,pt),pt}function du(d,g,D){return Zl(d,!1)}function Tf(d){var g=d.prototype;return!!(g&&g.isReactComponent)}function za(d,g,D){if(d==null)return"";if(typeof d=="function")return Zl(d,Tf(d));if(typeof d=="string")return Na(d);switch(d){case F:return Na("Suspense");case ee:return Na("SuspenseList")}if(typeof d=="object")switch(d.$$typeof){case M:return du(d.render);case $:return za(d.type,g,D);case B:{var O=d,P=O._payload,le=O._init;try{return za(le(P),g,D)}catch{}}}return""}var es={},pu=yt.ReactDebugCurrentFrame;function eo(d){if(d){var g=d._owner,D=za(d.type,d._source,g?g.type:null);pu.setExtraStackFrame(D)}else pu.setExtraStackFrame(null)}function ts(d,g,D,O,P){{var le=Function.call.bind(gr);for(var Z in d)if(le(d,Z)){var pe=void 0;try{if(typeof d[Z]!="function"){var Le=Error((O||"React class")+": "+D+" type `"+Z+"` is invalid; it must be a function, usually from the `prop-types` package, but received `"+typeof d[Z]+"`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");throw Le.name="Invariant Violation",Le}pe=d[Z](g,Z,O,D,null,"SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED")}catch(Ie){pe=Ie}pe&&!(pe instanceof Error)&&(eo(P),be("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).",O||"React class",D,Z,typeof pe),eo(null)),pe instanceof Error&&!(pe.message in es)&&(es[pe.message]=!0,eo(P),be("Failed %s type: %s",D,pe.message),eo(null))}}}function ze(d){if(d){var g=d._owner,D=za(d.type,d._source,g?g.type:null);Cn(D)}else Cn(null)}var vu;vu=!1;function hu(){if(Fe.current){var d=Dn(Fe.current.type);if(d)return`
+
+Check the render method of \``+d+"`."}return""}function ye(d){if(d!==void 0){var g=d.fileName.replace(/^.*[\\\/]/,""),D=d.lineNumber;return`
+
+Check your code at `+g+":"+D+"."}return""}function ns(d){return d!=null?ye(d.__source):""}var ln={};function yi(d){var g=hu();if(!g){var D=typeof d=="string"?d:d.displayName||d.name;D&&(g=`
+
+Check the top-level render call using <`+D+">.")}return g}function Fa(d,g){if(!(!d._store||d._store.validated||d.key!=null)){d._store.validated=!0;var D=yi(g);if(!ln[D]){ln[D]=!0;var O="";d&&d._owner&&d._owner!==Fe.current&&(O=" It was passed a child from "+Dn(d._owner.type)+"."),ze(d),be('Each child in a list should have a unique "key" prop.%s%s See https://reactjs.org/link/warning-keys for more information.',D,O),ze(null)}}}function rs(d,g){if(typeof d=="object"){if(Ct(d))for(var D=0;D<d.length;D++){var O=d[D];Ge(O)&&Fa(O,g)}else if(Ge(d))d._store&&(d._store.validated=!0);else if(d){var P=Ce(d);if(typeof P=="function"&&P!==d.entries)for(var le=P.call(d),Z;!(Z=le.next()).done;)Ge(Z.value)&&Fa(Z.value,g)}}}function Bt(d){{var g=d.type;if(g==null||typeof g=="string")return;var D;if(typeof g=="function")D=g.propTypes;else if(typeof g=="object"&&(g.$$typeof===M||g.$$typeof===$))D=g.propTypes;else return;if(D){var O=Dn(g);ts(D,d.props,"prop",O,d)}else if(g.PropTypes!==void 0&&!vu){vu=!0;var P=Dn(g);be("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?",P||"Unknown")}typeof g.getDefaultProps=="function"&&!g.getDefaultProps.isReactClassApproved&&be("getDefaultProps is only used on classic React.createClass definitions. Use a static property named `defaultProps` instead.")}}function ft(d){{for(var g=Object.keys(d.props),D=0;D<g.length;D++){var O=g[D];if(O!=="children"&&O!=="key"){ze(d),be("Invalid prop `%s` supplied to `React.Fragment`. React.Fragment can only have `key` and `children` props.",O),ze(null);break}}d.ref!==null&&(ze(d),be("Invalid attribute `ref` supplied to `React.Fragment`."),ze(null))}}function as(d,g,D){var O=oe(d);if(!O){var P="";(d===void 0||typeof d=="object"&&d!==null&&Object.keys(d).length===0)&&(P+=" You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");var le=ns(g);le?P+=le:P+=hu();var Z;d===null?Z="null":Ct(d)?Z="array":d!==void 0&&d.$$typeof===v?(Z="<"+(Dn(d.type)||"Unknown")+" />",P=" Did you accidentally export a JSX literal instead of a component?"):Z=typeof d,be("React.createElement: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",Z,P)}var pe=re.apply(this,arguments);if(pe==null)return pe;if(O)for(var Le=2;Le<arguments.length;Le++)rs(arguments[Le],d);return d===S?ft(pe):Bt(pe),pe}var Yn=!1;function On(d){var g=as.bind(null,d);return g.type=d,Yn||(Yn=!0,gt("React.createFactory() is deprecated and will be removed in a future major release. Consider using JSX or use React.createElement() directly instead.")),Object.defineProperty(g,"type",{enumerable:!1,get:function(){return gt("Factory.type is deprecated. Access the class directly before passing it to createFactory."),Object.defineProperty(this,"type",{value:d}),d}}),g}function $r(d,g,D){for(var O=qe.apply(this,arguments),P=2;P<arguments.length;P++)rs(arguments[P],O.type);return Bt(O),O}function xf(d,g){var D=Ke.transition;Ke.transition={};var O=Ke.transition;Ke.transition._updatedFibers=new Set;try{d()}finally{if(Ke.transition=D,D===null&&O._updatedFibers){var P=O._updatedFibers.size;P>10&&gt("Detected a large number of updates inside startTransition. If this is due to a subscription please re-write it to use React provided hooks. Otherwise concurrent mode guarantees are off the table."),O._updatedFibers.clear()}}}var to=!1,gi=null;function is(d){if(gi===null)try{var g=("require"+Math.random()).slice(0,7),D=l&&l[g];gi=D.call(l,"timers").setImmediate}catch{gi=function(P){to===!1&&(to=!0,typeof MessageChannel>"u"&&be("This browser does not have a MessageChannel implementation, so enqueuing tasks via await act(async () => ...) will fail. Please file an issue at https://github.com/facebook/react/issues if you encounter this warning."));var le=new MessageChannel;le.port1.onmessage=P,le.port2.postMessage(void 0)}}return gi(d)}var Ha=0,os=!1;function us(d){{var g=Ha;Ha++,de.current===null&&(de.current=[]);var D=de.isBatchingLegacy,O;try{if(de.isBatchingLegacy=!0,O=d(),!D&&de.didScheduleLegacyUpdate){var P=de.current;P!==null&&(de.didScheduleLegacyUpdate=!1,ro(P))}}catch(ut){throw la(g),ut}finally{de.isBatchingLegacy=D}if(O!==null&&typeof O=="object"&&typeof O.then=="function"){var le=O,Z=!1,pe={then:function(ut,pt){Z=!0,le.then(function(Be){la(g),Ha===0?no(Be,ut,pt):ut(Be)},function(Be){la(g),pt(Be)})}};return!os&&typeof Promise<"u"&&Promise.resolve().then(function(){}).then(function(){Z||(os=!0,be("You called act(async () => ...) without await. This could lead to unexpected testing behaviour, interleaving multiple act calls and mixing their scopes. You should - await act(async () => ...);"))}),pe}else{var Le=O;if(la(g),Ha===0){var Ie=de.current;Ie!==null&&(ro(Ie),de.current=null);var et={then:function(ut,pt){de.current===null?(de.current=[],no(Le,ut,pt)):ut(Le)}};return et}else{var tt={then:function(ut,pt){ut(Le)}};return tt}}}}function la(d){d!==Ha-1&&be("You seem to have overlapping act() calls, this is not supported. Be sure to await previous act() calls before making a new one. "),Ha=d}function no(d,g,D){{var O=de.current;if(O!==null)try{ro(O),is(function(){O.length===0?(de.current=null,g(d)):no(d,g,D)})}catch(P){D(P)}else g(d)}}var ja=!1;function ro(d){if(!ja){ja=!0;var g=0;try{for(;g<d.length;g++){var D=d[g];do D=D(!0);while(D!==null)}d.length=0}catch(O){throw d=d.slice(g+1),O}finally{ja=!1}}}var ls=as,ss=$r,cs=On,fs={map:br,forEach:Ki,count:fi,toArray:tu,only:di};s.Children=fs,s.Component=Hn,s.Fragment=S,s.Profiler=N,s.PureComponent=Wt,s.StrictMode=f,s.Suspense=F,s.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=yt,s.act=us,s.cloneElement=ss,s.createContext=pi,s.createElement=ls,s.createFactory=cs,s.createRef=jn,s.forwardRef=j,s.isValidElement=Ge,s.lazy=b,s.memo=Ae,s.startTransition=xf,s.unstable_act=us,s.useCallback=Rr,s.useContext=Te,s.useDebugValue=Ji,s.useDeferredValue=ua,s.useEffect=st,s.useId=_e,s.useImperativeHandle=vi,s.useInsertionEffect=un,s.useLayoutEffect=Er,s.useMemo=Vt,s.useReducer=ct,s.useRef=we,s.useState=Se,s.useSyncExternalStore=hi,s.useTransition=nu,s.version=p,typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop=="function"&&__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error)})()})(hf,hf.exports);var fA=hf.exports;EE.exports=fA;var Qi=EE.exports;const dA=cA(Qi);/**
+ * @license React
+ * react-jsx-dev-runtime.development.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */(function(){var l=Qi,s=Symbol.for("react.element"),p=Symbol.for("react.portal"),v=Symbol.for("react.fragment"),y=Symbol.for("react.strict_mode"),S=Symbol.for("react.profiler"),f=Symbol.for("react.provider"),N=Symbol.for("react.context"),z=Symbol.for("react.forward_ref"),U=Symbol.for("react.suspense"),M=Symbol.for("react.suspense_list"),F=Symbol.for("react.memo"),ee=Symbol.for("react.lazy"),$=Symbol.for("react.offscreen"),B=Symbol.iterator,ce="@@iterator";function Je(b){if(b===null||typeof b!="object")return null;var j=B&&b[B]||b[ce];return typeof j=="function"?j:null}var Ye=l.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;function Ce(b){{for(var j=arguments.length,G=new Array(j>1?j-1:0),oe=1;oe<j;oe++)G[oe-1]=arguments[oe];ne("error",b,G)}}function ne(b,j,G){{var oe=Ye.ReactDebugCurrentFrame,Ae=oe.getStackAddendum();Ae!==""&&(j+="%s",G=G.concat([Ae]));var fe=G.map(function(Te){return String(Te)});fe.unshift("Warning: "+j),Function.prototype.apply.call(console[b],console,fe)}}var Ke=!1,de=!1,Fe=!1,ge=!1,Gt=!1,Cn;Cn=Symbol.for("react.module.reference");function Rt(b){return!!(typeof b=="string"||typeof b=="function"||b===v||b===S||Gt||b===y||b===U||b===M||ge||b===$||Ke||de||Fe||typeof b=="object"&&b!==null&&(b.$$typeof===ee||b.$$typeof===F||b.$$typeof===f||b.$$typeof===N||b.$$typeof===z||b.$$typeof===Cn||b.getModuleId!==void 0))}function rt(b,j,G){var oe=b.displayName;if(oe)return oe;var Ae=j.displayName||j.name||"";return Ae!==""?G+"("+Ae+")":G}function Fn(b){return b.displayName||"Context"}function xe(b){if(b==null)return null;if(typeof b.tag=="number"&&Ce("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."),typeof b=="function")return b.displayName||b.name||null;if(typeof b=="string")return b;switch(b){case v:return"Fragment";case p:return"Portal";case S:return"Profiler";case y:return"StrictMode";case U:return"Suspense";case M:return"SuspenseList"}if(typeof b=="object")switch(b.$$typeof){case N:var j=b;return Fn(j)+".Consumer";case f:var G=b;return Fn(G._context)+".Provider";case z:return rt(b,b.render,"ForwardRef");case F:var oe=b.displayName||null;return oe!==null?oe:xe(b.type)||"Memo";case ee:{var Ae=b,fe=Ae._payload,Te=Ae._init;try{return xe(Te(fe))}catch{return null}}}return null}var Ve=Object.assign,yt=0,gt,be,It,jr,er,hr,Ht;function Tn(){}Tn.__reactDisabledLog=!0;function Hn(){{if(yt===0){gt=console.log,be=console.info,It=console.warn,jr=console.error,er=console.group,hr=console.groupCollapsed,Ht=console.groupEnd;var b={configurable:!0,enumerable:!0,value:Tn,writable:!0};Object.defineProperties(console,{info:b,log:b,warn:b,error:b,group:b,groupCollapsed:b,groupEnd:b})}yt++}}function Vr(){{if(yt--,yt===0){var b={configurable:!0,enumerable:!0,writable:!0};Object.defineProperties(console,{log:Ve({},b,{value:gt}),info:Ve({},b,{value:be}),warn:Ve({},b,{value:It}),error:Ve({},b,{value:jr}),group:Ve({},b,{value:er}),groupCollapsed:Ve({},b,{value:hr}),groupEnd:Ve({},b,{value:Ht})})}yt<0&&Ce("disabledDepth fell below zero. This is a bug in React. Please file an issue.")}}var mr=Ye.ReactCurrentDispatcher,yr;function tr(b,j,G){{if(yr===void 0)try{throw Error()}catch(Ae){var oe=Ae.stack.trim().match(/\n( *(at )?)/);yr=oe&&oe[1]||""}return`
+`+yr+b}}var Wt=!1,xn;{var jn=typeof WeakMap=="function"?WeakMap:Map;xn=new jn}function Vn(b,j){if(!b||Wt)return"";{var G=xn.get(b);if(G!==void 0)return G}var oe;Wt=!0;var Ae=Error.prepareStackTrace;Error.prepareStackTrace=void 0;var fe;fe=mr.current,mr.current=null,Hn();try{if(j){var Te=function(){throw Error()};if(Object.defineProperty(Te.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(Te,[])}catch(Vt){oe=Vt}Reflect.construct(b,[],Te)}else{try{Te.call()}catch(Vt){oe=Vt}b.call(Te.prototype)}}else{try{throw Error()}catch(Vt){oe=Vt}b()}}catch(Vt){if(Vt&&oe&&typeof Vt.stack=="string"){for(var Se=Vt.stack.split(`
+`),ct=oe.stack.split(`
+`),we=Se.length-1,st=ct.length-1;we>=1&&st>=0&&Se[we]!==ct[st];)st--;for(;we>=1&&st>=0;we--,st--)if(Se[we]!==ct[st]){if(we!==1||st!==1)do if(we--,st--,st<0||Se[we]!==ct[st]){var un=`
+`+Se[we].replace(" at new "," at ");return b.displayName&&un.includes("<anonymous>")&&(un=un.replace("<anonymous>",b.displayName)),typeof b=="function"&&xn.set(b,un),un}while(we>=1&&st>=0);break}}}finally{Wt=!1,mr.current=fe,Vr(),Error.prepareStackTrace=Ae}var Er=b?b.displayName||b.name:"",Rr=Er?tr(Er):"";return typeof b=="function"&&xn.set(b,Rr),Rr}function Ct(b,j,G){return Vn(b,!1)}function an(b){var j=b.prototype;return!!(j&&j.isReactComponent)}function jt(b,j,G){if(b==null)return"";if(typeof b=="function")return Vn(b,an(b));if(typeof b=="string")return tr(b);switch(b){case U:return tr("Suspense");case M:return tr("SuspenseList")}if(typeof b=="object")switch(b.$$typeof){case z:return Ct(b.render);case F:return jt(b.type,j,G);case ee:{var oe=b,Ae=oe._payload,fe=oe._init;try{return jt(fe(Ae),j,G)}catch{}}}return""}var wt=Object.prototype.hasOwnProperty,Ot={},Bn=Ye.ReactDebugCurrentFrame;function nr(b){if(b){var j=b._owner,G=jt(b.type,b._source,j?j.type:null);Bn.setExtraStackFrame(G)}else Bn.setExtraStackFrame(null)}function Dn(b,j,G,oe,Ae){{var fe=Function.call.bind(wt);for(var Te in b)if(fe(b,Te)){var Se=void 0;try{if(typeof b[Te]!="function"){var ct=Error((oe||"React class")+": "+G+" type `"+Te+"` is invalid; it must be a function, usually from the `prop-types` package, but received `"+typeof b[Te]+"`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");throw ct.name="Invariant Violation",ct}Se=b[Te](j,Te,oe,G,null,"SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED")}catch(we){Se=we}Se&&!(Se instanceof Error)&&(nr(Ae),Ce("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).",oe||"React class",G,Te,typeof Se),nr(null)),Se instanceof Error&&!(Se.message in Ot)&&(Ot[Se.message]=!0,nr(Ae),Ce("Failed %s type: %s",G,Se.message),nr(null))}}}var gr=Array.isArray;function rr(b){return gr(b)}function hn(b){{var j=typeof Symbol=="function"&&Symbol.toStringTag,G=j&&b[Symbol.toStringTag]||b.constructor.name||"Object";return G}}function ar(b){try{return on(b),!1}catch{return!0}}function on(b){return""+b}function Pn(b){if(ar(b))return Ce("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.",hn(b)),on(b)}var bt=Ye.ReactCurrentOwner,ir={key:!0,ref:!0,__self:!0,__source:!0},ra,aa,q;q={};function re(b){if(wt.call(b,"ref")){var j=Object.getOwnPropertyDescriptor(b,"ref").get;if(j&&j.isReactWarning)return!1}return b.ref!==void 0}function De(b){if(wt.call(b,"key")){var j=Object.getOwnPropertyDescriptor(b,"key").get;if(j&&j.isReactWarning)return!1}return b.key!==void 0}function qe(b,j){if(typeof b.ref=="string"&&bt.current&&j&&bt.current.stateNode!==j){var G=xe(bt.current.type);q[G]||(Ce('Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. This case cannot be automatically converted to an arrow function. We ask you to manually fix this case by using useRef() or createRef() instead. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-string-ref',xe(bt.current.type),b.ref),q[G]=!0)}}function Ge(b,j){{var G=function(){ra||(ra=!0,Ce("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)",j))};G.isReactWarning=!0,Object.defineProperty(b,"key",{get:G,configurable:!0})}}function _t(b,j){{var G=function(){aa||(aa=!0,Ce("%s: `ref` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://reactjs.org/link/special-props)",j))};G.isReactWarning=!0,Object.defineProperty(b,"ref",{get:G,configurable:!0})}}var St=function(b,j,G,oe,Ae,fe,Te){var Se={$$typeof:s,type:b,key:j,ref:G,props:Te,_owner:fe};return Se._store={},Object.defineProperty(Se._store,"validated",{configurable:!1,enumerable:!1,writable:!0,value:!1}),Object.defineProperty(Se,"_self",{configurable:!1,enumerable:!1,writable:!1,value:oe}),Object.defineProperty(Se,"_source",{configurable:!1,enumerable:!1,writable:!1,value:Ae}),Object.freeze&&(Object.freeze(Se.props),Object.freeze(Se)),Se};function wn(b,j,G,oe,Ae){{var fe,Te={},Se=null,ct=null;G!==void 0&&(Pn(G),Se=""+G),De(j)&&(Pn(j.key),Se=""+j.key),re(j)&&(ct=j.ref,qe(j,Ae));for(fe in j)wt.call(j,fe)&&!ir.hasOwnProperty(fe)&&(Te[fe]=j[fe]);if(b&&b.defaultProps){var we=b.defaultProps;for(fe in we)Te[fe]===void 0&&(Te[fe]=we[fe])}if(Se||ct){var st=typeof b=="function"?b.displayName||b.name||"Unknown":b;Se&&Ge(Te,st),ct&&_t(Te,st)}return St(b,Se,ct,Ae,oe,bt.current,Te)}}var Ze=Ye.ReactCurrentOwner,$n=Ye.ReactDebugCurrentFrame;function it(b){if(b){var j=b._owner,G=jt(b.type,b._source,j?j.type:null);$n.setExtraStackFrame(G)}else $n.setExtraStackFrame(null)}var ot;ot=!1;function Br(b){return typeof b=="object"&&b!==null&&b.$$typeof===s}function br(){{if(Ze.current){var b=xe(Ze.current.type);if(b)return`
+
+Check the render method of \``+b+"`."}return""}}function fi(b){{if(b!==void 0){var j=b.fileName.replace(/^.*[\\\/]/,""),G=b.lineNumber;return`
+
+Check your code at `+j+":"+G+"."}return""}}var Ki={};function tu(b){{var j=br();if(!j){var G=typeof b=="string"?b:b.displayName||b.name;G&&(j=`
+
+Check the top-level render call using <`+G+">.")}return j}}function di(b,j){{if(!b._store||b._store.validated||b.key!=null)return;b._store.validated=!0;var G=tu(j);if(Ki[G])return;Ki[G]=!0;var oe="";b&&b._owner&&b._owner!==Ze.current&&(oe=" It was passed a child from "+xe(b._owner.type)+"."),it(b),Ce('Each child in a list should have a unique "key" prop.%s%s See https://reactjs.org/link/warning-keys for more information.',G,oe),it(null)}}function pi(b,j){{if(typeof b!="object")return;if(rr(b))for(var G=0;G<b.length;G++){var oe=b[G];Br(oe)&&di(oe,j)}else if(Br(b))b._store&&(b._store.validated=!0);else if(b){var Ae=Je(b);if(typeof Ae=="function"&&Ae!==b.entries)for(var fe=Ae.call(b),Te;!(Te=fe.next()).done;)Br(Te.value)&&di(Te.value,j)}}}function ia(b){{var j=b.type;if(j==null||typeof j=="string")return;var G;if(typeof j=="function")G=j.propTypes;else if(typeof j=="object"&&(j.$$typeof===z||j.$$typeof===F))G=j.propTypes;else return;if(G){var oe=xe(j);Dn(G,b.props,"prop",oe,b)}else if(j.PropTypes!==void 0&&!ot){ot=!0;var Ae=xe(j);Ce("Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?",Ae||"Unknown")}typeof j.getDefaultProps=="function"&&!j.getDefaultProps.isReactClassApproved&&Ce("getDefaultProps is only used on classic React.createClass definitions. Use a static property named `defaultProps` instead.")}}function Ma(b){{for(var j=Object.keys(b.props),G=0;G<j.length;G++){var oe=j[G];if(oe!=="children"&&oe!=="key"){it(b),Ce("Invalid prop `%s` supplied to `React.Fragment`. React.Fragment can only have `key` and `children` props.",oe),it(null);break}}b.ref!==null&&(it(b),Ce("Invalid attribute `ref` supplied to `React.Fragment`."),it(null))}}var oa={};function Pr(b,j,G,oe,Ae,fe){{var Te=Rt(b);if(!Te){var Se="";(b===void 0||typeof b=="object"&&b!==null&&Object.keys(b).length===0)&&(Se+=" You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");var ct=fi(Ae);ct?Se+=ct:Se+=br();var we;b===null?we="null":rr(b)?we="array":b!==void 0&&b.$$typeof===s?(we="<"+(xe(b.type)||"Unknown")+" />",Se=" Did you accidentally export a JSX literal instead of a component?"):we=typeof b,Ce("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",we,Se)}var st=wn(b,j,G,Ae,fe);if(st==null)return st;if(Te){var un=j.children;if(un!==void 0)if(oe)if(rr(un)){for(var Er=0;Er<un.length;Er++)pi(un[Er],b);Object.freeze&&Object.freeze(un)}else Ce("React.jsx: Static children should always be an array. You are likely explicitly calling React.jsxs or React.jsxDEV. Use the Babel transform instead.");else pi(un,b)}if(wt.call(j,"key")){var Rr=xe(b),Vt=Object.keys(j).filter(function(nu){return nu!=="key"}),vi=Vt.length>0?"{key: someKey, "+Vt.join(": ..., ")+": ...}":"{key: someKey}";if(!oa[Rr+vi]){var Ji=Vt.length>0?"{"+Vt.join(": ..., ")+": ...}":"{}";Ce(`A props object containing a "key" prop is being spread into JSX:
+  let props = %s;
+  <%s {...props} />
+React keys must be passed directly to JSX without using spread:
+  let props = %s;
+  <%s key={someKey} {...props} />`,vi,Rr,Ji,Rr),oa[Rr+vi]=!0}}return b===v?Ma(st):ia(st),st}}var Sr=Pr;Uh.Fragment=v,Uh.jsxDEV=Sr})();SE.exports=Uh;var kn=SE.exports,Nh={},RE={exports:{}},Zn={},CE={exports:{}},TE={};(function(l){/**
+ * @license React
+ * scheduler.development.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */(function(){typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart=="function"&&__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error);var s=!1,p=!1,v=5;function y(q,re){var De=q.length;q.push(re),N(q,re,De)}function S(q){return q.length===0?null:q[0]}function f(q){if(q.length===0)return null;var re=q[0],De=q.pop();return De!==re&&(q[0]=De,z(q,De,0)),re}function N(q,re,De){for(var qe=De;qe>0;){var Ge=qe-1>>>1,_t=q[Ge];if(U(_t,re)>0)q[Ge]=re,q[qe]=_t,qe=Ge;else return}}function z(q,re,De){for(var qe=De,Ge=q.length,_t=Ge>>>1;qe<_t;){var St=(qe+1)*2-1,wn=q[St],Ze=St+1,$n=q[Ze];if(U(wn,re)<0)Ze<Ge&&U($n,wn)<0?(q[qe]=$n,q[Ze]=re,qe=Ze):(q[qe]=wn,q[St]=re,qe=St);else if(Ze<Ge&&U($n,re)<0)q[qe]=$n,q[Ze]=re,qe=Ze;else return}}function U(q,re){var De=q.sortIndex-re.sortIndex;return De!==0?De:q.id-re.id}var M=1,F=2,ee=3,$=4,B=5;function ce(q,re){}var Je=typeof performance=="object"&&typeof performance.now=="function";if(Je){var Ye=performance;l.unstable_now=function(){return Ye.now()}}else{var Ce=Date,ne=Ce.now();l.unstable_now=function(){return Ce.now()-ne}}var Ke=1073741823,de=-1,Fe=250,ge=5e3,Gt=1e4,Cn=Ke,Rt=[],rt=[],Fn=1,xe=null,Ve=ee,yt=!1,gt=!1,be=!1,It=typeof setTimeout=="function"?setTimeout:null,jr=typeof clearTimeout=="function"?clearTimeout:null,er=typeof setImmediate<"u"?setImmediate:null;typeof navigator<"u"&&navigator.scheduling!==void 0&&navigator.scheduling.isInputPending!==void 0&&navigator.scheduling.isInputPending.bind(navigator.scheduling);function hr(q){for(var re=S(rt);re!==null;){if(re.callback===null)f(rt);else if(re.startTime<=q)f(rt),re.sortIndex=re.expirationTime,y(Rt,re);else return;re=S(rt)}}function Ht(q){if(be=!1,hr(q),!gt)if(S(Rt)!==null)gt=!0,Pn(Tn);else{var re=S(rt);re!==null&&bt(Ht,re.startTime-q)}}function Tn(q,re){gt=!1,be&&(be=!1,ir()),yt=!0;var De=Ve;try{var qe;if(!p)return Hn(q,re)}finally{xe=null,Ve=De,yt=!1}}function Hn(q,re){var De=re;for(hr(De),xe=S(Rt);xe!==null&&!s&&!(xe.expirationTime>De&&(!q||nr()));){var qe=xe.callback;if(typeof qe=="function"){xe.callback=null,Ve=xe.priorityLevel;var Ge=xe.expirationTime<=De,_t=qe(Ge);De=l.unstable_now(),typeof _t=="function"?xe.callback=_t:xe===S(Rt)&&f(Rt),hr(De)}else f(Rt);xe=S(Rt)}if(xe!==null)return!0;var St=S(rt);return St!==null&&bt(Ht,St.startTime-De),!1}function Vr(q,re){switch(q){case M:case F:case ee:case $:case B:break;default:q=ee}var De=Ve;Ve=q;try{return re()}finally{Ve=De}}function mr(q){var re;switch(Ve){case M:case F:case ee:re=ee;break;default:re=Ve;break}var De=Ve;Ve=re;try{return q()}finally{Ve=De}}function yr(q){var re=Ve;return function(){var De=Ve;Ve=re;try{return q.apply(this,arguments)}finally{Ve=De}}}function tr(q,re,De){var qe=l.unstable_now(),Ge;if(typeof De=="object"&&De!==null){var _t=De.delay;typeof _t=="number"&&_t>0?Ge=qe+_t:Ge=qe}else Ge=qe;var St;switch(q){case M:St=de;break;case F:St=Fe;break;case B:St=Cn;break;case $:St=Gt;break;case ee:default:St=ge;break}var wn=Ge+St,Ze={id:Fn++,callback:re,priorityLevel:q,startTime:Ge,expirationTime:wn,sortIndex:-1};return Ge>qe?(Ze.sortIndex=Ge,y(rt,Ze),S(Rt)===null&&Ze===S(rt)&&(be?ir():be=!0,bt(Ht,Ge-qe))):(Ze.sortIndex=wn,y(Rt,Ze),!gt&&!yt&&(gt=!0,Pn(Tn))),Ze}function Wt(){}function xn(){!gt&&!yt&&(gt=!0,Pn(Tn))}function jn(){return S(Rt)}function Vn(q){q.callback=null}function Ct(){return Ve}var an=!1,jt=null,wt=-1,Ot=v,Bn=-1;function nr(){var q=l.unstable_now()-Bn;return!(q<Ot)}function Dn(){}function gr(q){if(q<0||q>125){console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported");return}q>0?Ot=Math.floor(1e3/q):Ot=v}var rr=function(){if(jt!==null){var q=l.unstable_now();Bn=q;var re=!0,De=!0;try{De=jt(re,q)}finally{De?hn():(an=!1,jt=null)}}else an=!1},hn;if(typeof er=="function")hn=function(){er(rr)};else if(typeof MessageChannel<"u"){var ar=new MessageChannel,on=ar.port2;ar.port1.onmessage=rr,hn=function(){on.postMessage(null)}}else hn=function(){It(rr,0)};function Pn(q){jt=q,an||(an=!0,hn())}function bt(q,re){wt=It(function(){q(l.unstable_now())},re)}function ir(){jr(wt),wt=-1}var ra=Dn,aa=null;l.unstable_IdlePriority=B,l.unstable_ImmediatePriority=M,l.unstable_LowPriority=$,l.unstable_NormalPriority=ee,l.unstable_Profiling=aa,l.unstable_UserBlockingPriority=F,l.unstable_cancelCallback=Vn,l.unstable_continueExecution=xn,l.unstable_forceFrameRate=gr,l.unstable_getCurrentPriorityLevel=Ct,l.unstable_getFirstCallbackNode=jn,l.unstable_next=mr,l.unstable_pauseExecution=Wt,l.unstable_requestPaint=ra,l.unstable_runWithPriority=Vr,l.unstable_scheduleCallback=tr,l.unstable_shouldYield=nr,l.unstable_wrapCallback=yr,typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop=="function"&&__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error)})()})(TE);CE.exports=TE;var pA=CE.exports;/**
+ * @license React
+ * react-dom.development.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */(function(){typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart=="function"&&__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(new Error);var l=Qi,s=pA,p=l.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,v=!1;function y(e){v=e}function S(e){if(!v){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];N("warn",e,n)}}function f(e){if(!v){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];N("error",e,n)}}function N(e,t,n){{var r=p.ReactDebugCurrentFrame,a=r.getStackAddendum();a!==""&&(t+="%s",n=n.concat([a]));var i=n.map(function(o){return String(o)});i.unshift("Warning: "+t),Function.prototype.apply.call(console[e],console,i)}}var z=0,U=1,M=2,F=3,ee=4,$=5,B=6,ce=7,Je=8,Ye=9,Ce=10,ne=11,Ke=12,de=13,Fe=14,ge=15,Gt=16,Cn=17,Rt=18,rt=19,Fn=21,xe=22,Ve=23,yt=24,gt=25,be=!0,It=!1,jr=!1,er=!1,hr=!1,Ht=!0,Tn=!1,Hn=!0,Vr=!0,mr=!0,yr=!0,tr=new Set,Wt={},xn={};function jn(e,t){Vn(e,t),Vn(e+"Capture",t)}function Vn(e,t){Wt[e]&&f("EventRegistry: More than one plugin attempted to publish the same registration name, `%s`.",e),Wt[e]=t;{var n=e.toLowerCase();xn[n]=e,e==="onDoubleClick"&&(xn.ondblclick=e)}for(var r=0;r<t.length;r++)tr.add(t[r])}var Ct=typeof window<"u"&&typeof window.document<"u"&&typeof window.document.createElement<"u",an=Object.prototype.hasOwnProperty;function jt(e){{var t=typeof Symbol=="function"&&Symbol.toStringTag,n=t&&e[Symbol.toStringTag]||e.constructor.name||"Object";return n}}function wt(e){try{return Ot(e),!1}catch{return!0}}function Ot(e){return""+e}function Bn(e,t){if(wt(e))return f("The provided `%s` attribute is an unsupported type %s. This value must be coerced to a string before before using it here.",t,jt(e)),Ot(e)}function nr(e){if(wt(e))return f("The provided key is an unsupported type %s. This value must be coerced to a string before before using it here.",jt(e)),Ot(e)}function Dn(e,t){if(wt(e))return f("The provided `%s` prop is an unsupported type %s. This value must be coerced to a string before before using it here.",t,jt(e)),Ot(e)}function gr(e,t){if(wt(e))return f("The provided `%s` CSS property is an unsupported type %s. This value must be coerced to a string before before using it here.",t,jt(e)),Ot(e)}function rr(e){if(wt(e))return f("The provided HTML markup uses a value of unsupported type %s. This value must be coerced to a string before before using it here.",jt(e)),Ot(e)}function hn(e){if(wt(e))return f("Form field values (value, checked, defaultValue, or defaultChecked props) must be strings, not %s. This value must be coerced to a string before before using it here.",jt(e)),Ot(e)}var ar=0,on=1,Pn=2,bt=3,ir=4,ra=5,aa=6,q=":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",re=q+"\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",De=new RegExp("^["+q+"]["+re+"]*$"),qe={},Ge={};function _t(e){return an.call(Ge,e)?!0:an.call(qe,e)?!1:De.test(e)?(Ge[e]=!0,!0):(qe[e]=!0,f("Invalid attribute name: `%s`",e),!1)}function St(e,t,n){return t!==null?t.type===ar:n?!1:e.length>2&&(e[0]==="o"||e[0]==="O")&&(e[1]==="n"||e[1]==="N")}function wn(e,t,n,r){if(n!==null&&n.type===ar)return!1;switch(typeof t){case"function":case"symbol":return!0;case"boolean":{if(r)return!1;if(n!==null)return!n.acceptsBooleans;var a=e.toLowerCase().slice(0,5);return a!=="data-"&&a!=="aria-"}default:return!1}}function Ze(e,t,n,r){if(t===null||typeof t>"u"||wn(e,t,n,r))return!0;if(r)return!1;if(n!==null)switch(n.type){case bt:return!t;case ir:return t===!1;case ra:return isNaN(t);case aa:return isNaN(t)||t<1}return!1}function $n(e){return ot.hasOwnProperty(e)?ot[e]:null}function it(e,t,n,r,a,i,o){this.acceptsBooleans=t===Pn||t===bt||t===ir,this.attributeName=r,this.attributeNamespace=a,this.mustUseProperty=n,this.propertyName=e,this.type=t,this.sanitizeURL=i,this.removeEmptyString=o}var ot={},Br=["children","dangerouslySetInnerHTML","defaultValue","defaultChecked","innerHTML","suppressContentEditableWarning","suppressHydrationWarning","style"];Br.forEach(function(e){ot[e]=new it(e,ar,!1,e,null,!1,!1)}),[["acceptCharset","accept-charset"],["className","class"],["htmlFor","for"],["httpEquiv","http-equiv"]].forEach(function(e){var t=e[0],n=e[1];ot[t]=new it(t,on,!1,n,null,!1,!1)}),["contentEditable","draggable","spellCheck","value"].forEach(function(e){ot[e]=new it(e,Pn,!1,e.toLowerCase(),null,!1,!1)}),["autoReverse","externalResourcesRequired","focusable","preserveAlpha"].forEach(function(e){ot[e]=new it(e,Pn,!1,e,null,!1,!1)}),["allowFullScreen","async","autoFocus","autoPlay","controls","default","defer","disabled","disablePictureInPicture","disableRemotePlayback","formNoValidate","hidden","loop","noModule","noValidate","open","playsInline","readOnly","required","reversed","scoped","seamless","itemScope"].forEach(function(e){ot[e]=new it(e,bt,!1,e.toLowerCase(),null,!1,!1)}),["checked","multiple","muted","selected"].forEach(function(e){ot[e]=new it(e,bt,!0,e,null,!1,!1)}),["capture","download"].forEach(function(e){ot[e]=new it(e,ir,!1,e,null,!1,!1)}),["cols","rows","size","span"].forEach(function(e){ot[e]=new it(e,aa,!1,e,null,!1,!1)}),["rowSpan","start"].forEach(function(e){ot[e]=new it(e,ra,!1,e.toLowerCase(),null,!1,!1)});var br=/[\-\:]([a-z])/g,fi=function(e){return e[1].toUpperCase()};["accent-height","alignment-baseline","arabic-form","baseline-shift","cap-height","clip-path","clip-rule","color-interpolation","color-interpolation-filters","color-profile","color-rendering","dominant-baseline","enable-background","fill-opacity","fill-rule","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","glyph-name","glyph-orientation-horizontal","glyph-orientation-vertical","horiz-adv-x","horiz-origin-x","image-rendering","letter-spacing","lighting-color","marker-end","marker-mid","marker-start","overline-position","overline-thickness","paint-order","panose-1","pointer-events","rendering-intent","shape-rendering","stop-color","stop-opacity","strikethrough-position","strikethrough-thickness","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-anchor","text-decoration","text-rendering","underline-position","underline-thickness","unicode-bidi","unicode-range","units-per-em","v-alphabetic","v-hanging","v-ideographic","v-mathematical","vector-effect","vert-adv-y","vert-origin-x","vert-origin-y","word-spacing","writing-mode","xmlns:xlink","x-height"].forEach(function(e){var t=e.replace(br,fi);ot[t]=new it(t,on,!1,e,null,!1,!1)}),["xlink:actuate","xlink:arcrole","xlink:role","xlink:show","xlink:title","xlink:type"].forEach(function(e){var t=e.replace(br,fi);ot[t]=new it(t,on,!1,e,"http://www.w3.org/1999/xlink",!1,!1)}),["xml:base","xml:lang","xml:space"].forEach(function(e){var t=e.replace(br,fi);ot[t]=new it(t,on,!1,e,"http://www.w3.org/XML/1998/namespace",!1,!1)}),["tabIndex","crossOrigin"].forEach(function(e){ot[e]=new it(e,on,!1,e.toLowerCase(),null,!1,!1)});var Ki="xlinkHref";ot[Ki]=new it("xlinkHref",on,!1,"xlink:href","http://www.w3.org/1999/xlink",!0,!1),["src","href","action","formAction"].forEach(function(e){ot[e]=new it(e,on,!1,e.toLowerCase(),null,!0,!0)});var tu=/^[\u0000-\u001F ]*j[\r\n\t]*a[\r\n\t]*v[\r\n\t]*a[\r\n\t]*s[\r\n\t]*c[\r\n\t]*r[\r\n\t]*i[\r\n\t]*p[\r\n\t]*t[\r\n\t]*\:/i,di=!1;function pi(e){!di&&tu.test(e)&&(di=!0,f("A future version of React will block javascript: URLs as a security precaution. Use event handlers instead if you can. If you need to generate unsafe HTML try using dangerouslySetInnerHTML instead. React was passed %s.",JSON.stringify(e)))}function ia(e,t,n,r){if(r.mustUseProperty){var a=r.propertyName;return e[a]}else{Bn(n,t),r.sanitizeURL&&pi(""+n);var i=r.attributeName,o=null;if(r.type===ir){if(e.hasAttribute(i)){var u=e.getAttribute(i);return u===""?!0:Ze(t,n,r,!1)?u:u===""+n?n:u}}else if(e.hasAttribute(i)){if(Ze(t,n,r,!1))return e.getAttribute(i);if(r.type===bt)return n;o=e.getAttribute(i)}return Ze(t,n,r,!1)?o===null?n:o:o===""+n?n:o}}function Ma(e,t,n,r){{if(!_t(t))return;if(!e.hasAttribute(t))return n===void 0?void 0:null;var a=e.getAttribute(t);return Bn(n,t),a===""+n?n:a}}function oa(e,t,n,r){var a=$n(t);if(!St(t,a,r)){if(Ze(t,n,a,r)&&(n=null),r||a===null){if(_t(t)){var i=t;n===null?e.removeAttribute(i):(Bn(n,t),e.setAttribute(i,""+n))}return}var o=a.mustUseProperty;if(o){var u=a.propertyName;if(n===null){var c=a.type;e[u]=c===bt?!1:""}else e[u]=n;return}var h=a.attributeName,m=a.attributeNamespace;if(n===null)e.removeAttribute(h);else{var R=a.type,E;R===bt||R===ir&&n===!0?E="":(Bn(n,h),E=""+n,a.sanitizeURL&&pi(E.toString())),m?e.setAttributeNS(m,h,E):e.setAttribute(h,E)}}}var Pr=Symbol.for("react.element"),Sr=Symbol.for("react.portal"),b=Symbol.for("react.fragment"),j=Symbol.for("react.strict_mode"),G=Symbol.for("react.profiler"),oe=Symbol.for("react.provider"),Ae=Symbol.for("react.context"),fe=Symbol.for("react.forward_ref"),Te=Symbol.for("react.suspense"),Se=Symbol.for("react.suspense_list"),ct=Symbol.for("react.memo"),we=Symbol.for("react.lazy"),st=Symbol.for("react.scope"),un=Symbol.for("react.debug_trace_mode"),Er=Symbol.for("react.offscreen"),Rr=Symbol.for("react.legacy_hidden"),Vt=Symbol.for("react.cache"),vi=Symbol.for("react.tracing_marker"),Ji=Symbol.iterator,nu="@@iterator";function ua(e){if(e===null||typeof e!="object")return null;var t=Ji&&e[Ji]||e[nu];return typeof t=="function"?t:null}var _e=Object.assign,hi=0,Ua,ru,au,iu,ou,uu,lu;function su(){}su.__reactDisabledLog=!0;function Jl(){{if(hi===0){Ua=console.log,ru=console.info,au=console.warn,iu=console.error,ou=console.group,uu=console.groupCollapsed,lu=console.groupEnd;var e={configurable:!0,enumerable:!0,value:su,writable:!0};Object.defineProperties(console,{info:e,log:e,warn:e,error:e,group:e,groupCollapsed:e,groupEnd:e})}hi++}}function Cf(){{if(hi--,hi===0){var e={configurable:!0,enumerable:!0,writable:!0};Object.defineProperties(console,{log:_e({},e,{value:Ua}),info:_e({},e,{value:ru}),warn:_e({},e,{value:au}),error:_e({},e,{value:iu}),group:_e({},e,{value:ou}),groupCollapsed:_e({},e,{value:uu}),groupEnd:_e({},e,{value:lu})})}hi<0&&f("disabledDepth fell below zero. This is a bug in React. Please file an issue.")}}var cu=p.ReactCurrentDispatcher,mi;function or(e,t,n){{if(mi===void 0)try{throw Error()}catch(a){var r=a.stack.trim().match(/\n( *(at )?)/);mi=r&&r[1]||""}return`
+`+mi+e}}var Na=!1,ka;{var Zi=typeof WeakMap=="function"?WeakMap:Map;ka=new Zi}function fu(e,t){if(!e||Na)return"";{var n=ka.get(e);if(n!==void 0)return n}var r;Na=!0;var a=Error.prepareStackTrace;Error.prepareStackTrace=void 0;var i;i=cu.current,cu.current=null,Jl();try{if(t){var o=function(){throw Error()};if(Object.defineProperty(o.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(o,[])}catch(w){r=w}Reflect.construct(e,[],o)}else{try{o.call()}catch(w){r=w}e.call(o.prototype)}}else{try{throw Error()}catch(w){r=w}e()}}catch(w){if(w&&r&&typeof w.stack=="string"){for(var u=w.stack.split(`
+`),c=r.stack.split(`
+`),h=u.length-1,m=c.length-1;h>=1&&m>=0&&u[h]!==c[m];)m--;for(;h>=1&&m>=0;h--,m--)if(u[h]!==c[m]){if(h!==1||m!==1)do if(h--,m--,m<0||u[h]!==c[m]){var R=`
+`+u[h].replace(" at new "," at ");return e.displayName&&R.includes("<anonymous>")&&(R=R.replace("<anonymous>",e.displayName)),typeof e=="function"&&ka.set(e,R),R}while(h>=1&&m>=0);break}}}finally{Na=!1,cu.current=i,Cf(),Error.prepareStackTrace=a}var E=e?e.displayName||e.name:"",x=E?or(E):"";return typeof e=="function"&&ka.set(e,x),x}function Zl(e,t,n){return fu(e,!0)}function du(e,t,n){return fu(e,!1)}function Tf(e){var t=e.prototype;return!!(t&&t.isReactComponent)}function za(e,t,n){if(e==null)return"";if(typeof e=="function")return fu(e,Tf(e));if(typeof e=="string")return or(e);switch(e){case Te:return or("Suspense");case Se:return or("SuspenseList")}if(typeof e=="object")switch(e.$$typeof){case fe:return du(e.render);case ct:return za(e.type,t,n);case we:{var r=e,a=r._payload,i=r._init;try{return za(i(a),t,n)}catch{}}}return""}function es(e){switch(e._debugOwner&&e._debugOwner.type,e._debugSource,e.tag){case $:return or(e.type);case Gt:return or("Lazy");case de:return or("Suspense");case rt:return or("SuspenseList");case z:case M:case ge:return du(e.type);case ne:return du(e.type.render);case U:return Zl(e.type);default:return""}}function pu(e){try{var t="",n=e;do t+=es(n),n=n.return;while(n);return t}catch(r){return`
+Error generating stack: `+r.message+`
+`+r.stack}}function eo(e,t,n){var r=e.displayName;if(r)return r;var a=t.displayName||t.name||"";return a!==""?n+"("+a+")":n}function ts(e){return e.displayName||"Context"}function ze(e){if(e==null)return null;if(typeof e.tag=="number"&&f("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."),typeof e=="function")return e.displayName||e.name||null;if(typeof e=="string")return e;switch(e){case b:return"Fragment";case Sr:return"Portal";case G:return"Profiler";case j:return"StrictMode";case Te:return"Suspense";case Se:return"SuspenseList"}if(typeof e=="object")switch(e.$$typeof){case Ae:var t=e;return ts(t)+".Consumer";case oe:var n=e;return ts(n._context)+".Provider";case fe:return eo(e,e.render,"ForwardRef");case ct:var r=e.displayName||null;return r!==null?r:ze(e.type)||"Memo";case we:{var a=e,i=a._payload,o=a._init;try{return ze(o(i))}catch{return null}}}return null}function vu(e,t,n){var r=t.displayName||t.name||"";return e.displayName||(r!==""?n+"("+r+")":n)}function hu(e){return e.displayName||"Context"}function ye(e){var t=e.tag,n=e.type;switch(t){case yt:return"Cache";case Ye:var r=n;return hu(r)+".Consumer";case Ce:var a=n;return hu(a._context)+".Provider";case Rt:return"DehydratedFragment";case ne:return vu(n,n.render,"ForwardRef");case ce:return"Fragment";case $:return n;case ee:return"Portal";case F:return"Root";case B:return"Text";case Gt:return ze(n);case Je:return n===j?"StrictMode":"Mode";case xe:return"Offscreen";case Ke:return"Profiler";case Fn:return"Scope";case de:return"Suspense";case rt:return"SuspenseList";case gt:return"TracingMarker";case U:case z:case Cn:case M:case Fe:case ge:if(typeof n=="function")return n.displayName||n.name||null;if(typeof n=="string")return n;break}return null}var ns=p.ReactDebugCurrentFrame,ln=null,yi=!1;function Fa(){{if(ln===null)return null;var e=ln._debugOwner;if(e!==null&&typeof e<"u")return ye(e)}return null}function rs(){return ln===null?"":pu(ln)}function Bt(){ns.getCurrentStack=null,ln=null,yi=!1}function ft(e){ns.getCurrentStack=e===null?null:rs,ln=e,yi=!1}function as(){return ln}function Yn(e){yi=e}function On(e){return""+e}function $r(e){switch(typeof e){case"boolean":case"number":case"string":case"undefined":return e;case"object":return hn(e),e;default:return""}}var xf={button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0};function to(e,t){xf[t.type]||t.onChange||t.onInput||t.readOnly||t.disabled||t.value==null||f("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`."),t.onChange||t.readOnly||t.disabled||t.checked==null||f("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")}function gi(e){var t=e.type,n=e.nodeName;return n&&n.toLowerCase()==="input"&&(t==="checkbox"||t==="radio")}function is(e){return e._valueTracker}function Ha(e){e._valueTracker=null}function os(e){var t="";return e&&(gi(e)?t=e.checked?"true":"false":t=e.value),t}function us(e){var t=gi(e)?"checked":"value",n=Object.getOwnPropertyDescriptor(e.constructor.prototype,t);hn(e[t]);var r=""+e[t];if(!(e.hasOwnProperty(t)||typeof n>"u"||typeof n.get!="function"||typeof n.set!="function")){var a=n.get,i=n.set;Object.defineProperty(e,t,{configurable:!0,get:function(){return a.call(this)},set:function(u){hn(u),r=""+u,i.call(this,u)}}),Object.defineProperty(e,t,{enumerable:n.enumerable});var o={getValue:function(){return r},setValue:function(u){hn(u),r=""+u},stopTracking:function(){Ha(e),delete e[t]}};return o}}function la(e){is(e)||(e._valueTracker=us(e))}function no(e){if(!e)return!1;var t=is(e);if(!t)return!0;var n=t.getValue(),r=os(e);return r!==n?(t.setValue(r),!0):!1}function ja(e){if(e=e||(typeof document<"u"?document:void 0),typeof e>"u")return null;try{return e.activeElement||e.body}catch{return e.body}}var ro=!1,ls=!1,ss=!1,cs=!1;function fs(e){var t=e.type==="checkbox"||e.type==="radio";return t?e.checked!=null:e.value!=null}function d(e,t){var n=e,r=t.checked,a=_e({},t,{defaultChecked:void 0,defaultValue:void 0,value:void 0,checked:r??n._wrapperState.initialChecked});return a}function g(e,t){to("input",t),t.checked!==void 0&&t.defaultChecked!==void 0&&!ls&&(f("%s contains an input of type %s with both checked and defaultChecked props. Input elements must be either controlled or uncontrolled (specify either the checked prop, or the defaultChecked prop, but not both). Decide between using a controlled or uncontrolled input element and remove one of these props. More info: https://reactjs.org/link/controlled-components",Fa()||"A component",t.type),ls=!0),t.value!==void 0&&t.defaultValue!==void 0&&!ro&&(f("%s contains an input of type %s with both value and defaultValue props. Input elements must be either controlled or uncontrolled (specify either the value prop, or the defaultValue prop, but not both). Decide between using a controlled or uncontrolled input element and remove one of these props. More info: https://reactjs.org/link/controlled-components",Fa()||"A component",t.type),ro=!0);var n=e,r=t.defaultValue==null?"":t.defaultValue;n._wrapperState={initialChecked:t.checked!=null?t.checked:t.defaultChecked,initialValue:$r(t.value!=null?t.value:r),controlled:fs(t)}}function D(e,t){var n=e,r=t.checked;r!=null&&oa(n,"checked",r,!1)}function O(e,t){var n=e;{var r=fs(t);!n._wrapperState.controlled&&r&&!cs&&(f("A component is changing an uncontrolled input to be controlled. This is likely caused by the value changing from undefined to a defined value, which should not happen. Decide between using a controlled or uncontrolled input element for the lifetime of the component. More info: https://reactjs.org/link/controlled-components"),cs=!0),n._wrapperState.controlled&&!r&&!ss&&(f("A component is changing a controlled input to be uncontrolled. This is likely caused by the value changing from a defined to undefined, which should not happen. Decide between using a controlled or uncontrolled input element for the lifetime of the component. More info: https://reactjs.org/link/controlled-components"),ss=!0)}D(e,t);var a=$r(t.value),i=t.type;if(a!=null)i==="number"?(a===0&&n.value===""||n.value!=a)&&(n.value=On(a)):n.value!==On(a)&&(n.value=On(a));else if(i==="submit"||i==="reset"){n.removeAttribute("value");return}t.hasOwnProperty("value")?pe(n,t.type,a):t.hasOwnProperty("defaultValue")&&pe(n,t.type,$r(t.defaultValue)),t.checked==null&&t.defaultChecked!=null&&(n.defaultChecked=!!t.defaultChecked)}function P(e,t,n){var r=e;if(t.hasOwnProperty("value")||t.hasOwnProperty("defaultValue")){var a=t.type,i=a==="submit"||a==="reset";if(i&&(t.value===void 0||t.value===null))return;var o=On(r._wrapperState.initialValue);n||o!==r.value&&(r.value=o),r.defaultValue=o}var u=r.name;u!==""&&(r.name=""),r.defaultChecked=!r.defaultChecked,r.defaultChecked=!!r._wrapperState.initialChecked,u!==""&&(r.name=u)}function le(e,t){var n=e;O(n,t),Z(n,t)}function Z(e,t){var n=t.name;if(t.type==="radio"&&n!=null){for(var r=e;r.parentNode;)r=r.parentNode;Bn(n,"name");for(var a=r.querySelectorAll("input[name="+JSON.stringify(""+n)+'][type="radio"]'),i=0;i<a.length;i++){var o=a[i];if(!(o===e||o.form!==e.form)){var u=Ks(o);if(!u)throw new Error("ReactDOMInput: Mixing React and non-React radio inputs with the same `name` is not supported.");no(o),O(o,u)}}}}function pe(e,t,n){(t!=="number"||ja(e.ownerDocument)!==e)&&(n==null?e.defaultValue=On(e._wrapperState.initialValue):e.defaultValue!==On(n)&&(e.defaultValue=On(n)))}var Le=!1,Ie=!1,et=!1;function tt(e,t){t.value==null&&(typeof t.children=="object"&&t.children!==null?l.Children.forEach(t.children,function(n){n!=null&&(typeof n=="string"||typeof n=="number"||Ie||(Ie=!0,f("Cannot infer the option value of complex children. Pass a `value` prop or use a plain string as children to <option>.")))}):t.dangerouslySetInnerHTML!=null&&(et||(et=!0,f("Pass a `value` prop if you set dangerouslyInnerHTML so React knows which value should be selected.")))),t.selected!=null&&!Le&&(f("Use the `defaultValue` or `value` props on <select> instead of setting `selected` on <option>."),Le=!0)}function ut(e,t){t.value!=null&&e.setAttribute("value",On($r(t.value)))}var pt=Array.isArray;function Be(e){return pt(e)}var Va;Va=!1;function ao(){var e=Fa();return e?`
+
+Check the render method of \``+e+"`.":""}var mu=["value","defaultValue"];function Df(e){{to("select",e);for(var t=0;t<mu.length;t++){var n=mu[t];if(e[n]!=null){var r=Be(e[n]);e.multiple&&!r?f("The `%s` prop supplied to <select> must be an array if `multiple` is true.%s",n,ao()):!e.multiple&&r&&f("The `%s` prop supplied to <select> must be a scalar value if `multiple` is false.%s",n,ao())}}}}function sa(e,t,n,r){var a=e.options;if(t){for(var i=n,o={},u=0;u<i.length;u++)o["$"+i[u]]=!0;for(var c=0;c<a.length;c++){var h=o.hasOwnProperty("$"+a[c].value);a[c].selected!==h&&(a[c].selected=h),h&&r&&(a[c].defaultSelected=!0)}}else{for(var m=On($r(n)),R=null,E=0;E<a.length;E++){if(a[E].value===m){a[E].selected=!0,r&&(a[E].defaultSelected=!0);return}R===null&&!a[E].disabled&&(R=a[E])}R!==null&&(R.selected=!0)}}function yu(e,t){return _e({},t,{value:void 0})}function gu(e,t){var n=e;Df(t),n._wrapperState={wasMultiple:!!t.multiple},t.value!==void 0&&t.defaultValue!==void 0&&!Va&&(f("Select elements must be either controlled or uncontrolled (specify either the value prop, or the defaultValue prop, but not both). Decide between using a controlled or uncontrolled select element and remove one of these props. More info: https://reactjs.org/link/controlled-components"),Va=!0)}function wf(e,t){var n=e;n.multiple=!!t.multiple;var r=t.value;r!=null?sa(n,!!t.multiple,r,!1):t.defaultValue!=null&&sa(n,!!t.multiple,t.defaultValue,!0)}function WE(e,t){var n=e,r=n._wrapperState.wasMultiple;n._wrapperState.wasMultiple=!!t.multiple;var a=t.value;a!=null?sa(n,!!t.multiple,a,!1):r!==!!t.multiple&&(t.defaultValue!=null?sa(n,!!t.multiple,t.defaultValue,!0):sa(n,!!t.multiple,t.multiple?[]:"",!1))}function QE(e,t){var n=e,r=t.value;r!=null&&sa(n,!!t.multiple,r,!1)}var Qh=!1;function Of(e,t){var n=e;if(t.dangerouslySetInnerHTML!=null)throw new Error("`dangerouslySetInnerHTML` does not make sense on <textarea>.");var r=_e({},t,{value:void 0,defaultValue:void 0,children:On(n._wrapperState.initialValue)});return r}function Xh(e,t){var n=e;to("textarea",t),t.value!==void 0&&t.defaultValue!==void 0&&!Qh&&(f("%s contains a textarea with both value and defaultValue props. Textarea elements must be either controlled or uncontrolled (specify either the value prop, or the defaultValue prop, but not both). Decide between using a controlled or uncontrolled textarea and remove one of these props. More info: https://reactjs.org/link/controlled-components",Fa()||"A component"),Qh=!0);var r=t.value;if(r==null){var a=t.children,i=t.defaultValue;if(a!=null){f("Use the `defaultValue` or `value` props instead of setting children on <textarea>.");{if(i!=null)throw new Error("If you supply `defaultValue` on a <textarea>, do not pass children.");if(Be(a)){if(a.length>1)throw new Error("<textarea> can only have at most one child.");a=a[0]}i=a}}i==null&&(i=""),r=i}n._wrapperState={initialValue:$r(r)}}function Kh(e,t){var n=e,r=$r(t.value),a=$r(t.defaultValue);if(r!=null){var i=On(r);i!==n.value&&(n.value=i),t.defaultValue==null&&n.defaultValue!==i&&(n.defaultValue=i)}a!=null&&(n.defaultValue=On(a))}function Jh(e,t){var n=e,r=n.textContent;r===n._wrapperState.initialValue&&r!==""&&r!==null&&(n.value=r)}function XE(e,t){Kh(e,t)}var ca="http://www.w3.org/1999/xhtml",KE="http://www.w3.org/1998/Math/MathML",_f="http://www.w3.org/2000/svg";function Af(e){switch(e){case"svg":return _f;case"math":return KE;default:return ca}}function Lf(e,t){return e==null||e===ca?Af(t):e===_f&&t==="foreignObject"?ca:e}var JE=function(e){return typeof MSApp<"u"&&MSApp.execUnsafeLocalFunction?function(t,n,r,a){MSApp.execUnsafeLocalFunction(function(){return e(t,n,r,a)})}:e},ds,Zh=JE(function(e,t){if(e.namespaceURI===_f&&!("innerHTML"in e)){ds=ds||document.createElement("div"),ds.innerHTML="<svg>"+t.valueOf().toString()+"</svg>";for(var n=ds.firstChild;e.firstChild;)e.removeChild(e.firstChild);for(;n.firstChild;)e.appendChild(n.firstChild);return}e.innerHTML=t}),_n=1,fa=3,Tt=8,da=9,Mf=11,ps=function(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&n.nodeType===fa){n.nodeValue=t;return}}e.textContent=t},ZE={animation:["animationDelay","animationDirection","animationDuration","animationFillMode","animationIterationCount","animationName","animationPlayState","animationTimingFunction"],background:["backgroundAttachment","backgroundClip","backgroundColor","backgroundImage","backgroundOrigin","backgroundPositionX","backgroundPositionY","backgroundRepeat","backgroundSize"],backgroundPosition:["backgroundPositionX","backgroundPositionY"],border:["borderBottomColor","borderBottomStyle","borderBottomWidth","borderImageOutset","borderImageRepeat","borderImageSlice","borderImageSource","borderImageWidth","borderLeftColor","borderLeftStyle","borderLeftWidth","borderRightColor","borderRightStyle","borderRightWidth","borderTopColor","borderTopStyle","borderTopWidth"],borderBlockEnd:["borderBlockEndColor","borderBlockEndStyle","borderBlockEndWidth"],borderBlockStart:["borderBlockStartColor","borderBlockStartStyle","borderBlockStartWidth"],borderBottom:["borderBottomColor","borderBottomStyle","borderBottomWidth"],borderColor:["borderBottomColor","borderLeftColor","borderRightColor","borderTopColor"],borderImage:["borderImageOutset","borderImageRepeat","borderImageSlice","borderImageSource","borderImageWidth"],borderInlineEnd:["borderInlineEndColor","borderInlineEndStyle","borderInlineEndWidth"],borderInlineStart:["borderInlineStartColor","borderInlineStartStyle","borderInlineStartWidth"],borderLeft:["borderLeftColor","borderLeftStyle","borderLeftWidth"],borderRadius:["borderBottomLeftRadius","borderBottomRightRadius","borderTopLeftRadius","borderTopRightRadius"],borderRight:["borderRightColor","borderRightStyle","borderRightWidth"],borderStyle:["borderBottomStyle","borderLeftStyle","borderRightStyle","borderTopStyle"],borderTop:["borderTopColor","borderTopStyle","borderTopWidth"],borderWidth:["borderBottomWidth","borderLeftWidth","borderRightWidth","borderTopWidth"],columnRule:["columnRuleColor","columnRuleStyle","columnRuleWidth"],columns:["columnCount","columnWidth"],flex:["flexBasis","flexGrow","flexShrink"],flexFlow:["flexDirection","flexWrap"],font:["fontFamily","fontFeatureSettings","fontKerning","fontLanguageOverride","fontSize","fontSizeAdjust","fontStretch","fontStyle","fontVariant","fontVariantAlternates","fontVariantCaps","fontVariantEastAsian","fontVariantLigatures","fontVariantNumeric","fontVariantPosition","fontWeight","lineHeight"],fontVariant:["fontVariantAlternates","fontVariantCaps","fontVariantEastAsian","fontVariantLigatures","fontVariantNumeric","fontVariantPosition"],gap:["columnGap","rowGap"],grid:["gridAutoColumns","gridAutoFlow","gridAutoRows","gridTemplateAreas","gridTemplateColumns","gridTemplateRows"],gridArea:["gridColumnEnd","gridColumnStart","gridRowEnd","gridRowStart"],gridColumn:["gridColumnEnd","gridColumnStart"],gridColumnGap:["columnGap"],gridGap:["columnGap","rowGap"],gridRow:["gridRowEnd","gridRowStart"],gridRowGap:["rowGap"],gridTemplate:["gridTemplateAreas","gridTemplateColumns","gridTemplateRows"],listStyle:["listStyleImage","listStylePosition","listStyleType"],margin:["marginBottom","marginLeft","marginRight","marginTop"],marker:["markerEnd","markerMid","markerStart"],mask:["maskClip","maskComposite","maskImage","maskMode","maskOrigin","maskPositionX","maskPositionY","maskRepeat","maskSize"],maskPosition:["maskPositionX","maskPositionY"],outline:["outlineColor","outlineStyle","outlineWidth"],overflow:["overflowX","overflowY"],padding:["paddingBottom","paddingLeft","paddingRight","paddingTop"],placeContent:["alignContent","justifyContent"],placeItems:["alignItems","justifyItems"],placeSelf:["alignSelf","justifySelf"],textDecoration:["textDecorationColor","textDecorationLine","textDecorationStyle"],textEmphasis:["textEmphasisColor","textEmphasisStyle"],transition:["transitionDelay","transitionDuration","transitionProperty","transitionTimingFunction"],wordWrap:["overflowWrap"]},bu={animationIterationCount:!0,aspectRatio:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0};function eR(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var tR=["Webkit","ms","Moz","O"];Object.keys(bu).forEach(function(e){tR.forEach(function(t){bu[eR(t,e)]=bu[e]})});function Uf(e,t,n){var r=t==null||typeof t=="boolean"||t==="";return r?"":!n&&typeof t=="number"&&t!==0&&!(bu.hasOwnProperty(e)&&bu[e])?t+"px":(gr(t,e),(""+t).trim())}var nR=/([A-Z])/g,rR=/^ms-/;function aR(e){return e.replace(nR,"-$1").toLowerCase().replace(rR,"-ms-")}var em=function(){};{var iR=/^(?:webkit|moz|o)[A-Z]/,oR=/^-ms-/,uR=/-(.)/g,tm=/;\s*$/,io={},Nf={},nm=!1,rm=!1,lR=function(e){return e.replace(uR,function(t,n){return n.toUpperCase()})},sR=function(e){io.hasOwnProperty(e)&&io[e]||(io[e]=!0,f("Unsupported style property %s. Did you mean %s?",e,lR(e.replace(oR,"ms-"))))},cR=function(e){io.hasOwnProperty(e)&&io[e]||(io[e]=!0,f("Unsupported vendor-prefixed style property %s. Did you mean %s?",e,e.charAt(0).toUpperCase()+e.slice(1)))},fR=function(e,t){Nf.hasOwnProperty(t)&&Nf[t]||(Nf[t]=!0,f(`Style property values shouldn't contain a semicolon. Try "%s: %s" instead.`,e,t.replace(tm,"")))},dR=function(e,t){nm||(nm=!0,f("`NaN` is an invalid value for the `%s` css style property.",e))},pR=function(e,t){rm||(rm=!0,f("`Infinity` is an invalid value for the `%s` css style property.",e))};em=function(e,t){e.indexOf("-")>-1?sR(e):iR.test(e)?cR(e):tm.test(t)&&fR(e,t),typeof t=="number"&&(isNaN(t)?dR(e,t):isFinite(t)||pR(e,t))}}var vR=em;function hR(e){{var t="",n="";for(var r in e)if(e.hasOwnProperty(r)){var a=e[r];if(a!=null){var i=r.indexOf("--")===0;t+=n+(i?r:aR(r))+":",t+=Uf(r,a,i),n=";"}}return t||null}}function am(e,t){var n=e.style;for(var r in t)if(t.hasOwnProperty(r)){var a=r.indexOf("--")===0;a||vR(r,t[r]);var i=Uf(r,t[r],a);r==="float"&&(r="cssFloat"),a?n.setProperty(r,i):n[r]=i}}function mR(e){return e==null||typeof e=="boolean"||e===""}function im(e){var t={};for(var n in e)for(var r=ZE[n]||[n],a=0;a<r.length;a++)t[r[a]]=n;return t}function yR(e,t){{if(!t)return;var n=im(e),r=im(t),a={};for(var i in n){var o=n[i],u=r[i];if(u&&o!==u){var c=o+","+u;if(a[c])continue;a[c]=!0,f("%s a style property during rerender (%s) when a conflicting property is set (%s) can lead to styling bugs. To avoid this, don't mix shorthand and non-shorthand properties for the same value; instead, replace the shorthand with separate values.",mR(e[o])?"Removing":"Updating",o,u)}}}}var gR={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},bR=_e({menuitem:!0},gR),SR="__html";function kf(e,t){if(t){if(bR[e]&&(t.children!=null||t.dangerouslySetInnerHTML!=null))throw new Error(e+" is a void element tag and must neither have `children` nor use `dangerouslySetInnerHTML`.");if(t.dangerouslySetInnerHTML!=null){if(t.children!=null)throw new Error("Can only set one of `children` or `props.dangerouslySetInnerHTML`.");if(typeof t.dangerouslySetInnerHTML!="object"||!(SR in t.dangerouslySetInnerHTML))throw new Error("`props.dangerouslySetInnerHTML` must be in the form `{__html: ...}`. Please visit https://reactjs.org/link/dangerously-set-inner-html for more information.")}if(!t.suppressContentEditableWarning&&t.contentEditable&&t.children!=null&&f("A component is `contentEditable` and contains `children` managed by React. It is now your responsibility to guarantee that none of those nodes are unexpectedly modified or duplicated. This is probably not intentional."),t.style!=null&&typeof t.style!="object")throw new Error("The `style` prop expects a mapping from style properties to values, not a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.")}}function bi(e,t){if(e.indexOf("-")===-1)return typeof t.is=="string";switch(e){case"annotation-xml":case"color-profile":case"font-face":case"font-face-src":case"font-face-uri":case"font-face-format":case"font-face-name":case"missing-glyph":return!1;default:return!0}}var vs={accept:"accept",acceptcharset:"acceptCharset","accept-charset":"acceptCharset",accesskey:"accessKey",action:"action",allowfullscreen:"allowFullScreen",alt:"alt",as:"as",async:"async",autocapitalize:"autoCapitalize",autocomplete:"autoComplete",autocorrect:"autoCorrect",autofocus:"autoFocus",autoplay:"autoPlay",autosave:"autoSave",capture:"capture",cellpadding:"cellPadding",cellspacing:"cellSpacing",challenge:"challenge",charset:"charSet",checked:"checked",children:"children",cite:"cite",class:"className",classid:"classID",classname:"className",cols:"cols",colspan:"colSpan",content:"content",contenteditable:"contentEditable",contextmenu:"contextMenu",controls:"controls",controlslist:"controlsList",coords:"coords",crossorigin:"crossOrigin",dangerouslysetinnerhtml:"dangerouslySetInnerHTML",data:"data",datetime:"dateTime",default:"default",defaultchecked:"defaultChecked",defaultvalue:"defaultValue",defer:"defer",dir:"dir",disabled:"disabled",disablepictureinpicture:"disablePictureInPicture",disableremoteplayback:"disableRemotePlayback",download:"download",draggable:"draggable",enctype:"encType",enterkeyhint:"enterKeyHint",for:"htmlFor",form:"form",formmethod:"formMethod",formaction:"formAction",formenctype:"formEncType",formnovalidate:"formNoValidate",formtarget:"formTarget",frameborder:"frameBorder",headers:"headers",height:"height",hidden:"hidden",high:"high",href:"href",hreflang:"hrefLang",htmlfor:"htmlFor",httpequiv:"httpEquiv","http-equiv":"httpEquiv",icon:"icon",id:"id",imagesizes:"imageSizes",imagesrcset:"imageSrcSet",innerhtml:"innerHTML",inputmode:"inputMode",integrity:"integrity",is:"is",itemid:"itemID",itemprop:"itemProp",itemref:"itemRef",itemscope:"itemScope",itemtype:"itemType",keyparams:"keyParams",keytype:"keyType",kind:"kind",label:"label",lang:"lang",list:"list",loop:"loop",low:"low",manifest:"manifest",marginwidth:"marginWidth",marginheight:"marginHeight",max:"max",maxlength:"maxLength",media:"media",mediagroup:"mediaGroup",method:"method",min:"min",minlength:"minLength",multiple:"multiple",muted:"muted",name:"name",nomodule:"noModule",nonce:"nonce",novalidate:"noValidate",open:"open",optimum:"optimum",pattern:"pattern",placeholder:"placeholder",playsinline:"playsInline",poster:"poster",preload:"preload",profile:"profile",radiogroup:"radioGroup",readonly:"readOnly",referrerpolicy:"referrerPolicy",rel:"rel",required:"required",reversed:"reversed",role:"role",rows:"rows",rowspan:"rowSpan",sandbox:"sandbox",scope:"scope",scoped:"scoped",scrolling:"scrolling",seamless:"seamless",selected:"selected",shape:"shape",size:"size",sizes:"sizes",span:"span",spellcheck:"spellCheck",src:"src",srcdoc:"srcDoc",srclang:"srcLang",srcset:"srcSet",start:"start",step:"step",style:"style",summary:"summary",tabindex:"tabIndex",target:"target",title:"title",type:"type",usemap:"useMap",value:"value",width:"width",wmode:"wmode",wrap:"wrap",about:"about",accentheight:"accentHeight","accent-height":"accentHeight",accumulate:"accumulate",additive:"additive",alignmentbaseline:"alignmentBaseline","alignment-baseline":"alignmentBaseline",allowreorder:"allowReorder",alphabetic:"alphabetic",amplitude:"amplitude",arabicform:"arabicForm","arabic-form":"arabicForm",ascent:"ascent",attributename:"attributeName",attributetype:"attributeType",autoreverse:"autoReverse",azimuth:"azimuth",basefrequency:"baseFrequency",baselineshift:"baselineShift","baseline-shift":"baselineShift",baseprofile:"baseProfile",bbox:"bbox",begin:"begin",bias:"bias",by:"by",calcmode:"calcMode",capheight:"capHeight","cap-height":"capHeight",clip:"clip",clippath:"clipPath","clip-path":"clipPath",clippathunits:"clipPathUnits",cliprule:"clipRule","clip-rule":"clipRule",color:"color",colorinterpolation:"colorInterpolation","color-interpolation":"colorInterpolation",colorinterpolationfilters:"colorInterpolationFilters","color-interpolation-filters":"colorInterpolationFilters",colorprofile:"colorProfile","color-profile":"colorProfile",colorrendering:"colorRendering","color-rendering":"colorRendering",contentscripttype:"contentScriptType",contentstyletype:"contentStyleType",cursor:"cursor",cx:"cx",cy:"cy",d:"d",datatype:"datatype",decelerate:"decelerate",descent:"descent",diffuseconstant:"diffuseConstant",direction:"direction",display:"display",divisor:"divisor",dominantbaseline:"dominantBaseline","dominant-baseline":"dominantBaseline",dur:"dur",dx:"dx",dy:"dy",edgemode:"edgeMode",elevation:"elevation",enablebackground:"enableBackground","enable-background":"enableBackground",end:"end",exponent:"exponent",externalresourcesrequired:"externalResourcesRequired",fill:"fill",fillopacity:"fillOpacity","fill-opacity":"fillOpacity",fillrule:"fillRule","fill-rule":"fillRule",filter:"filter",filterres:"filterRes",filterunits:"filterUnits",floodopacity:"floodOpacity","flood-opacity":"floodOpacity",floodcolor:"floodColor","flood-color":"floodColor",focusable:"focusable",fontfamily:"fontFamily","font-family":"fontFamily",fontsize:"fontSize","font-size":"fontSize",fontsizeadjust:"fontSizeAdjust","font-size-adjust":"fontSizeAdjust",fontstretch:"fontStretch","font-stretch":"fontStretch",fontstyle:"fontStyle","font-style":"fontStyle",fontvariant:"fontVariant","font-variant":"fontVariant",fontweight:"fontWeight","font-weight":"fontWeight",format:"format",from:"from",fx:"fx",fy:"fy",g1:"g1",g2:"g2",glyphname:"glyphName","glyph-name":"glyphName",glyphorientationhorizontal:"glyphOrientationHorizontal","glyph-orientation-horizontal":"glyphOrientationHorizontal",glyphorientationvertical:"glyphOrientationVertical","glyph-orientation-vertical":"glyphOrientationVertical",glyphref:"glyphRef",gradienttransform:"gradientTransform",gradientunits:"gradientUnits",hanging:"hanging",horizadvx:"horizAdvX","horiz-adv-x":"horizAdvX",horizoriginx:"horizOriginX","horiz-origin-x":"horizOriginX",ideographic:"ideographic",imagerendering:"imageRendering","image-rendering":"imageRendering",in2:"in2",in:"in",inlist:"inlist",intercept:"intercept",k1:"k1",k2:"k2",k3:"k3",k4:"k4",k:"k",kernelmatrix:"kernelMatrix",kernelunitlength:"kernelUnitLength",kerning:"kerning",keypoints:"keyPoints",keysplines:"keySplines",keytimes:"keyTimes",lengthadjust:"lengthAdjust",letterspacing:"letterSpacing","letter-spacing":"letterSpacing",lightingcolor:"lightingColor","lighting-color":"lightingColor",limitingconeangle:"limitingConeAngle",local:"local",markerend:"markerEnd","marker-end":"markerEnd",markerheight:"markerHeight",markermid:"markerMid","marker-mid":"markerMid",markerstart:"markerStart","marker-start":"markerStart",markerunits:"markerUnits",markerwidth:"markerWidth",mask:"mask",maskcontentunits:"maskContentUnits",maskunits:"maskUnits",mathematical:"mathematical",mode:"mode",numoctaves:"numOctaves",offset:"offset",opacity:"opacity",operator:"operator",order:"order",orient:"orient",orientation:"orientation",origin:"origin",overflow:"overflow",overlineposition:"overlinePosition","overline-position":"overlinePosition",overlinethickness:"overlineThickness","overline-thickness":"overlineThickness",paintorder:"paintOrder","paint-order":"paintOrder",panose1:"panose1","panose-1":"panose1",pathlength:"pathLength",patterncontentunits:"patternContentUnits",patterntransform:"patternTransform",patternunits:"patternUnits",pointerevents:"pointerEvents","pointer-events":"pointerEvents",points:"points",pointsatx:"pointsAtX",pointsaty:"pointsAtY",pointsatz:"pointsAtZ",prefix:"prefix",preservealpha:"preserveAlpha",preserveaspectratio:"preserveAspectRatio",primitiveunits:"primitiveUnits",property:"property",r:"r",radius:"radius",refx:"refX",refy:"refY",renderingintent:"renderingIntent","rendering-intent":"renderingIntent",repeatcount:"repeatCount",repeatdur:"repeatDur",requiredextensions:"requiredExtensions",requiredfeatures:"requiredFeatures",resource:"resource",restart:"restart",result:"result",results:"results",rotate:"rotate",rx:"rx",ry:"ry",scale:"scale",security:"security",seed:"seed",shaperendering:"shapeRendering","shape-rendering":"shapeRendering",slope:"slope",spacing:"spacing",specularconstant:"specularConstant",specularexponent:"specularExponent",speed:"speed",spreadmethod:"spreadMethod",startoffset:"startOffset",stddeviation:"stdDeviation",stemh:"stemh",stemv:"stemv",stitchtiles:"stitchTiles",stopcolor:"stopColor","stop-color":"stopColor",stopopacity:"stopOpacity","stop-opacity":"stopOpacity",strikethroughposition:"strikethroughPosition","strikethrough-position":"strikethroughPosition",strikethroughthickness:"strikethroughThickness","strikethrough-thickness":"strikethroughThickness",string:"string",stroke:"stroke",strokedasharray:"strokeDasharray","stroke-dasharray":"strokeDasharray",strokedashoffset:"strokeDashoffset","stroke-dashoffset":"strokeDashoffset",strokelinecap:"strokeLinecap","stroke-linecap":"strokeLinecap",strokelinejoin:"strokeLinejoin","stroke-linejoin":"strokeLinejoin",strokemiterlimit:"strokeMiterlimit","stroke-miterlimit":"strokeMiterlimit",strokewidth:"strokeWidth","stroke-width":"strokeWidth",strokeopacity:"strokeOpacity","stroke-opacity":"strokeOpacity",suppresscontenteditablewarning:"suppressContentEditableWarning",suppresshydrationwarning:"suppressHydrationWarning",surfacescale:"surfaceScale",systemlanguage:"systemLanguage",tablevalues:"tableValues",targetx:"targetX",targety:"targetY",textanchor:"textAnchor","text-anchor":"textAnchor",textdecoration:"textDecoration","text-decoration":"textDecoration",textlength:"textLength",textrendering:"textRendering","text-rendering":"textRendering",to:"to",transform:"transform",typeof:"typeof",u1:"u1",u2:"u2",underlineposition:"underlinePosition","underline-position":"underlinePosition",underlinethickness:"underlineThickness","underline-thickness":"underlineThickness",unicode:"unicode",unicodebidi:"unicodeBidi","unicode-bidi":"unicodeBidi",unicoderange:"unicodeRange","unicode-range":"unicodeRange",unitsperem:"unitsPerEm","units-per-em":"unitsPerEm",unselectable:"unselectable",valphabetic:"vAlphabetic","v-alphabetic":"vAlphabetic",values:"values",vectoreffect:"vectorEffect","vector-effect":"vectorEffect",version:"version",vertadvy:"vertAdvY","vert-adv-y":"vertAdvY",vertoriginx:"vertOriginX","vert-origin-x":"vertOriginX",vertoriginy:"vertOriginY","vert-origin-y":"vertOriginY",vhanging:"vHanging","v-hanging":"vHanging",videographic:"vIdeographic","v-ideographic":"vIdeographic",viewbox:"viewBox",viewtarget:"viewTarget",visibility:"visibility",vmathematical:"vMathematical","v-mathematical":"vMathematical",vocab:"vocab",widths:"widths",wordspacing:"wordSpacing","word-spacing":"wordSpacing",writingmode:"writingMode","writing-mode":"writingMode",x1:"x1",x2:"x2",x:"x",xchannelselector:"xChannelSelector",xheight:"xHeight","x-height":"xHeight",xlinkactuate:"xlinkActuate","xlink:actuate":"xlinkActuate",xlinkarcrole:"xlinkArcrole","xlink:arcrole":"xlinkArcrole",xlinkhref:"xlinkHref","xlink:href":"xlinkHref",xlinkrole:"xlinkRole","xlink:role":"xlinkRole",xlinkshow:"xlinkShow","xlink:show":"xlinkShow",xlinktitle:"xlinkTitle","xlink:title":"xlinkTitle",xlinktype:"xlinkType","xlink:type":"xlinkType",xmlbase:"xmlBase","xml:base":"xmlBase",xmllang:"xmlLang","xml:lang":"xmlLang",xmlns:"xmlns","xml:space":"xmlSpace",xmlnsxlink:"xmlnsXlink","xmlns:xlink":"xmlnsXlink",xmlspace:"xmlSpace",y1:"y1",y2:"y2",y:"y",ychannelselector:"yChannelSelector",z:"z",zoomandpan:"zoomAndPan"},om={"aria-current":0,"aria-description":0,"aria-details":0,"aria-disabled":0,"aria-hidden":0,"aria-invalid":0,"aria-keyshortcuts":0,"aria-label":0,"aria-roledescription":0,"aria-autocomplete":0,"aria-checked":0,"aria-expanded":0,"aria-haspopup":0,"aria-level":0,"aria-modal":0,"aria-multiline":0,"aria-multiselectable":0,"aria-orientation":0,"aria-placeholder":0,"aria-pressed":0,"aria-readonly":0,"aria-required":0,"aria-selected":0,"aria-sort":0,"aria-valuemax":0,"aria-valuemin":0,"aria-valuenow":0,"aria-valuetext":0,"aria-atomic":0,"aria-busy":0,"aria-live":0,"aria-relevant":0,"aria-dropeffect":0,"aria-grabbed":0,"aria-activedescendant":0,"aria-colcount":0,"aria-colindex":0,"aria-colspan":0,"aria-controls":0,"aria-describedby":0,"aria-errormessage":0,"aria-flowto":0,"aria-labelledby":0,"aria-owns":0,"aria-posinset":0,"aria-rowcount":0,"aria-rowindex":0,"aria-rowspan":0,"aria-setsize":0},oo={},ER=new RegExp("^(aria)-["+re+"]*$"),RR=new RegExp("^(aria)[A-Z]["+re+"]*$");function CR(e,t){{if(an.call(oo,t)&&oo[t])return!0;if(RR.test(t)){var n="aria-"+t.slice(4).toLowerCase(),r=om.hasOwnProperty(n)?n:null;if(r==null)return f("Invalid ARIA attribute `%s`. ARIA attributes follow the pattern aria-* and must be lowercase.",t),oo[t]=!0,!0;if(t!==r)return f("Invalid ARIA attribute `%s`. Did you mean `%s`?",t,r),oo[t]=!0,!0}if(ER.test(t)){var a=t.toLowerCase(),i=om.hasOwnProperty(a)?a:null;if(i==null)return oo[t]=!0,!1;if(t!==i)return f("Unknown ARIA attribute `%s`. Did you mean `%s`?",t,i),oo[t]=!0,!0}}return!0}function TR(e,t){{var n=[];for(var r in t){var a=CR(e,r);a||n.push(r)}var i=n.map(function(o){return"`"+o+"`"}).join(", ");n.length===1?f("Invalid aria prop %s on <%s> tag. For details, see https://reactjs.org/link/invalid-aria-props",i,e):n.length>1&&f("Invalid aria props %s on <%s> tag. For details, see https://reactjs.org/link/invalid-aria-props",i,e)}}function xR(e,t){bi(e,t)||TR(e,t)}var um=!1;function DR(e,t){{if(e!=="input"&&e!=="textarea"&&e!=="select")return;t!=null&&t.value===null&&!um&&(um=!0,e==="select"&&t.multiple?f("`value` prop on `%s` should not be null. Consider using an empty array when `multiple` is set to `true` to clear the component or `undefined` for uncontrolled components.",e):f("`value` prop on `%s` should not be null. Consider using an empty string to clear the component or `undefined` for uncontrolled components.",e))}}var lm=function(){};{var mn={},sm=/^on./,wR=/^on[^A-Z]/,OR=new RegExp("^(aria)-["+re+"]*$"),_R=new RegExp("^(aria)[A-Z]["+re+"]*$");lm=function(e,t,n,r){if(an.call(mn,t)&&mn[t])return!0;var a=t.toLowerCase();if(a==="onfocusin"||a==="onfocusout")return f("React uses onFocus and onBlur instead of onFocusIn and onFocusOut. All React events are normalized to bubble, so onFocusIn and onFocusOut are not needed/supported by React."),mn[t]=!0,!0;if(r!=null){var i=r.registrationNameDependencies,o=r.possibleRegistrationNames;if(i.hasOwnProperty(t))return!0;var u=o.hasOwnProperty(a)?o[a]:null;if(u!=null)return f("Invalid event handler property `%s`. Did you mean `%s`?",t,u),mn[t]=!0,!0;if(sm.test(t))return f("Unknown event handler property `%s`. It will be ignored.",t),mn[t]=!0,!0}else if(sm.test(t))return wR.test(t)&&f("Invalid event handler property `%s`. React events use the camelCase naming convention, for example `onClick`.",t),mn[t]=!0,!0;if(OR.test(t)||_R.test(t))return!0;if(a==="innerhtml")return f("Directly setting property `innerHTML` is not permitted. For more information, lookup documentation on `dangerouslySetInnerHTML`."),mn[t]=!0,!0;if(a==="aria")return f("The `aria` attribute is reserved for future use in React. Pass individual `aria-` attributes instead."),mn[t]=!0,!0;if(a==="is"&&n!==null&&n!==void 0&&typeof n!="string")return f("Received a `%s` for a string attribute `is`. If this is expected, cast the value to a string.",typeof n),mn[t]=!0,!0;if(typeof n=="number"&&isNaN(n))return f("Received NaN for the `%s` attribute. If this is expected, cast the value to a string.",t),mn[t]=!0,!0;var c=$n(t),h=c!==null&&c.type===ar;if(vs.hasOwnProperty(a)){var m=vs[a];if(m!==t)return f("Invalid DOM property `%s`. Did you mean `%s`?",t,m),mn[t]=!0,!0}else if(!h&&t!==a)return f("React does not recognize the `%s` prop on a DOM element. If you intentionally want it to appear in the DOM as a custom attribute, spell it as lowercase `%s` instead. If you accidentally passed it from a parent component, remove it from the DOM element.",t,a),mn[t]=!0,!0;return typeof n=="boolean"&&wn(t,n,c,!1)?(n?f('Received `%s` for a non-boolean attribute `%s`.\n\nIf you want to write it to the DOM, pass a string instead: %s="%s" or %s={value.toString()}.',n,t,t,n,t):f('Received `%s` for a non-boolean attribute `%s`.\n\nIf you want to write it to the DOM, pass a string instead: %s="%s" or %s={value.toString()}.\n\nIf you used to conditionally omit it with %s={condition && value}, pass %s={condition ? value : undefined} instead.',n,t,t,n,t,t,t),mn[t]=!0,!0):h?!0:wn(t,n,c,!1)?(mn[t]=!0,!1):((n==="false"||n==="true")&&c!==null&&c.type===bt&&(f("Received the string `%s` for the boolean attribute `%s`. %s Did you mean %s={%s}?",n,t,n==="false"?"The browser will interpret it as a truthy value.":'Although this works, it will not work as expected if you pass the string "false".',t,n),mn[t]=!0),!0)}}var AR=function(e,t,n){{var r=[];for(var a in t){var i=lm(e,a,t[a],n);i||r.push(a)}var o=r.map(function(u){return"`"+u+"`"}).join(", ");r.length===1?f("Invalid value for prop %s on <%s> tag. Either remove it from the element, or pass a string or number value to keep it in the DOM. For details, see https://reactjs.org/link/attribute-behavior ",o,e):r.length>1&&f("Invalid values for props %s on <%s> tag. Either remove them from the element, or pass a string or number value to keep them in the DOM. For details, see https://reactjs.org/link/attribute-behavior ",o,e)}};function LR(e,t,n){bi(e,t)||AR(e,t,n)}var cm=1,zf=2,Su=4,MR=cm|zf|Su,Eu=null;function UR(e){Eu!==null&&f("Expected currently replaying event to be null. This error is likely caused by a bug in React. Please file an issue."),Eu=e}function NR(){Eu===null&&f("Expected currently replaying event to not be null. This error is likely caused by a bug in React. Please file an issue."),Eu=null}function kR(e){return e===Eu}function Ff(e){var t=e.target||e.srcElement||window;return t.correspondingUseElement&&(t=t.correspondingUseElement),t.nodeType===fa?t.parentNode:t}var Hf=null,uo=null,lo=null;function fm(e){var t=Wa(e);if(t){if(typeof Hf!="function")throw new Error("setRestoreImplementation() needs to be called to handle a target for controlled events. This error is likely caused by a bug in React. Please file an issue.");var n=t.stateNode;if(n){var r=Ks(n);Hf(t.stateNode,t.type,r)}}}function zR(e){Hf=e}function dm(e){uo?lo?lo.push(e):lo=[e]:uo=e}function FR(){return uo!==null||lo!==null}function pm(){if(uo){var e=uo,t=lo;if(uo=null,lo=null,fm(e),t)for(var n=0;n<t.length;n++)fm(t[n])}}var vm=function(e,t){return e(t)},hm=function(){},jf=!1;function HR(){var e=FR();e&&(hm(),pm())}function mm(e,t,n){if(jf)return e(t,n);jf=!0;try{return vm(e,t,n)}finally{jf=!1,HR()}}function jR(e,t,n){vm=e,hm=n}function VR(e){return e==="button"||e==="input"||e==="select"||e==="textarea"}function BR(e,t,n){switch(e){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":case"onMouseEnter":return!!(n.disabled&&VR(t));default:return!1}}function Ru(e,t){var n=e.stateNode;if(n===null)return null;var r=Ks(n);if(r===null)return null;var a=r[t];if(BR(t,e.type,r))return null;if(a&&typeof a!="function")throw new Error("Expected `"+t+"` listener to be a function, instead got a value of `"+typeof a+"` type.");return a}var Vf=!1;if(Ct)try{var Cu={};Object.defineProperty(Cu,"passive",{get:function(){Vf=!0}}),window.addEventListener("test",Cu,Cu),window.removeEventListener("test",Cu,Cu)}catch{Vf=!1}function ym(e,t,n,r,a,i,o,u,c){var h=Array.prototype.slice.call(arguments,3);try{t.apply(n,h)}catch(m){this.onError(m)}}var gm=ym;if(typeof window<"u"&&typeof window.dispatchEvent=="function"&&typeof document<"u"&&typeof document.createEvent=="function"){var Bf=document.createElement("react");gm=function(t,n,r,a,i,o,u,c,h){if(typeof document>"u"||document===null)throw new Error("The `document` global was defined when React was initialized, but is not defined anymore. This can happen in a test environment if a component schedules an update from an asynchronous callback, but the test has already finished running. To solve this, you can either unmount the component at the end of your test (and ensure that any asynchronous operations get canceled in `componentWillUnmount`), or you can change the test itself to be asynchronous.");var m=document.createEvent("Event"),R=!1,E=!0,x=window.event,w=Object.getOwnPropertyDescriptor(window,"event");function A(){Bf.removeEventListener(L,ae,!1),typeof window.event<"u"&&window.hasOwnProperty("event")&&(window.event=x)}var I=Array.prototype.slice.call(arguments,3);function ae(){R=!0,A(),n.apply(r,I),E=!1}var te,Ne=!1,Oe=!1;function C(T){if(te=T.error,Ne=!0,te===null&&T.colno===0&&T.lineno===0&&(Oe=!0),T.defaultPrevented&&te!=null&&typeof te=="object")try{te._suppressLogging=!0}catch{}}var L="react-"+(t||"invokeguardedcallback");if(window.addEventListener("error",C),Bf.addEventListener(L,ae,!1),m.initEvent(L,!1,!1),Bf.dispatchEvent(m),w&&Object.defineProperty(window,"event",w),R&&E&&(Ne?Oe&&(te=new Error("A cross-origin error was thrown. React doesn't have access to the actual error object in development. See https://reactjs.org/link/crossorigin-error for more information.")):te=new Error(`An error was thrown inside one of your components, but React doesn't know what it was. This is likely due to browser flakiness. React does its best to preserve the "Pause on exceptions" behavior of the DevTools, which requires some DEV-mode only tricks. It's possible that these don't work in your browser. Try triggering the error in production mode, or switching to a modern browser. If you suspect that this is actually an issue with React, please file an issue.`),this.onError(te)),window.removeEventListener("error",C),!R)return A(),ym.apply(this,arguments)}}var PR=gm,so=!1,hs=null,ms=!1,Pf=null,$R={onError:function(e){so=!0,hs=e}};function $f(e,t,n,r,a,i,o,u,c){so=!1,hs=null,PR.apply($R,arguments)}function YR(e,t,n,r,a,i,o,u,c){if($f.apply(this,arguments),so){var h=Yf();ms||(ms=!0,Pf=h)}}function qR(){if(ms){var e=Pf;throw ms=!1,Pf=null,e}}function GR(){return so}function Yf(){if(so){var e=hs;return so=!1,hs=null,e}else throw new Error("clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue.")}function co(e){return e._reactInternals}function IR(e){return e._reactInternals!==void 0}function WR(e,t){e._reactInternals=t}var ue=0,fo=1,xt=2,ke=4,Si=16,Tu=32,qf=64,Pe=128,pa=256,Ba=512,Ei=1024,Cr=2048,va=4096,Ri=8192,ys=16384,QR=Cr|ke|qf|Ba|Ei|ys,XR=32767,xu=32768,yn=65536,Gf=131072,bm=1048576,If=2097152,Ci=4194304,Wf=8388608,ha=16777216,gs=33554432,Qf=ke|Ei|0,Xf=xt|ke|Si|Tu|Ba|va|Ri,Du=ke|qf|Ba|Ri,po=Cr|Si,ma=Ci|Wf|If,KR=p.ReactCurrentOwner;function Ti(e){var t=e,n=e;if(e.alternate)for(;t.return;)t=t.return;else{var r=t;do t=r,(t.flags&(xt|va))!==ue&&(n=t.return),r=t.return;while(r)}return t.tag===F?n:null}function Sm(e){if(e.tag===de){var t=e.memoizedState;if(t===null){var n=e.alternate;n!==null&&(t=n.memoizedState)}if(t!==null)return t.dehydrated}return null}function Em(e){return e.tag===F?e.stateNode.containerInfo:null}function JR(e){return Ti(e)===e}function ZR(e){{var t=KR.current;if(t!==null&&t.tag===U){var n=t,r=n.stateNode;r._warnedAboutRefsInRender||f("%s is accessing isMounted inside its render() function. render() should be a pure function of props and state. It should never access something that requires stale data from the previous render, such as refs. Move this logic to componentDidMount and componentDidUpdate instead.",ye(n)||"A component"),r._warnedAboutRefsInRender=!0}}var a=co(e);return a?Ti(a)===a:!1}function Rm(e){if(Ti(e)!==e)throw new Error("Unable to find node on an unmounted component.")}function Cm(e){var t=e.alternate;if(!t){var n=Ti(e);if(n===null)throw new Error("Unable to find node on an unmounted component.");return n!==e?null:e}for(var r=e,a=t;;){var i=r.return;if(i===null)break;var o=i.alternate;if(o===null){var u=i.return;if(u!==null){r=a=u;continue}break}if(i.child===o.child){for(var c=i.child;c;){if(c===r)return Rm(i),e;if(c===a)return Rm(i),t;c=c.sibling}throw new Error("Unable to find node on an unmounted component.")}if(r.return!==a.return)r=i,a=o;else{for(var h=!1,m=i.child;m;){if(m===r){h=!0,r=i,a=o;break}if(m===a){h=!0,a=i,r=o;break}m=m.sibling}if(!h){for(m=o.child;m;){if(m===r){h=!0,r=o,a=i;break}if(m===a){h=!0,a=o,r=i;break}m=m.sibling}if(!h)throw new Error("Child was not found in either parent set. This indicates a bug in React related to the return pointer. Please file an issue.")}}if(r.alternate!==a)throw new Error("Return fibers should always be each others' alternates. This error is likely caused by a bug in React. Please file an issue.")}if(r.tag!==F)throw new Error("Unable to find node on an unmounted component.");return r.stateNode.current===r?e:t}function Tm(e){var t=Cm(e);return t!==null?xm(t):null}function xm(e){if(e.tag===$||e.tag===B)return e;for(var t=e.child;t!==null;){var n=xm(t);if(n!==null)return n;t=t.sibling}return null}function eC(e){var t=Cm(e);return t!==null?Dm(t):null}function Dm(e){if(e.tag===$||e.tag===B)return e;for(var t=e.child;t!==null;){if(t.tag!==ee){var n=Dm(t);if(n!==null)return n}t=t.sibling}return null}var wm=s.unstable_scheduleCallback,tC=s.unstable_cancelCallback,nC=s.unstable_shouldYield,rC=s.unstable_requestPaint,Pt=s.unstable_now,aC=s.unstable_getCurrentPriorityLevel,bs=s.unstable_ImmediatePriority,Kf=s.unstable_UserBlockingPriority,xi=s.unstable_NormalPriority,iC=s.unstable_LowPriority,Jf=s.unstable_IdlePriority,oC=s.unstable_yieldValue,uC=s.unstable_setDisableYieldValue,vo=null,sn=null,Q=null,Yr=!1,Tr=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u";function lC(e){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>"u")return!1;var t=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(t.isDisabled)return!0;if(!t.supportsFiber)return f("The installed version of React DevTools is too old and will not work with the current version of React. Please update React DevTools. https://reactjs.org/link/react-devtools"),!0;try{Vr&&(e=_e({},e,{getLaneLabelMap:vC,injectProfilingHooks:pC})),vo=t.inject(e),sn=t}catch(n){f("React instrumentation encountered an error: %s.",n)}return!!t.checkDCE}function sC(e,t){if(sn&&typeof sn.onScheduleFiberRoot=="function")try{sn.onScheduleFiberRoot(vo,e,t)}catch(n){Yr||(Yr=!0,f("React instrumentation encountered an error: %s",n))}}function cC(e,t){if(sn&&typeof sn.onCommitFiberRoot=="function")try{var n=(e.current.flags&Pe)===Pe;if(mr){var r;switch(t){case In:r=bs;break;case ga:r=Kf;break;case ba:r=xi;break;case Ds:r=Jf;break;default:r=xi;break}sn.onCommitFiberRoot(vo,e,r,n)}}catch(a){Yr||(Yr=!0,f("React instrumentation encountered an error: %s",a))}}function fC(e){if(sn&&typeof sn.onPostCommitFiberRoot=="function")try{sn.onPostCommitFiberRoot(vo,e)}catch(t){Yr||(Yr=!0,f("React instrumentation encountered an error: %s",t))}}function dC(e){if(sn&&typeof sn.onCommitFiberUnmount=="function")try{sn.onCommitFiberUnmount(vo,e)}catch(t){Yr||(Yr=!0,f("React instrumentation encountered an error: %s",t))}}function $t(e){if(typeof oC=="function"&&(uC(e),y(e)),sn&&typeof sn.setStrictMode=="function")try{sn.setStrictMode(vo,e)}catch(t){Yr||(Yr=!0,f("React instrumentation encountered an error: %s",t))}}function pC(e){Q=e}function vC(){{for(var e=new Map,t=1,n=0;n<ed;n++){var r=NC(t);e.set(t,r),t*=2}return e}}function hC(e){Q!==null&&typeof Q.markCommitStarted=="function"&&Q.markCommitStarted(e)}function Om(){Q!==null&&typeof Q.markCommitStopped=="function"&&Q.markCommitStopped()}function wu(e){Q!==null&&typeof Q.markComponentRenderStarted=="function"&&Q.markComponentRenderStarted(e)}function ho(){Q!==null&&typeof Q.markComponentRenderStopped=="function"&&Q.markComponentRenderStopped()}function mC(e){Q!==null&&typeof Q.markComponentPassiveEffectMountStarted=="function"&&Q.markComponentPassiveEffectMountStarted(e)}function yC(){Q!==null&&typeof Q.markComponentPassiveEffectMountStopped=="function"&&Q.markComponentPassiveEffectMountStopped()}function gC(e){Q!==null&&typeof Q.markComponentPassiveEffectUnmountStarted=="function"&&Q.markComponentPassiveEffectUnmountStarted(e)}function bC(){Q!==null&&typeof Q.markComponentPassiveEffectUnmountStopped=="function"&&Q.markComponentPassiveEffectUnmountStopped()}function SC(e){Q!==null&&typeof Q.markComponentLayoutEffectMountStarted=="function"&&Q.markComponentLayoutEffectMountStarted(e)}function EC(){Q!==null&&typeof Q.markComponentLayoutEffectMountStopped=="function"&&Q.markComponentLayoutEffectMountStopped()}function _m(e){Q!==null&&typeof Q.markComponentLayoutEffectUnmountStarted=="function"&&Q.markComponentLayoutEffectUnmountStarted(e)}function Am(){Q!==null&&typeof Q.markComponentLayoutEffectUnmountStopped=="function"&&Q.markComponentLayoutEffectUnmountStopped()}function RC(e,t,n){Q!==null&&typeof Q.markComponentErrored=="function"&&Q.markComponentErrored(e,t,n)}function CC(e,t,n){Q!==null&&typeof Q.markComponentSuspended=="function"&&Q.markComponentSuspended(e,t,n)}function TC(e){Q!==null&&typeof Q.markLayoutEffectsStarted=="function"&&Q.markLayoutEffectsStarted(e)}function xC(){Q!==null&&typeof Q.markLayoutEffectsStopped=="function"&&Q.markLayoutEffectsStopped()}function DC(e){Q!==null&&typeof Q.markPassiveEffectsStarted=="function"&&Q.markPassiveEffectsStarted(e)}function wC(){Q!==null&&typeof Q.markPassiveEffectsStopped=="function"&&Q.markPassiveEffectsStopped()}function Lm(e){Q!==null&&typeof Q.markRenderStarted=="function"&&Q.markRenderStarted(e)}function OC(){Q!==null&&typeof Q.markRenderYielded=="function"&&Q.markRenderYielded()}function Mm(){Q!==null&&typeof Q.markRenderStopped=="function"&&Q.markRenderStopped()}function _C(e){Q!==null&&typeof Q.markRenderScheduled=="function"&&Q.markRenderScheduled(e)}function AC(e,t){Q!==null&&typeof Q.markForceUpdateScheduled=="function"&&Q.markForceUpdateScheduled(e,t)}function Zf(e,t){Q!==null&&typeof Q.markStateUpdateScheduled=="function"&&Q.markStateUpdateScheduled(e,t)}var ie=0,Me=1,We=2,vt=8,qr=16,Um=Math.clz32?Math.clz32:UC,LC=Math.log,MC=Math.LN2;function UC(e){var t=e>>>0;return t===0?32:31-(LC(t)/MC|0)|0}var ed=31,H=0,Yt=0,ve=1,mo=2,ya=4,Di=8,Gr=16,Ou=32,yo=4194240,_u=64,td=128,nd=256,rd=512,ad=1024,id=2048,od=4096,ud=8192,ld=16384,sd=32768,cd=65536,fd=131072,dd=262144,pd=524288,vd=1048576,hd=2097152,Ss=130023424,go=4194304,md=8388608,yd=16777216,gd=33554432,bd=67108864,Nm=go,Au=134217728,km=268435455,Lu=268435456,wi=536870912,qn=1073741824;function NC(e){{if(e&ve)return"Sync";if(e&mo)return"InputContinuousHydration";if(e&ya)return"InputContinuous";if(e&Di)return"DefaultHydration";if(e&Gr)return"Default";if(e&Ou)return"TransitionHydration";if(e&yo)return"Transition";if(e&Ss)return"Retry";if(e&Au)return"SelectiveHydration";if(e&Lu)return"IdleHydration";if(e&wi)return"Idle";if(e&qn)return"Offscreen"}}var at=-1,Es=_u,Rs=go;function Mu(e){switch(Oi(e)){case ve:return ve;case mo:return mo;case ya:return ya;case Di:return Di;case Gr:return Gr;case Ou:return Ou;case _u:case td:case nd:case rd:case ad:case id:case od:case ud:case ld:case sd:case cd:case fd:case dd:case pd:case vd:case hd:return e&yo;case go:case md:case yd:case gd:case bd:return e&Ss;case Au:return Au;case Lu:return Lu;case wi:return wi;case qn:return qn;default:return f("Should have found matching lanes. This is a bug in React."),e}}function Cs(e,t){var n=e.pendingLanes;if(n===H)return H;var r=H,a=e.suspendedLanes,i=e.pingedLanes,o=n&km;if(o!==H){var u=o&~a;if(u!==H)r=Mu(u);else{var c=o&i;c!==H&&(r=Mu(c))}}else{var h=n&~a;h!==H?r=Mu(h):i!==H&&(r=Mu(i))}if(r===H)return H;if(t!==H&&t!==r&&(t&a)===H){var m=Oi(r),R=Oi(t);if(m>=R||m===Gr&&(R&yo)!==H)return t}(r&ya)!==H&&(r|=n&Gr);var E=e.entangledLanes;if(E!==H)for(var x=e.entanglements,w=r&E;w>0;){var A=_i(w),I=1<<A;r|=x[A],w&=~I}return r}function kC(e,t){for(var n=e.eventTimes,r=at;t>0;){var a=_i(t),i=1<<a,o=n[a];o>r&&(r=o),t&=~i}return r}function zC(e,t){switch(e){case ve:case mo:case ya:return t+250;case Di:case Gr:case Ou:case _u:case td:case nd:case rd:case ad:case id:case od:case ud:case ld:case sd:case cd:case fd:case dd:case pd:case vd:case hd:return t+5e3;case go:case md:case yd:case gd:case bd:return at;case Au:case Lu:case wi:case qn:return at;default:return f("Should have found matching lanes. This is a bug in React."),at}}function FC(e,t){for(var n=e.pendingLanes,r=e.suspendedLanes,a=e.pingedLanes,i=e.expirationTimes,o=n;o>0;){var u=_i(o),c=1<<u,h=i[u];h===at?((c&r)===H||(c&a)!==H)&&(i[u]=zC(c,t)):h<=t&&(e.expiredLanes|=c),o&=~c}}function HC(e){return Mu(e.pendingLanes)}function Sd(e){var t=e.pendingLanes&~qn;return t!==H?t:t&qn?qn:H}function jC(e){return(e&ve)!==H}function Ed(e){return(e&km)!==H}function zm(e){return(e&Ss)===e}function VC(e){var t=ve|ya|Gr;return(e&t)===H}function BC(e){return(e&yo)===e}function Ts(e,t){var n=mo|ya|Di|Gr;return(t&n)!==H}function PC(e,t){return(t&e.expiredLanes)!==H}function Fm(e){return(e&yo)!==H}function Hm(){var e=Es;return Es<<=1,(Es&yo)===H&&(Es=_u),e}function $C(){var e=Rs;return Rs<<=1,(Rs&Ss)===H&&(Rs=go),e}function Oi(e){return e&-e}function Uu(e){return Oi(e)}function _i(e){return 31-Um(e)}function Rd(e){return _i(e)}function Gn(e,t){return(e&t)!==H}function bo(e,t){return(e&t)===t}function Ee(e,t){return e|t}function xs(e,t){return e&~t}function jm(e,t){return e&t}function WL(e){return e}function YC(e,t){return e!==Yt&&e<t?e:t}function Cd(e){for(var t=[],n=0;n<ed;n++)t.push(e);return t}function Nu(e,t,n){e.pendingLanes|=t,t!==wi&&(e.suspendedLanes=H,e.pingedLanes=H);var r=e.eventTimes,a=Rd(t);r[a]=n}function qC(e,t){e.suspendedLanes|=t,e.pingedLanes&=~t;for(var n=e.expirationTimes,r=t;r>0;){var a=_i(r),i=1<<a;n[a]=at,r&=~i}}function Vm(e,t,n){e.pingedLanes|=e.suspendedLanes&t}function GC(e,t){var n=e.pendingLanes&~t;e.pendingLanes=t,e.suspendedLanes=H,e.pingedLanes=H,e.expiredLanes&=t,e.mutableReadLanes&=t,e.entangledLanes&=t;for(var r=e.entanglements,a=e.eventTimes,i=e.expirationTimes,o=n;o>0;){var u=_i(o),c=1<<u;r[u]=H,a[u]=at,i[u]=at,o&=~c}}function Td(e,t){for(var n=e.entangledLanes|=t,r=e.entanglements,a=n;a;){var i=_i(a),o=1<<i;o&t|r[i]&t&&(r[i]|=t),a&=~o}}function IC(e,t){var n=Oi(t),r;switch(n){case ya:r=mo;break;case Gr:r=Di;break;case _u:case td:case nd:case rd:case ad:case id:case od:case ud:case ld:case sd:case cd:case fd:case dd:case pd:case vd:case hd:case go:case md:case yd:case gd:case bd:r=Ou;break;case wi:r=Lu;break;default:r=Yt;break}return(r&(e.suspendedLanes|t))!==Yt?Yt:r}function Bm(e,t,n){if(Tr)for(var r=e.pendingUpdatersLaneMap;n>0;){var a=Rd(n),i=1<<a,o=r[a];o.add(t),n&=~i}}function Pm(e,t){if(Tr)for(var n=e.pendingUpdatersLaneMap,r=e.memoizedUpdaters;t>0;){var a=Rd(t),i=1<<a,o=n[a];o.size>0&&(o.forEach(function(u){var c=u.alternate;(c===null||!r.has(c))&&r.add(u)}),o.clear()),t&=~i}}function $m(e,t){return null}var In=ve,ga=ya,ba=Gr,Ds=wi,ku=Yt;function xr(){return ku}function qt(e){ku=e}function WC(e,t){var n=ku;try{return ku=e,t()}finally{ku=n}}function QC(e,t){return e!==0&&e<t?e:t}function XC(e,t){return e>t?e:t}function xd(e,t){return e!==0&&e<t}function Ym(e){var t=Oi(e);return xd(In,t)?xd(ga,t)?Ed(t)?ba:Ds:ga:In}function ws(e){var t=e.current.memoizedState;return t.isDehydrated}var qm;function KC(e){qm=e}function JC(e){qm(e)}var Dd;function ZC(e){Dd=e}var Gm;function eT(e){Gm=e}var Im;function tT(e){Im=e}var Wm;function nT(e){Wm=e}var wd=!1,Os=[],Pa=null,$a=null,Ya=null,zu=new Map,Fu=new Map,qa=[],rT=["mousedown","mouseup","touchcancel","touchend","touchstart","auxclick","dblclick","pointercancel","pointerdown","pointerup","dragend","dragstart","drop","compositionend","compositionstart","keydown","keypress","keyup","input","textInput","copy","cut","paste","click","change","contextmenu","reset","submit"];function aT(e){return rT.indexOf(e)>-1}function iT(e,t,n,r,a){return{blockedOn:e,domEventName:t,eventSystemFlags:n,nativeEvent:a,targetContainers:[r]}}function Qm(e,t){switch(e){case"focusin":case"focusout":Pa=null;break;case"dragenter":case"dragleave":$a=null;break;case"mouseover":case"mouseout":Ya=null;break;case"pointerover":case"pointerout":{var n=t.pointerId;zu.delete(n);break}case"gotpointercapture":case"lostpointercapture":{var r=t.pointerId;Fu.delete(r);break}}}function Hu(e,t,n,r,a,i){if(e===null||e.nativeEvent!==i){var o=iT(t,n,r,a,i);if(t!==null){var u=Wa(t);u!==null&&Dd(u)}return o}e.eventSystemFlags|=r;var c=e.targetContainers;return a!==null&&c.indexOf(a)===-1&&c.push(a),e}function oT(e,t,n,r,a){switch(t){case"focusin":{var i=a;return Pa=Hu(Pa,e,t,n,r,i),!0}case"dragenter":{var o=a;return $a=Hu($a,e,t,n,r,o),!0}case"mouseover":{var u=a;return Ya=Hu(Ya,e,t,n,r,u),!0}case"pointerover":{var c=a,h=c.pointerId;return zu.set(h,Hu(zu.get(h)||null,e,t,n,r,c)),!0}case"gotpointercapture":{var m=a,R=m.pointerId;return Fu.set(R,Hu(Fu.get(R)||null,e,t,n,r,m)),!0}}return!1}function Xm(e){var t=Mi(e.target);if(t!==null){var n=Ti(t);if(n!==null){var r=n.tag;if(r===de){var a=Sm(n);if(a!==null){e.blockedOn=a,Wm(e.priority,function(){Gm(n)});return}}else if(r===F){var i=n.stateNode;if(ws(i)){e.blockedOn=Em(n);return}}}}e.blockedOn=null}function uT(e){for(var t=Im(),n={blockedOn:null,target:e,priority:t},r=0;r<qa.length&&xd(t,qa[r].priority);r++);qa.splice(r,0,n),r===0&&Xm(n)}function _s(e){if(e.blockedOn!==null)return!1;for(var t=e.targetContainers;t.length>0;){var n=t[0],r=Ad(e.domEventName,e.eventSystemFlags,n,e.nativeEvent);if(r===null){var a=e.nativeEvent,i=new a.constructor(a.type,a);UR(i),a.target.dispatchEvent(i),NR()}else{var o=Wa(r);return o!==null&&Dd(o),e.blockedOn=r,!1}t.shift()}return!0}function Km(e,t,n){_s(e)&&n.delete(t)}function lT(){wd=!1,Pa!==null&&_s(Pa)&&(Pa=null),$a!==null&&_s($a)&&($a=null),Ya!==null&&_s(Ya)&&(Ya=null),zu.forEach(Km),Fu.forEach(Km)}function ju(e,t){e.blockedOn===t&&(e.blockedOn=null,wd||(wd=!0,s.unstable_scheduleCallback(s.unstable_NormalPriority,lT)))}function Vu(e){if(Os.length>0){ju(Os[0],e);for(var t=1;t<Os.length;t++){var n=Os[t];n.blockedOn===e&&(n.blockedOn=null)}}Pa!==null&&ju(Pa,e),$a!==null&&ju($a,e),Ya!==null&&ju(Ya,e);var r=function(u){return ju(u,e)};zu.forEach(r),Fu.forEach(r);for(var a=0;a<qa.length;a++){var i=qa[a];i.blockedOn===e&&(i.blockedOn=null)}for(;qa.length>0;){var o=qa[0];if(o.blockedOn!==null)break;Xm(o),o.blockedOn===null&&qa.shift()}}var So=p.ReactCurrentBatchConfig,Od=!0;function Jm(e){Od=!!e}function sT(){return Od}function cT(e,t,n){var r=Zm(t),a;switch(r){case In:a=fT;break;case ga:a=dT;break;case ba:default:a=_d;break}return a.bind(null,t,n,e)}function fT(e,t,n,r){var a=xr(),i=So.transition;So.transition=null;try{qt(In),_d(e,t,n,r)}finally{qt(a),So.transition=i}}function dT(e,t,n,r){var a=xr(),i=So.transition;So.transition=null;try{qt(ga),_d(e,t,n,r)}finally{qt(a),So.transition=i}}function _d(e,t,n,r){Od&&pT(e,t,n,r)}function pT(e,t,n,r){var a=Ad(e,t,n,r);if(a===null){Yd(e,t,r,As,n),Qm(e,r);return}if(oT(a,e,t,n,r)){r.stopPropagation();return}if(Qm(e,r),t&Su&&aT(e)){for(;a!==null;){var i=Wa(a);i!==null&&JC(i);var o=Ad(e,t,n,r);if(o===null&&Yd(e,t,r,As,n),o===a)break;a=o}a!==null&&r.stopPropagation();return}Yd(e,t,r,null,n)}var As=null;function Ad(e,t,n,r){As=null;var a=Ff(r),i=Mi(a);if(i!==null){var o=Ti(i);if(o===null)i=null;else{var u=o.tag;if(u===de){var c=Sm(o);if(c!==null)return c;i=null}else if(u===F){var h=o.stateNode;if(ws(h))return Em(o);i=null}else o!==i&&(i=null)}}return As=i,null}function Zm(e){switch(e){case"cancel":case"click":case"close":case"contextmenu":case"copy":case"cut":case"auxclick":case"dblclick":case"dragend":case"dragstart":case"drop":case"focusin":case"focusout":case"input":case"invalid":case"keydown":case"keypress":case"keyup":case"mousedown":case"mouseup":case"paste":case"pause":case"play":case"pointercancel":case"pointerdown":case"pointerup":case"ratechange":case"reset":case"resize":case"seeked":case"submit":case"touchcancel":case"touchend":case"touchstart":case"volumechange":case"change":case"selectionchange":case"textInput":case"compositionstart":case"compositionend":case"compositionupdate":case"beforeblur":case"afterblur":case"beforeinput":case"blur":case"fullscreenchange":case"focus":case"hashchange":case"popstate":case"select":case"selectstart":return In;case"drag":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"mousemove":case"mouseout":case"mouseover":case"pointermove":case"pointerout":case"pointerover":case"scroll":case"toggle":case"touchmove":case"wheel":case"mouseenter":case"mouseleave":case"pointerenter":case"pointerleave":return ga;case"message":{var t=aC();switch(t){case bs:return In;case Kf:return ga;case xi:case iC:return ba;case Jf:return Ds;default:return ba}}default:return ba}}function vT(e,t,n){return e.addEventListener(t,n,!1),n}function hT(e,t,n){return e.addEventListener(t,n,!0),n}function mT(e,t,n,r){return e.addEventListener(t,n,{capture:!0,passive:r}),n}function yT(e,t,n,r){return e.addEventListener(t,n,{passive:r}),n}var Bu=null,Ld=null,Pu=null;function gT(e){return Bu=e,Ld=ty(),!0}function bT(){Bu=null,Ld=null,Pu=null}function ey(){if(Pu)return Pu;var e,t=Ld,n=t.length,r,a=ty(),i=a.length;for(e=0;e<n&&t[e]===a[e];e++);var o=n-e;for(r=1;r<=o&&t[n-r]===a[i-r];r++);var u=r>1?1-r:void 0;return Pu=a.slice(e,u),Pu}function ty(){return"value"in Bu?Bu.value:Bu.textContent}function Ls(e){var t,n=e.keyCode;return"charCode"in e?(t=e.charCode,t===0&&n===13&&(t=13)):t=n,t===10&&(t=13),t>=32||t===13?t:0}function Ms(){return!0}function ny(){return!1}function Wn(e){function t(n,r,a,i,o){this._reactName=n,this._targetInst=a,this.type=r,this.nativeEvent=i,this.target=o,this.currentTarget=null;for(var u in e)if(e.hasOwnProperty(u)){var c=e[u];c?this[u]=c(i):this[u]=i[u]}var h=i.defaultPrevented!=null?i.defaultPrevented:i.returnValue===!1;return h?this.isDefaultPrevented=Ms:this.isDefaultPrevented=ny,this.isPropagationStopped=ny,this}return _e(t.prototype,{preventDefault:function(){this.defaultPrevented=!0;var n=this.nativeEvent;n&&(n.preventDefault?n.preventDefault():typeof n.returnValue!="unknown"&&(n.returnValue=!1),this.isDefaultPrevented=Ms)},stopPropagation:function(){var n=this.nativeEvent;n&&(n.stopPropagation?n.stopPropagation():typeof n.cancelBubble!="unknown"&&(n.cancelBubble=!0),this.isPropagationStopped=Ms)},persist:function(){},isPersistent:Ms}),t}var Eo={eventPhase:0,bubbles:0,cancelable:0,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:0,isTrusted:0},Md=Wn(Eo),$u=_e({},Eo,{view:0,detail:0}),ST=Wn($u),Ud,Nd,Yu;function ET(e){e!==Yu&&(Yu&&e.type==="mousemove"?(Ud=e.screenX-Yu.screenX,Nd=e.screenY-Yu.screenY):(Ud=0,Nd=0),Yu=e)}var Us=_e({},$u,{screenX:0,screenY:0,clientX:0,clientY:0,pageX:0,pageY:0,ctrlKey:0,shiftKey:0,altKey:0,metaKey:0,getModifierState:zd,button:0,buttons:0,relatedTarget:function(e){return e.relatedTarget===void 0?e.fromElement===e.srcElement?e.toElement:e.fromElement:e.relatedTarget},movementX:function(e){return"movementX"in e?e.movementX:(ET(e),Ud)},movementY:function(e){return"movementY"in e?e.movementY:Nd}}),ry=Wn(Us),RT=_e({},Us,{dataTransfer:0}),CT=Wn(RT),TT=_e({},$u,{relatedTarget:0}),kd=Wn(TT),xT=_e({},Eo,{animationName:0,elapsedTime:0,pseudoElement:0}),DT=Wn(xT),wT=_e({},Eo,{clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}}),OT=Wn(wT),_T=_e({},Eo,{data:0}),ay=Wn(_T),AT=ay,LT={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},MT={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};function UT(e){if(e.key){var t=LT[e.key]||e.key;if(t!=="Unidentified")return t}if(e.type==="keypress"){var n=Ls(e);return n===13?"Enter":String.fromCharCode(n)}return e.type==="keydown"||e.type==="keyup"?MT[e.keyCode]||"Unidentified":""}var NT={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};function kT(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=NT[e];return r?!!n[r]:!1}function zd(e){return kT}var zT=_e({},$u,{key:UT,code:0,location:0,ctrlKey:0,shiftKey:0,altKey:0,metaKey:0,repeat:0,locale:0,getModifierState:zd,charCode:function(e){return e.type==="keypress"?Ls(e):0},keyCode:function(e){return e.type==="keydown"||e.type==="keyup"?e.keyCode:0},which:function(e){return e.type==="keypress"?Ls(e):e.type==="keydown"||e.type==="keyup"?e.keyCode:0}}),FT=Wn(zT),HT=_e({},Us,{pointerId:0,width:0,height:0,pressure:0,tangentialPressure:0,tiltX:0,tiltY:0,twist:0,pointerType:0,isPrimary:0}),iy=Wn(HT),jT=_e({},$u,{touches:0,targetTouches:0,changedTouches:0,altKey:0,metaKey:0,ctrlKey:0,shiftKey:0,getModifierState:zd}),VT=Wn(jT),BT=_e({},Eo,{propertyName:0,elapsedTime:0,pseudoElement:0}),PT=Wn(BT),$T=_e({},Us,{deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:0,deltaMode:0}),YT=Wn($T),qT=[9,13,27,32],oy=229,Fd=Ct&&"CompositionEvent"in window,qu=null;Ct&&"documentMode"in document&&(qu=document.documentMode);var GT=Ct&&"TextEvent"in window&&!qu,uy=Ct&&(!Fd||qu&&qu>8&&qu<=11),ly=32,sy=String.fromCharCode(ly);function IT(){jn("onBeforeInput",["compositionend","keypress","textInput","paste"]),jn("onCompositionEnd",["compositionend","focusout","keydown","keypress","keyup","mousedown"]),jn("onCompositionStart",["compositionstart","focusout","keydown","keypress","keyup","mousedown"]),jn("onCompositionUpdate",["compositionupdate","focusout","keydown","keypress","keyup","mousedown"])}var cy=!1;function WT(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function QT(e){switch(e){case"compositionstart":return"onCompositionStart";case"compositionend":return"onCompositionEnd";case"compositionupdate":return"onCompositionUpdate"}}function XT(e,t){return e==="keydown"&&t.keyCode===oy}function fy(e,t){switch(e){case"keyup":return qT.indexOf(t.keyCode)!==-1;case"keydown":return t.keyCode!==oy;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function dy(e){var t=e.detail;return typeof t=="object"&&"data"in t?t.data:null}function py(e){return e.locale==="ko"}var Ro=!1;function KT(e,t,n,r,a){var i,o;if(Fd?i=QT(t):Ro?fy(t,r)&&(i="onCompositionEnd"):XT(t,r)&&(i="onCompositionStart"),!i)return null;uy&&!py(r)&&(!Ro&&i==="onCompositionStart"?Ro=gT(a):i==="onCompositionEnd"&&Ro&&(o=ey()));var u=Hs(n,i);if(u.length>0){var c=new ay(i,t,null,r,a);if(e.push({event:c,listeners:u}),o)c.data=o;else{var h=dy(r);h!==null&&(c.data=h)}}}function JT(e,t){switch(e){case"compositionend":return dy(t);case"keypress":var n=t.which;return n!==ly?null:(cy=!0,sy);case"textInput":var r=t.data;return r===sy&&cy?null:r;default:return null}}function ZT(e,t){if(Ro){if(e==="compositionend"||!Fd&&fy(e,t)){var n=ey();return bT(),Ro=!1,n}return null}switch(e){case"paste":return null;case"keypress":if(!WT(t)){if(t.char&&t.char.length>1)return t.char;if(t.which)return String.fromCharCode(t.which)}return null;case"compositionend":return uy&&!py(t)?null:t.data;default:return null}}function ex(e,t,n,r,a){var i;if(GT?i=JT(t,r):i=ZT(t,r),!i)return null;var o=Hs(n,"onBeforeInput");if(o.length>0){var u=new AT("onBeforeInput","beforeinput",null,r,a);e.push({event:u,listeners:o}),u.data=i}}function tx(e,t,n,r,a,i,o){KT(e,t,n,r,a),ex(e,t,n,r,a)}var nx={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};function vy(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t==="input"?!!nx[e.type]:t==="textarea"}/**
+ * Checks if an event is supported in the current execution environment.
+ *
+ * NOTE: This will not work correctly for non-generic events such as `change`,
+ * `reset`, `load`, `error`, and `select`.
+ *
+ * Borrows from Modernizr.
+ *
+ * @param {string} eventNameSuffix Event name, e.g. "click".
+ * @return {boolean} True if the event is supported.
+ * @internal
+ * @license Modernizr 3.0.0pre (Custom Build) | MIT
+ */function rx(e){if(!Ct)return!1;var t="on"+e,n=t in document;if(!n){var r=document.createElement("div");r.setAttribute(t,"return;"),n=typeof r[t]=="function"}return n}function ax(){jn("onChange",["change","click","focusin","focusout","input","keydown","keyup","selectionchange"])}function hy(e,t,n,r){dm(r);var a=Hs(t,"onChange");if(a.length>0){var i=new Md("onChange","change",null,n,r);e.push({event:i,listeners:a})}}var Gu=null,Iu=null;function ix(e){var t=e.nodeName&&e.nodeName.toLowerCase();return t==="select"||t==="input"&&e.type==="file"}function ox(e){var t=[];hy(t,Iu,e,Ff(e)),mm(ux,t)}function ux(e){Uy(e,0)}function Ns(e){var t=Oo(e);if(no(t))return e}function lx(e,t){if(e==="change")return t}var my=!1;Ct&&(my=rx("input")&&(!document.documentMode||document.documentMode>9));function sx(e,t){Gu=e,Iu=t,Gu.attachEvent("onpropertychange",gy)}function yy(){Gu&&(Gu.detachEvent("onpropertychange",gy),Gu=null,Iu=null)}function gy(e){e.propertyName==="value"&&Ns(Iu)&&ox(e)}function cx(e,t,n){e==="focusin"?(yy(),sx(t,n)):e==="focusout"&&yy()}function fx(e,t){if(e==="selectionchange"||e==="keyup"||e==="keydown")return Ns(Iu)}function dx(e){var t=e.nodeName;return t&&t.toLowerCase()==="input"&&(e.type==="checkbox"||e.type==="radio")}function px(e,t){if(e==="click")return Ns(t)}function vx(e,t){if(e==="input"||e==="change")return Ns(t)}function hx(e){var t=e._wrapperState;!t||!t.controlled||e.type!=="number"||pe(e,"number",e.value)}function mx(e,t,n,r,a,i,o){var u=n?Oo(n):window,c,h;if(ix(u)?c=lx:vy(u)?my?c=vx:(c=fx,h=cx):dx(u)&&(c=px),c){var m=c(t,n);if(m){hy(e,m,r,a);return}}h&&h(t,u,n),t==="focusout"&&hx(u)}function yx(){Vn("onMouseEnter",["mouseout","mouseover"]),Vn("onMouseLeave",["mouseout","mouseover"]),Vn("onPointerEnter",["pointerout","pointerover"]),Vn("onPointerLeave",["pointerout","pointerover"])}function gx(e,t,n,r,a,i,o){var u=t==="mouseover"||t==="pointerover",c=t==="mouseout"||t==="pointerout";if(u&&!kR(r)){var h=r.relatedTarget||r.fromElement;if(h&&(Mi(h)||ll(h)))return}if(!(!c&&!u)){var m;if(a.window===a)m=a;else{var R=a.ownerDocument;R?m=R.defaultView||R.parentWindow:m=window}var E,x;if(c){var w=r.relatedTarget||r.toElement;if(E=n,x=w?Mi(w):null,x!==null){var A=Ti(x);(x!==A||x.tag!==$&&x.tag!==B)&&(x=null)}}else E=null,x=n;if(E!==x){var I=ry,ae="onMouseLeave",te="onMouseEnter",Ne="mouse";(t==="pointerout"||t==="pointerover")&&(I=iy,ae="onPointerLeave",te="onPointerEnter",Ne="pointer");var Oe=E==null?m:Oo(E),C=x==null?m:Oo(x),L=new I(ae,Ne+"leave",E,r,a);L.target=Oe,L.relatedTarget=C;var T=null,V=Mi(a);if(V===n){var K=new I(te,Ne+"enter",x,r,a);K.target=C,K.relatedTarget=Oe,T=K}Px(e,L,T,E,x)}}}function bx(e,t){return e===t&&(e!==0||1/e===1/t)||e!==e&&t!==t}var Qn=typeof Object.is=="function"?Object.is:bx;function Wu(e,t){if(Qn(e,t))return!0;if(typeof e!="object"||e===null||typeof t!="object"||t===null)return!1;var n=Object.keys(e),r=Object.keys(t);if(n.length!==r.length)return!1;for(var a=0;a<n.length;a++){var i=n[a];if(!an.call(t,i)||!Qn(e[i],t[i]))return!1}return!0}function by(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function Sx(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function Sy(e,t){for(var n=by(e),r=0,a=0;n;){if(n.nodeType===fa){if(a=r+n.textContent.length,r<=t&&a>=t)return{node:n,offset:t-r};r=a}n=by(Sx(n))}}function Ex(e){var t=e.ownerDocument,n=t&&t.defaultView||window,r=n.getSelection&&n.getSelection();if(!r||r.rangeCount===0)return null;var a=r.anchorNode,i=r.anchorOffset,o=r.focusNode,u=r.focusOffset;try{a.nodeType,o.nodeType}catch{return null}return Rx(e,a,i,o,u)}function Rx(e,t,n,r,a){var i=0,o=-1,u=-1,c=0,h=0,m=e,R=null;e:for(;;){for(var E=null;m===t&&(n===0||m.nodeType===fa)&&(o=i+n),m===r&&(a===0||m.nodeType===fa)&&(u=i+a),m.nodeType===fa&&(i+=m.nodeValue.length),(E=m.firstChild)!==null;)R=m,m=E;for(;;){if(m===e)break e;if(R===t&&++c===n&&(o=i),R===r&&++h===a&&(u=i),(E=m.nextSibling)!==null)break;m=R,R=m.parentNode}m=E}return o===-1||u===-1?null:{start:o,end:u}}function Cx(e,t){var n=e.ownerDocument||document,r=n&&n.defaultView||window;if(r.getSelection){var a=r.getSelection(),i=e.textContent.length,o=Math.min(t.start,i),u=t.end===void 0?o:Math.min(t.end,i);if(!a.extend&&o>u){var c=u;u=o,o=c}var h=Sy(e,o),m=Sy(e,u);if(h&&m){if(a.rangeCount===1&&a.anchorNode===h.node&&a.anchorOffset===h.offset&&a.focusNode===m.node&&a.focusOffset===m.offset)return;var R=n.createRange();R.setStart(h.node,h.offset),a.removeAllRanges(),o>u?(a.addRange(R),a.extend(m.node,m.offset)):(R.setEnd(m.node,m.offset),a.addRange(R))}}}function Ey(e){return e&&e.nodeType===fa}function Ry(e,t){return!e||!t?!1:e===t?!0:Ey(e)?!1:Ey(t)?Ry(e,t.parentNode):"contains"in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1}function Tx(e){return e&&e.ownerDocument&&Ry(e.ownerDocument.documentElement,e)}function xx(e){try{return typeof e.contentWindow.location.href=="string"}catch{return!1}}function Cy(){for(var e=window,t=ja();t instanceof e.HTMLIFrameElement;){if(xx(t))e=t.contentWindow;else return t;t=ja(e.document)}return t}function Hd(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t==="input"&&(e.type==="text"||e.type==="search"||e.type==="tel"||e.type==="url"||e.type==="password")||t==="textarea"||e.contentEditable==="true")}function Dx(){var e=Cy();return{focusedElem:e,selectionRange:Hd(e)?Ox(e):null}}function wx(e){var t=Cy(),n=e.focusedElem,r=e.selectionRange;if(t!==n&&Tx(n)){r!==null&&Hd(n)&&_x(n,r);for(var a=[],i=n;i=i.parentNode;)i.nodeType===_n&&a.push({element:i,left:i.scrollLeft,top:i.scrollTop});typeof n.focus=="function"&&n.focus();for(var o=0;o<a.length;o++){var u=a[o];u.element.scrollLeft=u.left,u.element.scrollTop=u.top}}}function Ox(e){var t;return"selectionStart"in e?t={start:e.selectionStart,end:e.selectionEnd}:t=Ex(e),t||{start:0,end:0}}function _x(e,t){var n=t.start,r=t.end;r===void 0&&(r=n),"selectionStart"in e?(e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length)):Cx(e,t)}var Ax=Ct&&"documentMode"in document&&document.documentMode<=11;function Lx(){jn("onSelect",["focusout","contextmenu","dragend","focusin","keydown","keyup","mousedown","mouseup","selectionchange"])}var Co=null,jd=null,Qu=null,Vd=!1;function Mx(e){if("selectionStart"in e&&Hd(e))return{start:e.selectionStart,end:e.selectionEnd};var t=e.ownerDocument&&e.ownerDocument.defaultView||window,n=t.getSelection();return{anchorNode:n.anchorNode,anchorOffset:n.anchorOffset,focusNode:n.focusNode,focusOffset:n.focusOffset}}function Ux(e){return e.window===e?e.document:e.nodeType===da?e:e.ownerDocument}function Ty(e,t,n){var r=Ux(n);if(!(Vd||Co==null||Co!==ja(r))){var a=Mx(Co);if(!Qu||!Wu(Qu,a)){Qu=a;var i=Hs(jd,"onSelect");if(i.length>0){var o=new Md("onSelect","select",null,t,n);e.push({event:o,listeners:i}),o.target=Co}}}}function Nx(e,t,n,r,a,i,o){var u=n?Oo(n):window;switch(t){case"focusin":(vy(u)||u.contentEditable==="true")&&(Co=u,jd=n,Qu=null);break;case"focusout":Co=null,jd=null,Qu=null;break;case"mousedown":Vd=!0;break;case"contextmenu":case"mouseup":case"dragend":Vd=!1,Ty(e,r,a);break;case"selectionchange":if(Ax)break;case"keydown":case"keyup":Ty(e,r,a)}}function ks(e,t){var n={};return n[e.toLowerCase()]=t.toLowerCase(),n["Webkit"+e]="webkit"+t,n["Moz"+e]="moz"+t,n}var To={animationend:ks("Animation","AnimationEnd"),animationiteration:ks("Animation","AnimationIteration"),animationstart:ks("Animation","AnimationStart"),transitionend:ks("Transition","TransitionEnd")},Bd={},xy={};Ct&&(xy=document.createElement("div").style,"AnimationEvent"in window||(delete To.animationend.animation,delete To.animationiteration.animation,delete To.animationstart.animation),"TransitionEvent"in window||delete To.transitionend.transition);function zs(e){if(Bd[e])return Bd[e];if(!To[e])return e;var t=To[e];for(var n in t)if(t.hasOwnProperty(n)&&n in xy)return Bd[e]=t[n];return e}var Dy=zs("animationend"),wy=zs("animationiteration"),Oy=zs("animationstart"),_y=zs("transitionend"),Ay=new Map,Ly=["abort","auxClick","cancel","canPlay","canPlayThrough","click","close","contextMenu","copy","cut","drag","dragEnd","dragEnter","dragExit","dragLeave","dragOver","dragStart","drop","durationChange","emptied","encrypted","ended","error","gotPointerCapture","input","invalid","keyDown","keyPress","keyUp","load","loadedData","loadedMetadata","loadStart","lostPointerCapture","mouseDown","mouseMove","mouseOut","mouseOver","mouseUp","paste","pause","play","playing","pointerCancel","pointerDown","pointerMove","pointerOut","pointerOver","pointerUp","progress","rateChange","reset","resize","seeked","seeking","stalled","submit","suspend","timeUpdate","touchCancel","touchEnd","touchStart","volumeChange","scroll","toggle","touchMove","waiting","wheel"];function Ga(e,t){Ay.set(e,t),jn(t,[e])}function kx(){for(var e=0;e<Ly.length;e++){var t=Ly[e],n=t.toLowerCase(),r=t[0].toUpperCase()+t.slice(1);Ga(n,"on"+r)}Ga(Dy,"onAnimationEnd"),Ga(wy,"onAnimationIteration"),Ga(Oy,"onAnimationStart"),Ga("dblclick","onDoubleClick"),Ga("focusin","onFocus"),Ga("focusout","onBlur"),Ga(_y,"onTransitionEnd")}function zx(e,t,n,r,a,i,o){var u=Ay.get(t);if(u!==void 0){var c=Md,h=t;switch(t){case"keypress":if(Ls(r)===0)return;case"keydown":case"keyup":c=FT;break;case"focusin":h="focus",c=kd;break;case"focusout":h="blur",c=kd;break;case"beforeblur":case"afterblur":c=kd;break;case"click":if(r.button===2)return;case"auxclick":case"dblclick":case"mousedown":case"mousemove":case"mouseup":case"mouseout":case"mouseover":case"contextmenu":c=ry;break;case"drag":case"dragend":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"dragstart":case"drop":c=CT;break;case"touchcancel":case"touchend":case"touchmove":case"touchstart":c=VT;break;case Dy:case wy:case Oy:c=DT;break;case _y:c=PT;break;case"scroll":c=ST;break;case"wheel":c=YT;break;case"copy":case"cut":case"paste":c=OT;break;case"gotpointercapture":case"lostpointercapture":case"pointercancel":case"pointerdown":case"pointermove":case"pointerout":case"pointerover":case"pointerup":c=iy;break}var m=(i&Su)!==0;{var R=!m&&t==="scroll",E=Vx(n,u,r.type,m,R);if(E.length>0){var x=new c(u,h,null,r,a);e.push({event:x,listeners:E})}}}}kx(),yx(),ax(),Lx(),IT();function Fx(e,t,n,r,a,i,o){zx(e,t,n,r,a,i);var u=(i&MR)===0;u&&(gx(e,t,n,r,a),mx(e,t,n,r,a),Nx(e,t,n,r,a),tx(e,t,n,r,a))}var Xu=["abort","canplay","canplaythrough","durationchange","emptied","encrypted","ended","error","loadeddata","loadedmetadata","loadstart","pause","play","playing","progress","ratechange","resize","seeked","seeking","stalled","suspend","timeupdate","volumechange","waiting"],Pd=new Set(["cancel","close","invalid","load","scroll","toggle"].concat(Xu));function My(e,t,n){var r=e.type||"unknown-event";e.currentTarget=n,YR(r,t,void 0,e),e.currentTarget=null}function Hx(e,t,n){var r;if(n)for(var a=t.length-1;a>=0;a--){var i=t[a],o=i.instance,u=i.currentTarget,c=i.listener;if(o!==r&&e.isPropagationStopped())return;My(e,c,u),r=o}else for(var h=0;h<t.length;h++){var m=t[h],R=m.instance,E=m.currentTarget,x=m.listener;if(R!==r&&e.isPropagationStopped())return;My(e,x,E),r=R}}function Uy(e,t){for(var n=(t&Su)!==0,r=0;r<e.length;r++){var a=e[r],i=a.event,o=a.listeners;Hx(i,o,n)}qR()}function jx(e,t,n,r,a){var i=Ff(n),o=[];Fx(o,e,r,n,i,t),Uy(o,t)}function lt(e,t){Pd.has(e)||f('Did not expect a listenToNonDelegatedEvent() call for "%s". This is a bug in React. Please file an issue.',e);var n=!1,r=hw(t),a=$x(e);r.has(a)||(Ny(t,e,zf,n),r.add(a))}function $d(e,t,n){Pd.has(e)&&!t&&f('Did not expect a listenToNativeEvent() call for "%s" in the bubble phase. This is a bug in React. Please file an issue.',e);var r=0;t&&(r|=Su),Ny(n,e,r,t)}var Fs="_reactListening"+Math.random().toString(36).slice(2);function Ku(e){if(!e[Fs]){e[Fs]=!0,tr.forEach(function(n){n!=="selectionchange"&&(Pd.has(n)||$d(n,!1,e),$d(n,!0,e))});var t=e.nodeType===da?e:e.ownerDocument;t!==null&&(t[Fs]||(t[Fs]=!0,$d("selectionchange",!1,t)))}}function Ny(e,t,n,r,a){var i=cT(e,t,n),o=void 0;Vf&&(t==="touchstart"||t==="touchmove"||t==="wheel")&&(o=!0),e=e,r?o!==void 0?mT(e,t,i,o):hT(e,t,i):o!==void 0?yT(e,t,i,o):vT(e,t,i)}function ky(e,t){return e===t||e.nodeType===Tt&&e.parentNode===t}function Yd(e,t,n,r,a){var i=r;if(!(t&cm)&&!(t&zf)){var o=a;if(r!==null){var u=r;e:for(;;){if(u===null)return;var c=u.tag;if(c===F||c===ee){var h=u.stateNode.containerInfo;if(ky(h,o))break;if(c===ee)for(var m=u.return;m!==null;){var R=m.tag;if(R===F||R===ee){var E=m.stateNode.containerInfo;if(ky(E,o))return}m=m.return}for(;h!==null;){var x=Mi(h);if(x===null)return;var w=x.tag;if(w===$||w===B){u=i=x;continue e}h=h.parentNode}}u=u.return}}}mm(function(){return jx(e,t,n,i)})}function Ju(e,t,n){return{instance:e,listener:t,currentTarget:n}}function Vx(e,t,n,r,a,i){for(var o=t!==null?t+"Capture":null,u=r?o:t,c=[],h=e,m=null;h!==null;){var R=h,E=R.stateNode,x=R.tag;if(x===$&&E!==null&&(m=E,u!==null)){var w=Ru(h,u);w!=null&&c.push(Ju(h,w,m))}if(a)break;h=h.return}return c}function Hs(e,t){for(var n=t+"Capture",r=[],a=e;a!==null;){var i=a,o=i.stateNode,u=i.tag;if(u===$&&o!==null){var c=o,h=Ru(a,n);h!=null&&r.unshift(Ju(a,h,c));var m=Ru(a,t);m!=null&&r.push(Ju(a,m,c))}a=a.return}return r}function xo(e){if(e===null)return null;do e=e.return;while(e&&e.tag!==$);return e||null}function Bx(e,t){for(var n=e,r=t,a=0,i=n;i;i=xo(i))a++;for(var o=0,u=r;u;u=xo(u))o++;for(;a-o>0;)n=xo(n),a--;for(;o-a>0;)r=xo(r),o--;for(var c=a;c--;){if(n===r||r!==null&&n===r.alternate)return n;n=xo(n),r=xo(r)}return null}function zy(e,t,n,r,a){for(var i=t._reactName,o=[],u=n;u!==null&&u!==r;){var c=u,h=c.alternate,m=c.stateNode,R=c.tag;if(h!==null&&h===r)break;if(R===$&&m!==null){var E=m;if(a){var x=Ru(u,i);x!=null&&o.unshift(Ju(u,x,E))}else if(!a){var w=Ru(u,i);w!=null&&o.push(Ju(u,w,E))}}u=u.return}o.length!==0&&e.push({event:t,listeners:o})}function Px(e,t,n,r,a){var i=r&&a?Bx(r,a):null;r!==null&&zy(e,t,r,i,!1),a!==null&&n!==null&&zy(e,n,a,i,!0)}function $x(e,t){return e+"__bubble"}var An=!1,Zu="dangerouslySetInnerHTML",js="suppressContentEditableWarning",Ia="suppressHydrationWarning",Fy="autoFocus",Ai="children",Li="style",Vs="__html",qd,Bs,el,Hy,Ps,jy,Vy;qd={dialog:!0,webview:!0},Bs=function(e,t){xR(e,t),DR(e,t),LR(e,t,{registrationNameDependencies:Wt,possibleRegistrationNames:xn})},jy=Ct&&!document.documentMode,el=function(e,t,n){if(!An){var r=$s(n),a=$s(t);a!==r&&(An=!0,f("Prop `%s` did not match. Server: %s Client: %s",e,JSON.stringify(a),JSON.stringify(r)))}},Hy=function(e){if(!An){An=!0;var t=[];e.forEach(function(n){t.push(n)}),f("Extra attributes from the server: %s",t)}},Ps=function(e,t){t===!1?f("Expected `%s` listener to be a function, instead got `false`.\n\nIf you used to conditionally omit it with %s={condition && value}, pass %s={condition ? value : undefined} instead.",e,e,e):f("Expected `%s` listener to be a function, instead got a value of `%s` type.",e,typeof t)},Vy=function(e,t){var n=e.namespaceURI===ca?e.ownerDocument.createElement(e.tagName):e.ownerDocument.createElementNS(e.namespaceURI,e.tagName);return n.innerHTML=t,n.innerHTML};var Yx=/\r\n?/g,qx=/\u0000|\uFFFD/g;function $s(e){rr(e);var t=typeof e=="string"?e:""+e;return t.replace(Yx,`
+`).replace(qx,"")}function Ys(e,t,n,r){var a=$s(t),i=$s(e);if(i!==a&&(r&&(An||(An=!0,f('Text content did not match. Server: "%s" Client: "%s"',i,a))),n&&be))throw new Error("Text content does not match server-rendered HTML.")}function By(e){return e.nodeType===da?e:e.ownerDocument}function Gx(){}function qs(e){e.onclick=Gx}function Ix(e,t,n,r,a){for(var i in r)if(r.hasOwnProperty(i)){var o=r[i];if(i===Li)o&&Object.freeze(o),am(t,o);else if(i===Zu){var u=o?o[Vs]:void 0;u!=null&&Zh(t,u)}else if(i===Ai)if(typeof o=="string"){var c=e!=="textarea"||o!=="";c&&ps(t,o)}else typeof o=="number"&&ps(t,""+o);else i===js||i===Ia||i===Fy||(Wt.hasOwnProperty(i)?o!=null&&(typeof o!="function"&&Ps(i,o),i==="onScroll"&&lt("scroll",t)):o!=null&&oa(t,i,o,a))}}function Wx(e,t,n,r){for(var a=0;a<t.length;a+=2){var i=t[a],o=t[a+1];i===Li?am(e,o):i===Zu?Zh(e,o):i===Ai?ps(e,o):oa(e,i,o,r)}}function Qx(e,t,n,r){var a,i=By(n),o,u=r;if(u===ca&&(u=Af(e)),u===ca){if(a=bi(e,t),!a&&e!==e.toLowerCase()&&f("<%s /> is using incorrect casing. Use PascalCase for React components, or lowercase for HTML elements.",e),e==="script"){var c=i.createElement("div");c.innerHTML="<script><\/script>";var h=c.firstChild;o=c.removeChild(h)}else if(typeof t.is=="string")o=i.createElement(e,{is:t.is});else if(o=i.createElement(e),e==="select"){var m=o;t.multiple?m.multiple=!0:t.size&&(m.size=t.size)}}else o=i.createElementNS(u,e);return u===ca&&!a&&Object.prototype.toString.call(o)==="[object HTMLUnknownElement]"&&!an.call(qd,e)&&(qd[e]=!0,f("The tag <%s> is unrecognized in this browser. If you meant to render a React component, start its name with an uppercase letter.",e)),o}function Xx(e,t){return By(t).createTextNode(e)}function Kx(e,t,n,r){var a=bi(t,n);Bs(t,n);var i;switch(t){case"dialog":lt("cancel",e),lt("close",e),i=n;break;case"iframe":case"object":case"embed":lt("load",e),i=n;break;case"video":case"audio":for(var o=0;o<Xu.length;o++)lt(Xu[o],e);i=n;break;case"source":lt("error",e),i=n;break;case"img":case"image":case"link":lt("error",e),lt("load",e),i=n;break;case"details":lt("toggle",e),i=n;break;case"input":g(e,n),i=d(e,n),lt("invalid",e);break;case"option":tt(e,n),i=n;break;case"select":gu(e,n),i=yu(e,n),lt("invalid",e);break;case"textarea":Xh(e,n),i=Of(e,n),lt("invalid",e);break;default:i=n}switch(kf(t,i),Ix(t,e,r,i,a),t){case"input":la(e),P(e,n,!1);break;case"textarea":la(e),Jh(e);break;case"option":ut(e,n);break;case"select":wf(e,n);break;default:typeof i.onClick=="function"&&qs(e);break}}function Jx(e,t,n,r,a){Bs(t,r);var i=null,o,u;switch(t){case"input":o=d(e,n),u=d(e,r),i=[];break;case"select":o=yu(e,n),u=yu(e,r),i=[];break;case"textarea":o=Of(e,n),u=Of(e,r),i=[];break;default:o=n,u=r,typeof o.onClick!="function"&&typeof u.onClick=="function"&&qs(e);break}kf(t,u);var c,h,m=null;for(c in o)if(!(u.hasOwnProperty(c)||!o.hasOwnProperty(c)||o[c]==null))if(c===Li){var R=o[c];for(h in R)R.hasOwnProperty(h)&&(m||(m={}),m[h]="")}else c===Zu||c===Ai||c===js||c===Ia||c===Fy||(Wt.hasOwnProperty(c)?i||(i=[]):(i=i||[]).push(c,null));for(c in u){var E=u[c],x=o!=null?o[c]:void 0;if(!(!u.hasOwnProperty(c)||E===x||E==null&&x==null))if(c===Li)if(E&&Object.freeze(E),x){for(h in x)x.hasOwnProperty(h)&&(!E||!E.hasOwnProperty(h))&&(m||(m={}),m[h]="");for(h in E)E.hasOwnProperty(h)&&x[h]!==E[h]&&(m||(m={}),m[h]=E[h])}else m||(i||(i=[]),i.push(c,m)),m=E;else if(c===Zu){var w=E?E[Vs]:void 0,A=x?x[Vs]:void 0;w!=null&&A!==w&&(i=i||[]).push(c,w)}else c===Ai?(typeof E=="string"||typeof E=="number")&&(i=i||[]).push(c,""+E):c===js||c===Ia||(Wt.hasOwnProperty(c)?(E!=null&&(typeof E!="function"&&Ps(c,E),c==="onScroll"&&lt("scroll",e)),!i&&x!==E&&(i=[])):(i=i||[]).push(c,E))}return m&&(yR(m,u[Li]),(i=i||[]).push(Li,m)),i}function Zx(e,t,n,r,a){n==="input"&&a.type==="radio"&&a.name!=null&&D(e,a);var i=bi(n,r),o=bi(n,a);switch(Wx(e,t,i,o),n){case"input":O(e,a);break;case"textarea":Kh(e,a);break;case"select":WE(e,a);break}}function eD(e){{var t=e.toLowerCase();return vs.hasOwnProperty(t)&&vs[t]||null}}function tD(e,t,n,r,a,i,o){var u,c;switch(u=bi(t,n),Bs(t,n),t){case"dialog":lt("cancel",e),lt("close",e);break;case"iframe":case"object":case"embed":lt("load",e);break;case"video":case"audio":for(var h=0;h<Xu.length;h++)lt(Xu[h],e);break;case"source":lt("error",e);break;case"img":case"image":case"link":lt("error",e),lt("load",e);break;case"details":lt("toggle",e);break;case"input":g(e,n),lt("invalid",e);break;case"option":tt(e,n);break;case"select":gu(e,n),lt("invalid",e);break;case"textarea":Xh(e,n),lt("invalid",e);break}kf(t,n);{c=new Set;for(var m=e.attributes,R=0;R<m.length;R++){var E=m[R].name.toLowerCase();switch(E){case"value":break;case"checked":break;case"selected":break;default:c.add(m[R].name)}}}var x=null;for(var w in n)if(n.hasOwnProperty(w)){var A=n[w];if(w===Ai)typeof A=="string"?e.textContent!==A&&(n[Ia]!==!0&&Ys(e.textContent,A,i,o),x=[Ai,A]):typeof A=="number"&&e.textContent!==""+A&&(n[Ia]!==!0&&Ys(e.textContent,A,i,o),x=[Ai,""+A]);else if(Wt.hasOwnProperty(w))A!=null&&(typeof A!="function"&&Ps(w,A),w==="onScroll"&&lt("scroll",e));else if(o&&typeof u=="boolean"){var I=void 0,ae=u&&Tn?null:$n(w);if(n[Ia]!==!0){if(!(w===js||w===Ia||w==="value"||w==="checked"||w==="selected")){if(w===Zu){var te=e.innerHTML,Ne=A?A[Vs]:void 0;if(Ne!=null){var Oe=Vy(e,Ne);Oe!==te&&el(w,te,Oe)}}else if(w===Li){if(c.delete(w),jy){var C=hR(A);I=e.getAttribute("style"),C!==I&&el(w,I,C)}}else if(u&&!Tn)c.delete(w.toLowerCase()),I=Ma(e,w,A),A!==I&&el(w,I,A);else if(!St(w,ae,u)&&!Ze(w,A,ae,u)){var L=!1;if(ae!==null)c.delete(ae.attributeName),I=ia(e,w,A,ae);else{var T=r;if(T===ca&&(T=Af(t)),T===ca)c.delete(w.toLowerCase());else{var V=eD(w);V!==null&&V!==w&&(L=!0,c.delete(V)),c.delete(w)}I=Ma(e,w,A)}var K=Tn;!K&&A!==I&&!L&&el(w,I,A)}}}}}switch(o&&c.size>0&&n[Ia]!==!0&&Hy(c),t){case"input":la(e),P(e,n,!0);break;case"textarea":la(e),Jh(e);break;case"select":case"option":break;default:typeof n.onClick=="function"&&qs(e);break}return x}function nD(e,t,n){var r=e.nodeValue!==t;return r}function Gd(e,t){{if(An)return;An=!0,f("Did not expect server HTML to contain a <%s> in <%s>.",t.nodeName.toLowerCase(),e.nodeName.toLowerCase())}}function Id(e,t){{if(An)return;An=!0,f('Did not expect server HTML to contain the text node "%s" in <%s>.',t.nodeValue,e.nodeName.toLowerCase())}}function Wd(e,t,n){{if(An)return;An=!0,f("Expected server HTML to contain a matching <%s> in <%s>.",t,e.nodeName.toLowerCase())}}function Qd(e,t){{if(t===""||An)return;An=!0,f('Expected server HTML to contain a matching text node for "%s" in <%s>.',t,e.nodeName.toLowerCase())}}function rD(e,t,n){switch(t){case"input":le(e,n);return;case"textarea":XE(e,n);return;case"select":QE(e,n);return}}var tl=function(){},nl=function(){};{var aD=["address","applet","area","article","aside","base","basefont","bgsound","blockquote","body","br","button","caption","center","col","colgroup","dd","details","dir","div","dl","dt","embed","fieldset","figcaption","figure","footer","form","frame","frameset","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","iframe","img","input","isindex","li","link","listing","main","marquee","menu","menuitem","meta","nav","noembed","noframes","noscript","object","ol","p","param","plaintext","pre","script","section","select","source","style","summary","table","tbody","td","template","textarea","tfoot","th","thead","title","tr","track","ul","wbr","xmp"],Py=["applet","caption","html","table","td","th","marquee","object","template","foreignObject","desc","title"],iD=Py.concat(["button"]),oD=["dd","dt","li","option","optgroup","p","rp","rt"],$y={current:null,formTag:null,aTagInScope:null,buttonTagInScope:null,nobrTagInScope:null,pTagInButtonScope:null,listItemTagAutoclosing:null,dlItemTagAutoclosing:null};nl=function(e,t){var n=_e({},e||$y),r={tag:t};return Py.indexOf(t)!==-1&&(n.aTagInScope=null,n.buttonTagInScope=null,n.nobrTagInScope=null),iD.indexOf(t)!==-1&&(n.pTagInButtonScope=null),aD.indexOf(t)!==-1&&t!=="address"&&t!=="div"&&t!=="p"&&(n.listItemTagAutoclosing=null,n.dlItemTagAutoclosing=null),n.current=r,t==="form"&&(n.formTag=r),t==="a"&&(n.aTagInScope=r),t==="button"&&(n.buttonTagInScope=r),t==="nobr"&&(n.nobrTagInScope=r),t==="p"&&(n.pTagInButtonScope=r),t==="li"&&(n.listItemTagAutoclosing=r),(t==="dd"||t==="dt")&&(n.dlItemTagAutoclosing=r),n};var uD=function(e,t){switch(t){case"select":return e==="option"||e==="optgroup"||e==="#text";case"optgroup":return e==="option"||e==="#text";case"option":return e==="#text";case"tr":return e==="th"||e==="td"||e==="style"||e==="script"||e==="template";case"tbody":case"thead":case"tfoot":return e==="tr"||e==="style"||e==="script"||e==="template";case"colgroup":return e==="col"||e==="template";case"table":return e==="caption"||e==="colgroup"||e==="tbody"||e==="tfoot"||e==="thead"||e==="style"||e==="script"||e==="template";case"head":return e==="base"||e==="basefont"||e==="bgsound"||e==="link"||e==="meta"||e==="title"||e==="noscript"||e==="noframes"||e==="style"||e==="script"||e==="template";case"html":return e==="head"||e==="body"||e==="frameset";case"frameset":return e==="frame";case"#document":return e==="html"}switch(e){case"h1":case"h2":case"h3":case"h4":case"h5":case"h6":return t!=="h1"&&t!=="h2"&&t!=="h3"&&t!=="h4"&&t!=="h5"&&t!=="h6";case"rp":case"rt":return oD.indexOf(t)===-1;case"body":case"caption":case"col":case"colgroup":case"frameset":case"frame":case"head":case"html":case"tbody":case"td":case"tfoot":case"th":case"thead":case"tr":return t==null}return!0},lD=function(e,t){switch(e){case"address":case"article":case"aside":case"blockquote":case"center":case"details":case"dialog":case"dir":case"div":case"dl":case"fieldset":case"figcaption":case"figure":case"footer":case"header":case"hgroup":case"main":case"menu":case"nav":case"ol":case"p":case"section":case"summary":case"ul":case"pre":case"listing":case"table":case"hr":case"xmp":case"h1":case"h2":case"h3":case"h4":case"h5":case"h6":return t.pTagInButtonScope;case"form":return t.formTag||t.pTagInButtonScope;case"li":return t.listItemTagAutoclosing;case"dd":case"dt":return t.dlItemTagAutoclosing;case"button":return t.buttonTagInScope;case"a":return t.aTagInScope;case"nobr":return t.nobrTagInScope}return null},Yy={};tl=function(e,t,n){n=n||$y;var r=n.current,a=r&&r.tag;t!=null&&(e!=null&&f("validateDOMNesting: when childText is passed, childTag should be null"),e="#text");var i=uD(e,a)?null:r,o=i?null:lD(e,n),u=i||o;if(u){var c=u.tag,h=!!i+"|"+e+"|"+c;if(!Yy[h]){Yy[h]=!0;var m=e,R="";if(e==="#text"?/\S/.test(t)?m="Text nodes":(m="Whitespace text nodes",R=" Make sure you don't have any extra whitespace between tags on each line of your source code."):m="<"+e+">",i){var E="";c==="table"&&e==="tr"&&(E+=" Add a <tbody>, <thead> or <tfoot> to your code to match the DOM tree generated by the browser."),f("validateDOMNesting(...): %s cannot appear as a child of <%s>.%s%s",m,c,R,E)}else f("validateDOMNesting(...): %s cannot appear as a descendant of <%s>.",m,c)}}}}var Gs="suppressHydrationWarning",Is="$",Ws="/$",rl="$?",al="$!",sD="style",Xd=null,Kd=null;function cD(e){var t,n,r=e.nodeType;switch(r){case da:case Mf:{t=r===da?"#document":"#fragment";var a=e.documentElement;n=a?a.namespaceURI:Lf(null,"");break}default:{var i=r===Tt?e.parentNode:e,o=i.namespaceURI||null;t=i.tagName,n=Lf(o,t);break}}{var u=t.toLowerCase(),c=nl(null,u);return{namespace:n,ancestorInfo:c}}}function fD(e,t,n){{var r=e,a=Lf(r.namespace,t),i=nl(r.ancestorInfo,t);return{namespace:a,ancestorInfo:i}}}function QL(e){return e}function dD(e){Xd=sT(),Kd=Dx();var t=null;return Jm(!1),t}function pD(e){wx(Kd),Jm(Xd),Xd=null,Kd=null}function vD(e,t,n,r,a){var i;{var o=r;if(tl(e,null,o.ancestorInfo),typeof t.children=="string"||typeof t.children=="number"){var u=""+t.children,c=nl(o.ancestorInfo,e);tl(null,u,c)}i=o.namespace}var h=Qx(e,t,n,i);return ul(a,h),ip(h,t),h}function hD(e,t){e.appendChild(t)}function mD(e,t,n,r,a){switch(Kx(e,t,n,r),t){case"button":case"input":case"select":case"textarea":return!!n.autoFocus;case"img":return!0;default:return!1}}function yD(e,t,n,r,a,i){{var o=i;if(typeof r.children!=typeof n.children&&(typeof r.children=="string"||typeof r.children=="number")){var u=""+r.children,c=nl(o.ancestorInfo,t);tl(null,u,c)}}return Jx(e,t,n,r)}function Jd(e,t){return e==="textarea"||e==="noscript"||typeof t.children=="string"||typeof t.children=="number"||typeof t.dangerouslySetInnerHTML=="object"&&t.dangerouslySetInnerHTML!==null&&t.dangerouslySetInnerHTML.__html!=null}function gD(e,t,n,r){{var a=n;tl(null,e,a.ancestorInfo)}var i=Xx(e,t);return ul(r,i),i}function bD(){var e=window.event;return e===void 0?ba:Zm(e.type)}var Zd=typeof setTimeout=="function"?setTimeout:void 0,SD=typeof clearTimeout=="function"?clearTimeout:void 0,ep=-1,qy=typeof Promise=="function"?Promise:void 0,ED=typeof queueMicrotask=="function"?queueMicrotask:typeof qy<"u"?function(e){return qy.resolve(null).then(e).catch(RD)}:Zd;function RD(e){setTimeout(function(){throw e})}function CD(e,t,n,r){switch(t){case"button":case"input":case"select":case"textarea":n.autoFocus&&e.focus();return;case"img":{n.src&&(e.src=n.src);return}}}function TD(e,t,n,r,a,i){Zx(e,t,n,r,a),ip(e,a)}function Gy(e){ps(e,"")}function xD(e,t,n){e.nodeValue=n}function DD(e,t){e.appendChild(t)}function wD(e,t){var n;e.nodeType===Tt?(n=e.parentNode,n.insertBefore(t,e)):(n=e,n.appendChild(t));var r=e._reactRootContainer;r==null&&n.onclick===null&&qs(n)}function OD(e,t,n){e.insertBefore(t,n)}function _D(e,t,n){e.nodeType===Tt?e.parentNode.insertBefore(t,n):e.insertBefore(t,n)}function AD(e,t){e.removeChild(t)}function LD(e,t){e.nodeType===Tt?e.parentNode.removeChild(t):e.removeChild(t)}function tp(e,t){var n=t,r=0;do{var a=n.nextSibling;if(e.removeChild(n),a&&a.nodeType===Tt){var i=a.data;if(i===Ws)if(r===0){e.removeChild(a),Vu(t);return}else r--;else(i===Is||i===rl||i===al)&&r++}n=a}while(n);Vu(t)}function MD(e,t){e.nodeType===Tt?tp(e.parentNode,t):e.nodeType===_n&&tp(e,t),Vu(e)}function UD(e){e=e;var t=e.style;typeof t.setProperty=="function"?t.setProperty("display","none","important"):t.display="none"}function ND(e){e.nodeValue=""}function kD(e,t){e=e;var n=t[sD],r=n!=null&&n.hasOwnProperty("display")?n.display:null;e.style.display=Uf("display",r)}function zD(e,t){e.nodeValue=t}function FD(e){e.nodeType===_n?e.textContent="":e.nodeType===da&&e.documentElement&&e.removeChild(e.documentElement)}function HD(e,t,n){return e.nodeType!==_n||t.toLowerCase()!==e.nodeName.toLowerCase()?null:e}function jD(e,t){return t===""||e.nodeType!==fa?null:e}function VD(e){return e.nodeType!==Tt?null:e}function Iy(e){return e.data===rl}function np(e){return e.data===al}function BD(e){var t=e.nextSibling&&e.nextSibling.dataset,n,r,a;return t&&(n=t.dgst,r=t.msg,a=t.stck),{message:r,digest:n,stack:a}}function PD(e,t){e._reactRetry=t}function Qs(e){for(;e!=null;e=e.nextSibling){var t=e.nodeType;if(t===_n||t===fa)break;if(t===Tt){var n=e.data;if(n===Is||n===al||n===rl)break;if(n===Ws)return null}}return e}function il(e){return Qs(e.nextSibling)}function $D(e){return Qs(e.firstChild)}function YD(e){return Qs(e.firstChild)}function qD(e){return Qs(e.nextSibling)}function GD(e,t,n,r,a,i,o){ul(i,e),ip(e,n);var u;{var c=a;u=c.namespace}var h=(i.mode&Me)!==ie;return tD(e,t,n,u,r,h,o)}function ID(e,t,n,r){return ul(n,e),n.mode&Me,nD(e,t)}function WD(e,t){ul(t,e)}function QD(e){for(var t=e.nextSibling,n=0;t;){if(t.nodeType===Tt){var r=t.data;if(r===Ws){if(n===0)return il(t);n--}else(r===Is||r===al||r===rl)&&n++}t=t.nextSibling}return null}function Wy(e){for(var t=e.previousSibling,n=0;t;){if(t.nodeType===Tt){var r=t.data;if(r===Is||r===al||r===rl){if(n===0)return t;n--}else r===Ws&&n++}t=t.previousSibling}return null}function XD(e){Vu(e)}function KD(e){Vu(e)}function JD(e){return e!=="head"&&e!=="body"}function ZD(e,t,n,r){var a=!0;Ys(t.nodeValue,n,r,a)}function ew(e,t,n,r,a,i){if(t[Gs]!==!0){var o=!0;Ys(r.nodeValue,a,i,o)}}function tw(e,t){t.nodeType===_n?Gd(e,t):t.nodeType===Tt||Id(e,t)}function nw(e,t){{var n=e.parentNode;n!==null&&(t.nodeType===_n?Gd(n,t):t.nodeType===Tt||Id(n,t))}}function rw(e,t,n,r,a){(a||t[Gs]!==!0)&&(r.nodeType===_n?Gd(n,r):r.nodeType===Tt||Id(n,r))}function aw(e,t,n){Wd(e,t)}function iw(e,t){Qd(e,t)}function ow(e,t,n){{var r=e.parentNode;r!==null&&Wd(r,t)}}function uw(e,t){{var n=e.parentNode;n!==null&&Qd(n,t)}}function lw(e,t,n,r,a,i){(i||t[Gs]!==!0)&&Wd(n,r)}function sw(e,t,n,r,a){(a||t[Gs]!==!0)&&Qd(n,r)}function cw(e){f("An error occurred during hydration. The server HTML was replaced with client content in <%s>.",e.nodeName.toLowerCase())}function fw(e){Ku(e)}var Do=Math.random().toString(36).slice(2),wo="__reactFiber$"+Do,rp="__reactProps$"+Do,ol="__reactContainer$"+Do,ap="__reactEvents$"+Do,dw="__reactListeners$"+Do,pw="__reactHandles$"+Do;function vw(e){delete e[wo],delete e[rp],delete e[ap],delete e[dw],delete e[pw]}function ul(e,t){t[wo]=e}function Xs(e,t){t[ol]=e}function Qy(e){e[ol]=null}function ll(e){return!!e[ol]}function Mi(e){var t=e[wo];if(t)return t;for(var n=e.parentNode;n;){if(t=n[ol]||n[wo],t){var r=t.alternate;if(t.child!==null||r!==null&&r.child!==null)for(var a=Wy(e);a!==null;){var i=a[wo];if(i)return i;a=Wy(a)}return t}e=n,n=e.parentNode}return null}function Wa(e){var t=e[wo]||e[ol];return t&&(t.tag===$||t.tag===B||t.tag===de||t.tag===F)?t:null}function Oo(e){if(e.tag===$||e.tag===B)return e.stateNode;throw new Error("getNodeFromInstance: Invalid argument.")}function Ks(e){return e[rp]||null}function ip(e,t){e[rp]=t}function hw(e){var t=e[ap];return t===void 0&&(t=e[ap]=new Set),t}var Xy={},Ky=p.ReactDebugCurrentFrame;function Js(e){if(e){var t=e._owner,n=za(e.type,e._source,t?t.type:null);Ky.setExtraStackFrame(n)}else Ky.setExtraStackFrame(null)}function Dr(e,t,n,r,a){{var i=Function.call.bind(an);for(var o in e)if(i(e,o)){var u=void 0;try{if(typeof e[o]!="function"){var c=Error((r||"React class")+": "+n+" type `"+o+"` is invalid; it must be a function, usually from the `prop-types` package, but received `"+typeof e[o]+"`.This often happens because of typos such as `PropTypes.function` instead of `PropTypes.func`.");throw c.name="Invariant Violation",c}u=e[o](t,o,r,n,null,"SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED")}catch(h){u=h}u&&!(u instanceof Error)&&(Js(a),f("%s: type specification of %s `%s` is invalid; the type checker function must return `null` or an `Error` but returned a %s. You may have forgotten to pass an argument to the type checker creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and shape all require an argument).",r||"React class",n,o,typeof u),Js(null)),u instanceof Error&&!(u.message in Xy)&&(Xy[u.message]=!0,Js(a),f("Failed %s type: %s",n,u.message),Js(null))}}}var op=[],Zs;Zs=[];var Sa=-1;function Qa(e){return{current:e}}function cn(e,t){if(Sa<0){f("Unexpected pop.");return}t!==Zs[Sa]&&f("Unexpected Fiber popped."),e.current=op[Sa],op[Sa]=null,Zs[Sa]=null,Sa--}function fn(e,t,n){Sa++,op[Sa]=e.current,Zs[Sa]=n,e.current=t}var up;up={};var Xn={};Object.freeze(Xn);var Ea=Qa(Xn),Ir=Qa(!1),lp=Xn;function _o(e,t,n){return n&&Wr(t)?lp:Ea.current}function Jy(e,t,n){{var r=e.stateNode;r.__reactInternalMemoizedUnmaskedChildContext=t,r.__reactInternalMemoizedMaskedChildContext=n}}function Ao(e,t){{var n=e.type,r=n.contextTypes;if(!r)return Xn;var a=e.stateNode;if(a&&a.__reactInternalMemoizedUnmaskedChildContext===t)return a.__reactInternalMemoizedMaskedChildContext;var i={};for(var o in r)i[o]=t[o];{var u=ye(e)||"Unknown";Dr(r,i,"context",u)}return a&&Jy(e,t,i),i}}function ec(){return Ir.current}function Wr(e){{var t=e.childContextTypes;return t!=null}}function tc(e){cn(Ir,e),cn(Ea,e)}function sp(e){cn(Ir,e),cn(Ea,e)}function Zy(e,t,n){{if(Ea.current!==Xn)throw new Error("Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue.");fn(Ea,t,e),fn(Ir,n,e)}}function eg(e,t,n){{var r=e.stateNode,a=t.childContextTypes;if(typeof r.getChildContext!="function"){{var i=ye(e)||"Unknown";up[i]||(up[i]=!0,f("%s.childContextTypes is specified but there is no getChildContext() method on the instance. You can either define getChildContext() on %s or remove childContextTypes from it.",i,i))}return n}var o=r.getChildContext();for(var u in o)if(!(u in a))throw new Error((ye(e)||"Unknown")+'.getChildContext(): key "'+u+'" is not defined in childContextTypes.');{var c=ye(e)||"Unknown";Dr(a,o,"child context",c)}return _e({},n,o)}}function nc(e){{var t=e.stateNode,n=t&&t.__reactInternalMemoizedMergedChildContext||Xn;return lp=Ea.current,fn(Ea,n,e),fn(Ir,Ir.current,e),!0}}function tg(e,t,n){{var r=e.stateNode;if(!r)throw new Error("Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue.");if(n){var a=eg(e,t,lp);r.__reactInternalMemoizedMergedChildContext=a,cn(Ir,e),cn(Ea,e),fn(Ea,a,e),fn(Ir,n,e)}else cn(Ir,e),fn(Ir,n,e)}}function mw(e){{if(!JR(e)||e.tag!==U)throw new Error("Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue.");var t=e;do{switch(t.tag){case F:return t.stateNode.context;case U:{var n=t.type;if(Wr(n))return t.stateNode.__reactInternalMemoizedMergedChildContext;break}}t=t.return}while(t!==null);throw new Error("Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue.")}}var Xa=0,rc=1,Ra=null,cp=!1,fp=!1;function ng(e){Ra===null?Ra=[e]:Ra.push(e)}function yw(e){cp=!0,ng(e)}function rg(){cp&&Ka()}function Ka(){if(!fp&&Ra!==null){fp=!0;var e=0,t=xr();try{var n=!0,r=Ra;for(qt(In);e<r.length;e++){var a=r[e];do a=a(n);while(a!==null)}Ra=null,cp=!1}catch(i){throw Ra!==null&&(Ra=Ra.slice(e+1)),wm(bs,Ka),i}finally{qt(t),fp=!1}}return null}var Lo=[],Mo=0,ac=null,ic=0,ur=[],lr=0,Ui=null,Ca=1,Ta="";function gw(e){return ki(),(e.flags&bm)!==ue}function bw(e){return ki(),ic}function Sw(){var e=Ta,t=Ca,n=t&~Ew(t);return n.toString(32)+e}function Ni(e,t){ki(),Lo[Mo++]=ic,Lo[Mo++]=ac,ac=e,ic=t}function ag(e,t,n){ki(),ur[lr++]=Ca,ur[lr++]=Ta,ur[lr++]=Ui,Ui=e;var r=Ca,a=Ta,i=oc(r)-1,o=r&~(1<<i),u=n+1,c=oc(t)+i;if(c>30){var h=i-i%5,m=(1<<h)-1,R=(o&m).toString(32),E=o>>h,x=i-h,w=oc(t)+x,A=u<<x,I=A|E,ae=R+a;Ca=1<<w|I,Ta=ae}else{var te=u<<i,Ne=te|o,Oe=a;Ca=1<<c|Ne,Ta=Oe}}function dp(e){ki();var t=e.return;if(t!==null){var n=1,r=0;Ni(e,n),ag(e,n,r)}}function oc(e){return 32-Um(e)}function Ew(e){return 1<<oc(e)-1}function pp(e){for(;e===ac;)ac=Lo[--Mo],Lo[Mo]=null,ic=Lo[--Mo],Lo[Mo]=null;for(;e===Ui;)Ui=ur[--lr],ur[lr]=null,Ta=ur[--lr],ur[lr]=null,Ca=ur[--lr],ur[lr]=null}function Rw(){return ki(),Ui!==null?{id:Ca,overflow:Ta}:null}function Cw(e,t){ki(),ur[lr++]=Ca,ur[lr++]=Ta,ur[lr++]=Ui,Ca=t.id,Ta=t.overflow,Ui=e}function ki(){Xt()||f("Expected to be hydrating. This is a bug in React. Please file an issue.")}var Qt=null,sr=null,wr=!1,zi=!1,Ja=null;function Tw(){wr&&f("We should not be hydrating here. This is a bug in React. Please file a bug.")}function ig(){zi=!0}function xw(){return zi}function Dw(e){var t=e.stateNode.containerInfo;return sr=YD(t),Qt=e,wr=!0,Ja=null,zi=!1,!0}function ww(e,t,n){return sr=qD(t),Qt=e,wr=!0,Ja=null,zi=!1,n!==null&&Cw(e,n),!0}function og(e,t){switch(e.tag){case F:{tw(e.stateNode.containerInfo,t);break}case $:{var n=(e.mode&Me)!==ie;rw(e.type,e.memoizedProps,e.stateNode,t,n);break}case de:{var r=e.memoizedState;r.dehydrated!==null&&nw(r.dehydrated,t);break}}}function ug(e,t){og(e,t);var n=L_();n.stateNode=t,n.return=e;var r=e.deletions;r===null?(e.deletions=[n],e.flags|=Si):r.push(n)}function vp(e,t){{if(zi)return;switch(e.tag){case F:{var n=e.stateNode.containerInfo;switch(t.tag){case $:var r=t.type;t.pendingProps,aw(n,r);break;case B:var a=t.pendingProps;iw(n,a);break}break}case $:{var i=e.type,o=e.memoizedProps,u=e.stateNode;switch(t.tag){case $:{var c=t.type,h=t.pendingProps,m=(e.mode&Me)!==ie;lw(i,o,u,c,h,m);break}case B:{var R=t.pendingProps,E=(e.mode&Me)!==ie;sw(i,o,u,R,E);break}}break}case de:{var x=e.memoizedState,w=x.dehydrated;if(w!==null)switch(t.tag){case $:var A=t.type;t.pendingProps,ow(w,A);break;case B:var I=t.pendingProps;uw(w,I);break}break}default:return}}}function lg(e,t){t.flags=t.flags&~va|xt,vp(e,t)}function sg(e,t){switch(e.tag){case $:{var n=e.type;e.pendingProps;var r=HD(t,n);return r!==null?(e.stateNode=r,Qt=e,sr=$D(r),!0):!1}case B:{var a=e.pendingProps,i=jD(t,a);return i!==null?(e.stateNode=i,Qt=e,sr=null,!0):!1}case de:{var o=VD(t);if(o!==null){var u={dehydrated:o,treeContext:Rw(),retryLane:qn};e.memoizedState=u;var c=M_(o);return c.return=e,e.child=c,Qt=e,sr=null,!0}return!1}default:return!1}}function hp(e){return(e.mode&Me)!==ie&&(e.flags&Pe)===ue}function mp(e){throw new Error("Hydration failed because the initial UI does not match what was rendered on the server.")}function yp(e){if(wr){var t=sr;if(!t){hp(e)&&(vp(Qt,e),mp()),lg(Qt,e),wr=!1,Qt=e;return}var n=t;if(!sg(e,t)){hp(e)&&(vp(Qt,e),mp()),t=il(n);var r=Qt;if(!t||!sg(e,t)){lg(Qt,e),wr=!1,Qt=e;return}ug(r,n)}}}function Ow(e,t,n){var r=e.stateNode,a=!zi,i=GD(r,e.type,e.memoizedProps,t,n,e,a);return e.updateQueue=i,i!==null}function _w(e){var t=e.stateNode,n=e.memoizedProps,r=ID(t,n,e);if(r){var a=Qt;if(a!==null)switch(a.tag){case F:{var i=a.stateNode.containerInfo,o=(a.mode&Me)!==ie;ZD(i,t,n,o);break}case $:{var u=a.type,c=a.memoizedProps,h=a.stateNode,m=(a.mode&Me)!==ie;ew(u,c,h,t,n,m);break}}}return r}function Aw(e){var t=e.memoizedState,n=t!==null?t.dehydrated:null;if(!n)throw new Error("Expected to have a hydrated suspense instance. This error is likely caused by a bug in React. Please file an issue.");WD(n,e)}function Lw(e){var t=e.memoizedState,n=t!==null?t.dehydrated:null;if(!n)throw new Error("Expected to have a hydrated suspense instance. This error is likely caused by a bug in React. Please file an issue.");return QD(n)}function cg(e){for(var t=e.return;t!==null&&t.tag!==$&&t.tag!==F&&t.tag!==de;)t=t.return;Qt=t}function uc(e){if(e!==Qt)return!1;if(!wr)return cg(e),wr=!0,!1;if(e.tag!==F&&(e.tag!==$||JD(e.type)&&!Jd(e.type,e.memoizedProps))){var t=sr;if(t)if(hp(e))fg(e),mp();else for(;t;)ug(e,t),t=il(t)}return cg(e),e.tag===de?sr=Lw(e):sr=Qt?il(e.stateNode):null,!0}function Mw(){return wr&&sr!==null}function fg(e){for(var t=sr;t;)og(e,t),t=il(t)}function Uo(){Qt=null,sr=null,wr=!1,zi=!1}function dg(){Ja!==null&&(iS(Ja),Ja=null)}function Xt(){return wr}function gp(e){Ja===null?Ja=[e]:Ja.push(e)}var Uw=p.ReactCurrentBatchConfig,Nw=null;function kw(){return Uw.transition}var Or={recordUnsafeLifecycleWarnings:function(e,t){},flushPendingUnsafeLifecycleWarnings:function(){},recordLegacyContextWarning:function(e,t){},flushLegacyContextWarning:function(){},discardPendingWarnings:function(){}};{var zw=function(e){for(var t=null,n=e;n!==null;)n.mode&vt&&(t=n),n=n.return;return t},Fi=function(e){var t=[];return e.forEach(function(n){t.push(n)}),t.sort().join(", ")},sl=[],cl=[],fl=[],dl=[],pl=[],vl=[],Hi=new Set;Or.recordUnsafeLifecycleWarnings=function(e,t){Hi.has(e.type)||(typeof t.componentWillMount=="function"&&t.componentWillMount.__suppressDeprecationWarning!==!0&&sl.push(e),e.mode&vt&&typeof t.UNSAFE_componentWillMount=="function"&&cl.push(e),typeof t.componentWillReceiveProps=="function"&&t.componentWillReceiveProps.__suppressDeprecationWarning!==!0&&fl.push(e),e.mode&vt&&typeof t.UNSAFE_componentWillReceiveProps=="function"&&dl.push(e),typeof t.componentWillUpdate=="function"&&t.componentWillUpdate.__suppressDeprecationWarning!==!0&&pl.push(e),e.mode&vt&&typeof t.UNSAFE_componentWillUpdate=="function"&&vl.push(e))},Or.flushPendingUnsafeLifecycleWarnings=function(){var e=new Set;sl.length>0&&(sl.forEach(function(E){e.add(ye(E)||"Component"),Hi.add(E.type)}),sl=[]);var t=new Set;cl.length>0&&(cl.forEach(function(E){t.add(ye(E)||"Component"),Hi.add(E.type)}),cl=[]);var n=new Set;fl.length>0&&(fl.forEach(function(E){n.add(ye(E)||"Component"),Hi.add(E.type)}),fl=[]);var r=new Set;dl.length>0&&(dl.forEach(function(E){r.add(ye(E)||"Component"),Hi.add(E.type)}),dl=[]);var a=new Set;pl.length>0&&(pl.forEach(function(E){a.add(ye(E)||"Component"),Hi.add(E.type)}),pl=[]);var i=new Set;if(vl.length>0&&(vl.forEach(function(E){i.add(ye(E)||"Component"),Hi.add(E.type)}),vl=[]),t.size>0){var o=Fi(t);f(`Using UNSAFE_componentWillMount in strict mode is not recommended and may indicate bugs in your code. See https://reactjs.org/link/unsafe-component-lifecycles for details.
+
+* Move code with side effects to componentDidMount, and set initial state in the constructor.
+
+Please update the following components: %s`,o)}if(r.size>0){var u=Fi(r);f(`Using UNSAFE_componentWillReceiveProps in strict mode is not recommended and may indicate bugs in your code. See https://reactjs.org/link/unsafe-component-lifecycles for details.
+
+* Move data fetching code or side effects to componentDidUpdate.
+* If you're updating state whenever props change, refactor your code to use memoization techniques or move it to static getDerivedStateFromProps. Learn more at: https://reactjs.org/link/derived-state
+
+Please update the following components: %s`,u)}if(i.size>0){var c=Fi(i);f(`Using UNSAFE_componentWillUpdate in strict mode is not recommended and may indicate bugs in your code. See https://reactjs.org/link/unsafe-component-lifecycles for details.
+
+* Move data fetching code or side effects to componentDidUpdate.
+
+Please update the following components: %s`,c)}if(e.size>0){var h=Fi(e);S(`componentWillMount has been renamed, and is not recommended for use. See https://reactjs.org/link/unsafe-component-lifecycles for details.
+
+* Move code with side effects to componentDidMount, and set initial state in the constructor.
+* Rename componentWillMount to UNSAFE_componentWillMount to suppress this warning in non-strict mode. In React 18.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run \`npx react-codemod rename-unsafe-lifecycles\` in your project source folder.
+
+Please update the following components: %s`,h)}if(n.size>0){var m=Fi(n);S(`componentWillReceiveProps has been renamed, and is not recommended for use. See https://reactjs.org/link/unsafe-component-lifecycles for details.
+
+* Move data fetching code or side effects to componentDidUpdate.
+* If you're updating state whenever props change, refactor your code to use memoization techniques or move it to static getDerivedStateFromProps. Learn more at: https://reactjs.org/link/derived-state
+* Rename componentWillReceiveProps to UNSAFE_componentWillReceiveProps to suppress this warning in non-strict mode. In React 18.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run \`npx react-codemod rename-unsafe-lifecycles\` in your project source folder.
+
+Please update the following components: %s`,m)}if(a.size>0){var R=Fi(a);S(`componentWillUpdate has been renamed, and is not recommended for use. See https://reactjs.org/link/unsafe-component-lifecycles for details.
+
+* Move data fetching code or side effects to componentDidUpdate.
+* Rename componentWillUpdate to UNSAFE_componentWillUpdate to suppress this warning in non-strict mode. In React 18.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run \`npx react-codemod rename-unsafe-lifecycles\` in your project source folder.
+
+Please update the following components: %s`,R)}};var lc=new Map,pg=new Set;Or.recordLegacyContextWarning=function(e,t){var n=zw(e);if(n===null){f("Expected to find a StrictMode component in a strict mode tree. This error is likely caused by a bug in React. Please file an issue.");return}if(!pg.has(e.type)){var r=lc.get(n);(e.type.contextTypes!=null||e.type.childContextTypes!=null||t!==null&&typeof t.getChildContext=="function")&&(r===void 0&&(r=[],lc.set(n,r)),r.push(e))}},Or.flushLegacyContextWarning=function(){lc.forEach(function(e,t){if(e.length!==0){var n=e[0],r=new Set;e.forEach(function(i){r.add(ye(i)||"Component"),pg.add(i.type)});var a=Fi(r);try{ft(n),f(`Legacy context API has been detected within a strict-mode tree.
+
+The old API will be supported in all 16.x releases, but applications using it should migrate to the new version.
+
+Please update the following components: %s
+
+Learn more about this warning here: https://reactjs.org/link/legacy-context`,a)}finally{Bt()}}})},Or.discardPendingWarnings=function(){sl=[],cl=[],fl=[],dl=[],pl=[],vl=[],lc=new Map}}var bp,Sp,Ep,Rp,Cp,vg=function(e,t){};bp=!1,Sp=!1,Ep={},Rp={},Cp={},vg=function(e,t){if(!(e===null||typeof e!="object")&&!(!e._store||e._store.validated||e.key!=null)){if(typeof e._store!="object")throw new Error("React Component in warnForMissingKey should have a _store. This error is likely caused by a bug in React. Please file an issue.");e._store.validated=!0;var n=ye(t)||"Component";Rp[n]||(Rp[n]=!0,f('Each child in a list should have a unique "key" prop. See https://reactjs.org/link/warning-keys for more information.'))}};function Fw(e){return e.prototype&&e.prototype.isReactComponent}function hl(e,t,n){var r=n.ref;if(r!==null&&typeof r!="function"&&typeof r!="object"){if((e.mode&vt||Hn)&&!(n._owner&&n._self&&n._owner.stateNode!==n._self)&&!(n._owner&&n._owner.tag!==U)&&!(typeof n.type=="function"&&!Fw(n.type))&&n._owner){var a=ye(e)||"Component";Ep[a]||(f('Component "%s" contains the string ref "%s". Support for string refs will be removed in a future major release. We recommend using useRef() or createRef() instead. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-string-ref',a,r),Ep[a]=!0)}if(n._owner){var i=n._owner,o;if(i){var u=i;if(u.tag!==U)throw new Error("Function components cannot have string refs. We recommend using useRef() instead. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-string-ref");o=u.stateNode}if(!o)throw new Error("Missing owner for string ref "+r+". This error is likely caused by a bug in React. Please file an issue.");var c=o;Dn(r,"ref");var h=""+r;if(t!==null&&t.ref!==null&&typeof t.ref=="function"&&t.ref._stringRef===h)return t.ref;var m=function(R){var E=c.refs;R===null?delete E[h]:E[h]=R};return m._stringRef=h,m}else{if(typeof r!="string")throw new Error("Expected ref to be a function, a string, an object returned by React.createRef(), or null.");if(!n._owner)throw new Error("Element ref was specified as a string ("+r+`) but no owner was set. This could happen for one of the following reasons:
+1. You may be adding a ref to a function component
+2. You may be adding a ref to a component that was not created inside a component's render method
+3. You have multiple copies of React loaded
+See https://reactjs.org/link/refs-must-have-owner for more information.`)}}return r}function sc(e,t){var n=Object.prototype.toString.call(t);throw new Error("Objects are not valid as a React child (found: "+(n==="[object Object]"?"object with keys {"+Object.keys(t).join(", ")+"}":n)+"). If you meant to render a collection of children, use an array instead.")}function cc(e){{var t=ye(e)||"Component";if(Cp[t])return;Cp[t]=!0,f("Functions are not valid as a React child. This may happen if you return a Component instead of <Component /> from render. Or maybe you meant to call this function rather than return it.")}}function hg(e){var t=e._payload,n=e._init;return n(t)}function mg(e){function t(C,L){if(e){var T=C.deletions;T===null?(C.deletions=[L],C.flags|=Si):T.push(L)}}function n(C,L){if(!e)return null;for(var T=L;T!==null;)t(C,T),T=T.sibling;return null}function r(C,L){for(var T=new Map,V=L;V!==null;)V.key!==null?T.set(V.key,V):T.set(V.index,V),V=V.sibling;return T}function a(C,L){var T=Ii(C,L);return T.index=0,T.sibling=null,T}function i(C,L,T){if(C.index=T,!e)return C.flags|=bm,L;var V=C.alternate;if(V!==null){var K=V.index;return K<L?(C.flags|=xt,L):K}else return C.flags|=xt,L}function o(C){return e&&C.alternate===null&&(C.flags|=xt),C}function u(C,L,T,V){if(L===null||L.tag!==B){var K=gh(T,C.mode,V);return K.return=C,K}else{var W=a(L,T);return W.return=C,W}}function c(C,L,T,V){var K=T.type;if(K===b)return m(C,L,T.props.children,V,T.key);if(L!==null&&(L.elementType===K||ES(L,T)||typeof K=="object"&&K!==null&&K.$$typeof===we&&hg(K)===L.type)){var W=a(L,T.props);return W.ref=hl(C,L,T),W.return=C,W._debugSource=T._source,W._debugOwner=T._owner,W}var se=yh(T,C.mode,V);return se.ref=hl(C,L,T),se.return=C,se}function h(C,L,T,V){if(L===null||L.tag!==ee||L.stateNode.containerInfo!==T.containerInfo||L.stateNode.implementation!==T.implementation){var K=bh(T,C.mode,V);return K.return=C,K}else{var W=a(L,T.children||[]);return W.return=C,W}}function m(C,L,T,V,K){if(L===null||L.tag!==ce){var W=si(T,C.mode,V,K);return W.return=C,W}else{var se=a(L,T);return se.return=C,se}}function R(C,L,T){if(typeof L=="string"&&L!==""||typeof L=="number"){var V=gh(""+L,C.mode,T);return V.return=C,V}if(typeof L=="object"&&L!==null){switch(L.$$typeof){case Pr:{var K=yh(L,C.mode,T);return K.ref=hl(C,null,L),K.return=C,K}case Sr:{var W=bh(L,C.mode,T);return W.return=C,W}case we:{var se=L._payload,me=L._init;return R(C,me(se),T)}}if(Be(L)||ua(L)){var Xe=si(L,C.mode,T,null);return Xe.return=C,Xe}sc(C,L)}return typeof L=="function"&&cc(C),null}function E(C,L,T,V){var K=L!==null?L.key:null;if(typeof T=="string"&&T!==""||typeof T=="number")return K!==null?null:u(C,L,""+T,V);if(typeof T=="object"&&T!==null){switch(T.$$typeof){case Pr:return T.key===K?c(C,L,T,V):null;case Sr:return T.key===K?h(C,L,T,V):null;case we:{var W=T._payload,se=T._init;return E(C,L,se(W),V)}}if(Be(T)||ua(T))return K!==null?null:m(C,L,T,V,null);sc(C,T)}return typeof T=="function"&&cc(C),null}function x(C,L,T,V,K){if(typeof V=="string"&&V!==""||typeof V=="number"){var W=C.get(T)||null;return u(L,W,""+V,K)}if(typeof V=="object"&&V!==null){switch(V.$$typeof){case Pr:{var se=C.get(V.key===null?T:V.key)||null;return c(L,se,V,K)}case Sr:{var me=C.get(V.key===null?T:V.key)||null;return h(L,me,V,K)}case we:var Xe=V._payload,He=V._init;return x(C,L,T,He(Xe),K)}if(Be(V)||ua(V)){var Et=C.get(T)||null;return m(L,Et,V,K,null)}sc(L,V)}return typeof V=="function"&&cc(L),null}function w(C,L,T){{if(typeof C!="object"||C===null)return L;switch(C.$$typeof){case Pr:case Sr:vg(C,T);var V=C.key;if(typeof V!="string")break;if(L===null){L=new Set,L.add(V);break}if(!L.has(V)){L.add(V);break}f("Encountered two children with the same key, `%s`. Keys should be unique so that components maintain their identity across updates. Non-unique keys may cause children to be duplicated and/or omitted — the behavior is unsupported and could change in a future version.",V);break;case we:var K=C._payload,W=C._init;w(W(K),L,T);break}}return L}function A(C,L,T,V){for(var K=null,W=0;W<T.length;W++){var se=T[W];K=w(se,K,C)}for(var me=null,Xe=null,He=L,Et=0,je=0,ht=null;He!==null&&je<T.length;je++){He.index>je?(ht=He,He=null):ht=He.sibling;var pn=E(C,He,T[je],V);if(pn===null){He===null&&(He=ht);break}e&&He&&pn.alternate===null&&t(C,He),Et=i(pn,Et,je),Xe===null?me=pn:Xe.sibling=pn,Xe=pn,He=ht}if(je===T.length){if(n(C,He),Xt()){var rn=je;Ni(C,rn)}return me}if(He===null){for(;je<T.length;je++){var Jn=R(C,T[je],V);Jn!==null&&(Et=i(Jn,Et,je),Xe===null?me=Jn:Xe.sibling=Jn,Xe=Jn)}if(Xt()){var En=je;Ni(C,En)}return me}for(var Rn=r(C,He);je<T.length;je++){var vn=x(Rn,C,je,T[je],V);vn!==null&&(e&&vn.alternate!==null&&Rn.delete(vn.key===null?je:vn.key),Et=i(vn,Et,je),Xe===null?me=vn:Xe.sibling=vn,Xe=vn)}if(e&&Rn.forEach(function(Jo){return t(C,Jo)}),Xt()){var La=je;Ni(C,La)}return me}function I(C,L,T,V){var K=ua(T);if(typeof K!="function")throw new Error("An object is not an iterable. This error is likely caused by a bug in React. Please file an issue.");{typeof Symbol=="function"&&T[Symbol.toStringTag]==="Generator"&&(Sp||f("Using Generators as children is unsupported and will likely yield unexpected results because enumerating a generator mutates it. You may convert it to an array with `Array.from()` or the `[...spread]` operator before rendering. Keep in mind you might need to polyfill these features for older browsers."),Sp=!0),T.entries===K&&(bp||f("Using Maps as children is not supported. Use an array of keyed ReactElements instead."),bp=!0);var W=K.call(T);if(W)for(var se=null,me=W.next();!me.done;me=W.next()){var Xe=me.value;se=w(Xe,se,C)}}var He=K.call(T);if(He==null)throw new Error("An iterable object provided no iterator.");for(var Et=null,je=null,ht=L,pn=0,rn=0,Jn=null,En=He.next();ht!==null&&!En.done;rn++,En=He.next()){ht.index>rn?(Jn=ht,ht=null):Jn=ht.sibling;var Rn=E(C,ht,En.value,V);if(Rn===null){ht===null&&(ht=Jn);break}e&&ht&&Rn.alternate===null&&t(C,ht),pn=i(Rn,pn,rn),je===null?Et=Rn:je.sibling=Rn,je=Rn,ht=Jn}if(En.done){if(n(C,ht),Xt()){var vn=rn;Ni(C,vn)}return Et}if(ht===null){for(;!En.done;rn++,En=He.next()){var La=R(C,En.value,V);La!==null&&(pn=i(La,pn,rn),je===null?Et=La:je.sibling=La,je=La)}if(Xt()){var Jo=rn;Ni(C,Jo)}return Et}for(var Il=r(C,ht);!En.done;rn++,En=He.next()){var na=x(Il,C,rn,En.value,V);na!==null&&(e&&na.alternate!==null&&Il.delete(na.key===null?rn:na.key),pn=i(na,pn,rn),je===null?Et=na:je.sibling=na,je=na)}if(e&&Il.forEach(function(sA){return t(C,sA)}),Xt()){var lA=rn;Ni(C,lA)}return Et}function ae(C,L,T,V){if(L!==null&&L.tag===B){n(C,L.sibling);var K=a(L,T);return K.return=C,K}n(C,L);var W=gh(T,C.mode,V);return W.return=C,W}function te(C,L,T,V){for(var K=T.key,W=L;W!==null;){if(W.key===K){var se=T.type;if(se===b){if(W.tag===ce){n(C,W.sibling);var me=a(W,T.props.children);return me.return=C,me._debugSource=T._source,me._debugOwner=T._owner,me}}else if(W.elementType===se||ES(W,T)||typeof se=="object"&&se!==null&&se.$$typeof===we&&hg(se)===W.type){n(C,W.sibling);var Xe=a(W,T.props);return Xe.ref=hl(C,W,T),Xe.return=C,Xe._debugSource=T._source,Xe._debugOwner=T._owner,Xe}n(C,W);break}else t(C,W);W=W.sibling}if(T.type===b){var He=si(T.props.children,C.mode,V,T.key);return He.return=C,He}else{var Et=yh(T,C.mode,V);return Et.ref=hl(C,L,T),Et.return=C,Et}}function Ne(C,L,T,V){for(var K=T.key,W=L;W!==null;){if(W.key===K)if(W.tag===ee&&W.stateNode.containerInfo===T.containerInfo&&W.stateNode.implementation===T.implementation){n(C,W.sibling);var se=a(W,T.children||[]);return se.return=C,se}else{n(C,W);break}else t(C,W);W=W.sibling}var me=bh(T,C.mode,V);return me.return=C,me}function Oe(C,L,T,V){var K=typeof T=="object"&&T!==null&&T.type===b&&T.key===null;if(K&&(T=T.props.children),typeof T=="object"&&T!==null){switch(T.$$typeof){case Pr:return o(te(C,L,T,V));case Sr:return o(Ne(C,L,T,V));case we:var W=T._payload,se=T._init;return Oe(C,L,se(W),V)}if(Be(T))return A(C,L,T,V);if(ua(T))return I(C,L,T,V);sc(C,T)}return typeof T=="string"&&T!==""||typeof T=="number"?o(ae(C,L,""+T,V)):(typeof T=="function"&&cc(C),n(C,L))}return Oe}var No=mg(!0),yg=mg(!1);function Hw(e,t){if(e!==null&&t.child!==e.child)throw new Error("Resuming work not yet implemented.");if(t.child!==null){var n=t.child,r=Ii(n,n.pendingProps);for(t.child=r,r.return=t;n.sibling!==null;)n=n.sibling,r=r.sibling=Ii(n,n.pendingProps),r.return=t;r.sibling=null}}function jw(e,t){for(var n=e.child;n!==null;)D_(n,t),n=n.sibling}var Tp=Qa(null),xp;xp={};var fc=null,ko=null,Dp=null,dc=!1;function pc(){fc=null,ko=null,Dp=null,dc=!1}function gg(){dc=!0}function bg(){dc=!1}function Sg(e,t,n){fn(Tp,t._currentValue,e),t._currentValue=n,t._currentRenderer!==void 0&&t._currentRenderer!==null&&t._currentRenderer!==xp&&f("Detected multiple renderers concurrently rendering the same context provider. This is currently unsupported."),t._currentRenderer=xp}function wp(e,t){var n=Tp.current;cn(Tp,t),e._currentValue=n}function Op(e,t,n){for(var r=e;r!==null;){var a=r.alternate;if(bo(r.childLanes,t)?a!==null&&!bo(a.childLanes,t)&&(a.childLanes=Ee(a.childLanes,t)):(r.childLanes=Ee(r.childLanes,t),a!==null&&(a.childLanes=Ee(a.childLanes,t))),r===n)break;r=r.return}r!==n&&f("Expected to find the propagation root when scheduling context work. This error is likely caused by a bug in React. Please file an issue.")}function Vw(e,t,n){Bw(e,t,n)}function Bw(e,t,n){var r=e.child;for(r!==null&&(r.return=e);r!==null;){var a=void 0,i=r.dependencies;if(i!==null){a=r.child;for(var o=i.firstContext;o!==null;){if(o.context===t){if(r.tag===U){var u=Uu(n),c=xa(at,u);c.tag=hc;var h=r.updateQueue;if(h!==null){var m=h.shared,R=m.pending;R===null?c.next=c:(c.next=R.next,R.next=c),m.pending=c}}r.lanes=Ee(r.lanes,n);var E=r.alternate;E!==null&&(E.lanes=Ee(E.lanes,n)),Op(r.return,n,e),i.lanes=Ee(i.lanes,n);break}o=o.next}}else if(r.tag===Ce)a=r.type===e.type?null:r.child;else if(r.tag===Rt){var x=r.return;if(x===null)throw new Error("We just came from a parent so we must have had a parent. This is a bug in React.");x.lanes=Ee(x.lanes,n);var w=x.alternate;w!==null&&(w.lanes=Ee(w.lanes,n)),Op(x,n,e),a=r.sibling}else a=r.child;if(a!==null)a.return=r;else for(a=r;a!==null;){if(a===e){a=null;break}var A=a.sibling;if(A!==null){A.return=a.return,a=A;break}a=a.return}r=a}}function zo(e,t){fc=e,ko=null,Dp=null;var n=e.dependencies;if(n!==null){var r=n.firstContext;r!==null&&(Gn(n.lanes,t)&&Al(),n.firstContext=null)}}function Dt(e){dc&&f("Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo().");var t=e._currentValue;if(Dp!==e){var n={context:e,memoizedValue:t,next:null};if(ko===null){if(fc===null)throw new Error("Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo().");ko=n,fc.dependencies={lanes:H,firstContext:n}}else ko=ko.next=n}return t}var ji=null;function _p(e){ji===null?ji=[e]:ji.push(e)}function Pw(){if(ji!==null){for(var e=0;e<ji.length;e++){var t=ji[e],n=t.interleaved;if(n!==null){t.interleaved=null;var r=n.next,a=t.pending;if(a!==null){var i=a.next;a.next=r,n.next=i}t.pending=n}}ji=null}}function Eg(e,t,n,r){var a=t.interleaved;return a===null?(n.next=n,_p(t)):(n.next=a.next,a.next=n),t.interleaved=n,vc(e,r)}function $w(e,t,n,r){var a=t.interleaved;a===null?(n.next=n,_p(t)):(n.next=a.next,a.next=n),t.interleaved=n}function Yw(e,t,n,r){var a=t.interleaved;return a===null?(n.next=n,_p(t)):(n.next=a.next,a.next=n),t.interleaved=n,vc(e,r)}function Ln(e,t){return vc(e,t)}var qw=vc;function vc(e,t){e.lanes=Ee(e.lanes,t);var n=e.alternate;n!==null&&(n.lanes=Ee(n.lanes,t)),n===null&&(e.flags&(xt|va))!==ue&&yS(e);for(var r=e,a=e.return;a!==null;)a.childLanes=Ee(a.childLanes,t),n=a.alternate,n!==null?n.childLanes=Ee(n.childLanes,t):(a.flags&(xt|va))!==ue&&yS(e),r=a,a=a.return;if(r.tag===F){var i=r.stateNode;return i}else return null}var Rg=0,Cg=1,hc=2,Ap=3,mc=!1,Lp,yc;Lp=!1,yc=null;function Mp(e){var t={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,interleaved:null,lanes:H},effects:null};e.updateQueue=t}function Tg(e,t){var n=t.updateQueue,r=e.updateQueue;if(n===r){var a={baseState:r.baseState,firstBaseUpdate:r.firstBaseUpdate,lastBaseUpdate:r.lastBaseUpdate,shared:r.shared,effects:r.effects};t.updateQueue=a}}function xa(e,t){var n={eventTime:e,lane:t,tag:Rg,payload:null,callback:null,next:null};return n}function Za(e,t,n){var r=e.updateQueue;if(r===null)return null;var a=r.shared;if(yc===a&&!Lp&&(f("An update (setState, replaceState, or forceUpdate) was scheduled from inside an update function. Update functions should be pure, with zero side-effects. Consider using componentDidUpdate or a callback."),Lp=!0),$O()){var i=a.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),a.pending=t,qw(e,n)}else return Yw(e,a,t,n)}function gc(e,t,n){var r=t.updateQueue;if(r!==null){var a=r.shared;if(Fm(n)){var i=a.lanes;i=jm(i,e.pendingLanes);var o=Ee(i,n);a.lanes=o,Td(e,o)}}}function Up(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null){var a=r.updateQueue;if(n===a){var i=null,o=null,u=n.firstBaseUpdate;if(u!==null){var c=u;do{var h={eventTime:c.eventTime,lane:c.lane,tag:c.tag,payload:c.payload,callback:c.callback,next:null};o===null?i=o=h:(o.next=h,o=h),c=c.next}while(c!==null);o===null?i=o=t:(o.next=t,o=t)}else i=o=t;n={baseState:a.baseState,firstBaseUpdate:i,lastBaseUpdate:o,shared:a.shared,effects:a.effects},e.updateQueue=n;return}}var m=n.lastBaseUpdate;m===null?n.firstBaseUpdate=t:m.next=t,n.lastBaseUpdate=t}function Gw(e,t,n,r,a,i){switch(n.tag){case Cg:{var o=n.payload;if(typeof o=="function"){gg();var u=o.call(i,r,a);{if(e.mode&vt){$t(!0);try{o.call(i,r,a)}finally{$t(!1)}}bg()}return u}return o}case Ap:e.flags=e.flags&~yn|Pe;case Rg:{var c=n.payload,h;if(typeof c=="function"){gg(),h=c.call(i,r,a);{if(e.mode&vt){$t(!0);try{c.call(i,r,a)}finally{$t(!1)}}bg()}}else h=c;return h==null?r:_e({},r,h)}case hc:return mc=!0,r}return r}function bc(e,t,n,r){var a=e.updateQueue;mc=!1,yc=a.shared;var i=a.firstBaseUpdate,o=a.lastBaseUpdate,u=a.shared.pending;if(u!==null){a.shared.pending=null;var c=u,h=c.next;c.next=null,o===null?i=h:o.next=h,o=c;var m=e.alternate;if(m!==null){var R=m.updateQueue,E=R.lastBaseUpdate;E!==o&&(E===null?R.firstBaseUpdate=h:E.next=h,R.lastBaseUpdate=c)}}if(i!==null){var x=a.baseState,w=H,A=null,I=null,ae=null,te=i;do{var Ne=te.lane,Oe=te.eventTime;if(bo(r,Ne)){if(ae!==null){var L={eventTime:Oe,lane:Yt,tag:te.tag,payload:te.payload,callback:te.callback,next:null};ae=ae.next=L}x=Gw(e,a,te,x,t,n);var T=te.callback;if(T!==null&&te.lane!==Yt){e.flags|=qf;var V=a.effects;V===null?a.effects=[te]:V.push(te)}}else{var C={eventTime:Oe,lane:Ne,tag:te.tag,payload:te.payload,callback:te.callback,next:null};ae===null?(I=ae=C,A=x):ae=ae.next=C,w=Ee(w,Ne)}if(te=te.next,te===null){if(u=a.shared.pending,u===null)break;var K=u,W=K.next;K.next=null,te=W,a.lastBaseUpdate=K,a.shared.pending=null}}while(!0);ae===null&&(A=x),a.baseState=A,a.firstBaseUpdate=I,a.lastBaseUpdate=ae;var se=a.shared.interleaved;if(se!==null){var me=se;do w=Ee(w,me.lane),me=me.next;while(me!==se)}else i===null&&(a.shared.lanes=H);Pl(w),e.lanes=w,e.memoizedState=x}yc=null}function Iw(e,t){if(typeof e!="function")throw new Error("Invalid argument passed as callback. Expected a function. Instead "+("received: "+e));e.call(t)}function xg(){mc=!1}function Sc(){return mc}function Dg(e,t,n){var r=t.effects;if(t.effects=null,r!==null)for(var a=0;a<r.length;a++){var i=r[a],o=i.callback;o!==null&&(i.callback=null,Iw(o,n))}}var ml={},ei=Qa(ml),yl=Qa(ml),Ec=Qa(ml);function Rc(e){if(e===ml)throw new Error("Expected host context to exist. This error is likely caused by a bug in React. Please file an issue.");return e}function wg(){var e=Rc(Ec.current);return e}function Np(e,t){fn(Ec,t,e),fn(yl,e,e),fn(ei,ml,e);var n=cD(t);cn(ei,e),fn(ei,n,e)}function Fo(e){cn(ei,e),cn(yl,e),cn(Ec,e)}function kp(){var e=Rc(ei.current);return e}function Og(e){Rc(Ec.current);var t=Rc(ei.current),n=fD(t,e.type);t!==n&&(fn(yl,e,e),fn(ei,n,e))}function zp(e){yl.current===e&&(cn(ei,e),cn(yl,e))}var Ww=0,_g=1,Ag=1,gl=2,_r=Qa(Ww);function Fp(e,t){return(e&t)!==0}function Ho(e){return e&_g}function Hp(e,t){return e&_g|t}function Qw(e,t){return e|t}function ti(e,t){fn(_r,t,e)}function jo(e){cn(_r,e)}function Xw(e,t){var n=e.memoizedState;return n!==null?n.dehydrated!==null:(e.memoizedProps,!0)}function Cc(e){for(var t=e;t!==null;){if(t.tag===de){var n=t.memoizedState;if(n!==null){var r=n.dehydrated;if(r===null||Iy(r)||np(r))return t}}else if(t.tag===rt&&t.memoizedProps.revealOrder!==void 0){var a=(t.flags&Pe)!==ue;if(a)return t}else if(t.child!==null){t.child.return=t,t=t.child;continue}if(t===e)return null;for(;t.sibling===null;){if(t.return===null||t.return===e)return null;t=t.return}t.sibling.return=t.return,t=t.sibling}return null}var Mn=0,At=1,Qr=2,Lt=4,Kt=8,jp=[];function Vp(){for(var e=0;e<jp.length;e++){var t=jp[e];t._workInProgressVersionPrimary=null}jp.length=0}function Kw(e,t){var n=t._getVersion,r=n(t._source);e.mutableSourceEagerHydrationData==null?e.mutableSourceEagerHydrationData=[t,r]:e.mutableSourceEagerHydrationData.push(t,r)}var X=p.ReactCurrentDispatcher,bl=p.ReactCurrentBatchConfig,Bp,Vo;Bp=new Set;var Vi=H,Qe=null,Mt=null,Ut=null,Tc=!1,Sl=!1,El=0,Jw=0,Zw=25,k=null,cr=null,ni=-1,Pp=!1;function $e(){{var e=k;cr===null?cr=[e]:cr.push(e)}}function Y(){{var e=k;cr!==null&&(ni++,cr[ni]!==e&&e0(e))}}function Bo(e){e!=null&&!Be(e)&&f("%s received a final argument that is not an array (instead, received `%s`). When specified, the final argument must be an array.",k,typeof e)}function e0(e){{var t=ye(Qe);if(!Bp.has(t)&&(Bp.add(t),cr!==null)){for(var n="",r=30,a=0;a<=ni;a++){for(var i=cr[a],o=a===ni?e:i,u=a+1+". "+i;u.length<r;)u+=" ";u+=o+`
+`,n+=u}f(`React has detected a change in the order of Hooks called by %s. This will lead to bugs and errors if not fixed. For more information, read the Rules of Hooks: https://reactjs.org/link/rules-of-hooks
+
+   Previous render            Next render
+   ------------------------------------------------------
+%s   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+`,t,n)}}}function dn(){throw new Error(`Invalid hook call. Hooks can only be called inside of the body of a function component. This could happen for one of the following reasons:
+1. You might have mismatching versions of React and the renderer (such as React DOM)
+2. You might be breaking the Rules of Hooks
+3. You might have more than one copy of React in the same app
+See https://reactjs.org/link/invalid-hook-call for tips about how to debug and fix this problem.`)}function $p(e,t){if(Pp)return!1;if(t===null)return f("%s received a final argument during this render, but not during the previous render. Even though the final argument is optional, its type cannot change between renders.",k),!1;e.length!==t.length&&f(`The final argument passed to %s changed size between renders. The order and size of this array must remain constant.
+
+Previous: %s
+Incoming: %s`,k,"["+t.join(", ")+"]","["+e.join(", ")+"]");for(var n=0;n<t.length&&n<e.length;n++)if(!Qn(e[n],t[n]))return!1;return!0}function Po(e,t,n,r,a,i){Vi=i,Qe=t,cr=e!==null?e._debugHookTypes:null,ni=-1,Pp=e!==null&&e.type!==t.type,t.memoizedState=null,t.updateQueue=null,t.lanes=H,e!==null&&e.memoizedState!==null?X.current=Jg:cr!==null?X.current=Kg:X.current=Xg;var o=n(r,a);if(Sl){var u=0;do{if(Sl=!1,El=0,u>=Zw)throw new Error("Too many re-renders. React limits the number of renders to prevent an infinite loop.");u+=1,Pp=!1,Mt=null,Ut=null,t.updateQueue=null,ni=-1,X.current=Zg,o=n(r,a)}while(Sl)}X.current=Fc,t._debugHookTypes=cr;var c=Mt!==null&&Mt.next!==null;if(Vi=H,Qe=null,Mt=null,Ut=null,k=null,cr=null,ni=-1,e!==null&&(e.flags&ma)!==(t.flags&ma)&&(e.mode&Me)!==ie&&f("Internal React error: Expected static flag was missing. Please notify the React team."),Tc=!1,c)throw new Error("Rendered fewer hooks than expected. This may be caused by an accidental early return statement.");return o}function $o(){var e=El!==0;return El=0,e}function Lg(e,t,n){t.updateQueue=e.updateQueue,(t.mode&qr)!==ie?t.flags&=~(gs|ha|Cr|ke):t.flags&=~(Cr|ke),e.lanes=xs(e.lanes,n)}function Mg(){if(X.current=Fc,Tc){for(var e=Qe.memoizedState;e!==null;){var t=e.queue;t!==null&&(t.pending=null),e=e.next}Tc=!1}Vi=H,Qe=null,Mt=null,Ut=null,cr=null,ni=-1,k=null,qg=!1,Sl=!1,El=0}function Xr(){var e={memoizedState:null,baseState:null,baseQueue:null,queue:null,next:null};return Ut===null?Qe.memoizedState=Ut=e:Ut=Ut.next=e,Ut}function fr(){var e;if(Mt===null){var t=Qe.alternate;t!==null?e=t.memoizedState:e=null}else e=Mt.next;var n;if(Ut===null?n=Qe.memoizedState:n=Ut.next,n!==null)Ut=n,n=Ut.next,Mt=e;else{if(e===null)throw new Error("Rendered more hooks than during the previous render.");Mt=e;var r={memoizedState:Mt.memoizedState,baseState:Mt.baseState,baseQueue:Mt.baseQueue,queue:Mt.queue,next:null};Ut===null?Qe.memoizedState=Ut=r:Ut=Ut.next=r}return Ut}function Ug(){return{lastEffect:null,stores:null}}function Yp(e,t){return typeof t=="function"?t(e):t}function qp(e,t,n){var r=Xr(),a;n!==void 0?a=n(t):a=t,r.memoizedState=r.baseState=a;var i={pending:null,interleaved:null,lanes:H,dispatch:null,lastRenderedReducer:e,lastRenderedState:a};r.queue=i;var o=i.dispatch=a0.bind(null,Qe,i);return[r.memoizedState,o]}function Gp(e,t,n){var r=fr(),a=r.queue;if(a===null)throw new Error("Should have a queue. This is likely a bug in React. Please file an issue.");a.lastRenderedReducer=e;var i=Mt,o=i.baseQueue,u=a.pending;if(u!==null){if(o!==null){var c=o.next,h=u.next;o.next=h,u.next=c}i.baseQueue!==o&&f("Internal error: Expected work-in-progress queue to be a clone. This is a bug in React."),i.baseQueue=o=u,a.pending=null}if(o!==null){var m=o.next,R=i.baseState,E=null,x=null,w=null,A=m;do{var I=A.lane;if(bo(Vi,I)){if(w!==null){var te={lane:Yt,action:A.action,hasEagerState:A.hasEagerState,eagerState:A.eagerState,next:null};w=w.next=te}if(A.hasEagerState)R=A.eagerState;else{var Ne=A.action;R=e(R,Ne)}}else{var ae={lane:I,action:A.action,hasEagerState:A.hasEagerState,eagerState:A.eagerState,next:null};w===null?(x=w=ae,E=R):w=w.next=ae,Qe.lanes=Ee(Qe.lanes,I),Pl(I)}A=A.next}while(A!==null&&A!==m);w===null?E=R:w.next=x,Qn(R,r.memoizedState)||Al(),r.memoizedState=R,r.baseState=E,r.baseQueue=w,a.lastRenderedState=R}var Oe=a.interleaved;if(Oe!==null){var C=Oe;do{var L=C.lane;Qe.lanes=Ee(Qe.lanes,L),Pl(L),C=C.next}while(C!==Oe)}else o===null&&(a.lanes=H);var T=a.dispatch;return[r.memoizedState,T]}function Ip(e,t,n){var r=fr(),a=r.queue;if(a===null)throw new Error("Should have a queue. This is likely a bug in React. Please file an issue.");a.lastRenderedReducer=e;var i=a.dispatch,o=a.pending,u=r.memoizedState;if(o!==null){a.pending=null;var c=o.next,h=c;do{var m=h.action;u=e(u,m),h=h.next}while(h!==c);Qn(u,r.memoizedState)||Al(),r.memoizedState=u,r.baseQueue===null&&(r.baseState=u),a.lastRenderedState=u}return[u,i]}function XL(e,t,n){}function KL(e,t,n){}function Wp(e,t,n){var r=Qe,a=Xr(),i,o=Xt();if(o){if(n===void 0)throw new Error("Missing getServerSnapshot, which is required for server-rendered content. Will revert to client rendering.");i=n(),Vo||i!==n()&&(f("The result of getServerSnapshot should be cached to avoid an infinite loop"),Vo=!0)}else{if(i=t(),!Vo){var u=t();Qn(i,u)||(f("The result of getSnapshot should be cached to avoid an infinite loop"),Vo=!0)}var c=nf();if(c===null)throw new Error("Expected a work-in-progress root. This is a bug in React. Please file an issue.");Ts(c,Vi)||Ng(r,t,i)}a.memoizedState=i;var h={value:i,getSnapshot:t};return a.queue=h,_c(zg.bind(null,r,h,e),[e]),r.flags|=Cr,Rl(At|Kt,kg.bind(null,r,h,i,t),void 0,null),i}function xc(e,t,n){var r=Qe,a=fr(),i=t();if(!Vo){var o=t();Qn(i,o)||(f("The result of getSnapshot should be cached to avoid an infinite loop"),Vo=!0)}var u=a.memoizedState,c=!Qn(u,i);c&&(a.memoizedState=i,Al());var h=a.queue;if(Tl(zg.bind(null,r,h,e),[e]),h.getSnapshot!==t||c||Ut!==null&&Ut.memoizedState.tag&At){r.flags|=Cr,Rl(At|Kt,kg.bind(null,r,h,i,t),void 0,null);var m=nf();if(m===null)throw new Error("Expected a work-in-progress root. This is a bug in React. Please file an issue.");Ts(m,Vi)||Ng(r,t,i)}return i}function Ng(e,t,n){e.flags|=ys;var r={getSnapshot:t,value:n},a=Qe.updateQueue;if(a===null)a=Ug(),Qe.updateQueue=a,a.stores=[r];else{var i=a.stores;i===null?a.stores=[r]:i.push(r)}}function kg(e,t,n,r){t.value=n,t.getSnapshot=r,Fg(t)&&Hg(e)}function zg(e,t,n){var r=function(){Fg(t)&&Hg(e)};return n(r)}function Fg(e){var t=e.getSnapshot,n=e.value;try{var r=t();return!Qn(n,r)}catch{return!0}}function Hg(e){var t=Ln(e,ve);t!==null&&Ft(t,e,ve,at)}function Dc(e){var t=Xr();typeof e=="function"&&(e=e()),t.memoizedState=t.baseState=e;var n={pending:null,interleaved:null,lanes:H,dispatch:null,lastRenderedReducer:Yp,lastRenderedState:e};t.queue=n;var r=n.dispatch=i0.bind(null,Qe,n);return[t.memoizedState,r]}function Qp(e){return Gp(Yp)}function Xp(e){return Ip(Yp)}function Rl(e,t,n,r){var a={tag:e,create:t,destroy:n,deps:r,next:null},i=Qe.updateQueue;if(i===null)i=Ug(),Qe.updateQueue=i,i.lastEffect=a.next=a;else{var o=i.lastEffect;if(o===null)i.lastEffect=a.next=a;else{var u=o.next;o.next=a,a.next=u,i.lastEffect=a}}return a}function Kp(e){var t=Xr();{var n={current:e};return t.memoizedState=n,n}}function wc(e){var t=fr();return t.memoizedState}function Cl(e,t,n,r){var a=Xr(),i=r===void 0?null:r;Qe.flags|=e,a.memoizedState=Rl(At|t,n,void 0,i)}function Oc(e,t,n,r){var a=fr(),i=r===void 0?null:r,o=void 0;if(Mt!==null){var u=Mt.memoizedState;if(o=u.destroy,i!==null){var c=u.deps;if($p(i,c)){a.memoizedState=Rl(t,n,o,i);return}}}Qe.flags|=e,a.memoizedState=Rl(At|t,n,o,i)}function _c(e,t){return(Qe.mode&qr)!==ie?Cl(gs|Cr|Wf,Kt,e,t):Cl(Cr|Wf,Kt,e,t)}function Tl(e,t){return Oc(Cr,Kt,e,t)}function Jp(e,t){return Cl(ke,Qr,e,t)}function Ac(e,t){return Oc(ke,Qr,e,t)}function Zp(e,t){var n=ke;return n|=Ci,(Qe.mode&qr)!==ie&&(n|=ha),Cl(n,Lt,e,t)}function Lc(e,t){return Oc(ke,Lt,e,t)}function jg(e,t){if(typeof t=="function"){var n=t,r=e();return n(r),function(){n(null)}}else if(t!=null){var a=t;a.hasOwnProperty("current")||f("Expected useImperativeHandle() first argument to either be a ref callback or React.createRef() object. Instead received: %s.","an object with keys {"+Object.keys(a).join(", ")+"}");var i=e();return a.current=i,function(){a.current=null}}}function ev(e,t,n){typeof t!="function"&&f("Expected useImperativeHandle() second argument to be a function that creates a handle. Instead received: %s.",t!==null?typeof t:"null");var r=n!=null?n.concat([e]):null,a=ke;return a|=Ci,(Qe.mode&qr)!==ie&&(a|=ha),Cl(a,Lt,jg.bind(null,t,e),r)}function Mc(e,t,n){typeof t!="function"&&f("Expected useImperativeHandle() second argument to be a function that creates a handle. Instead received: %s.",t!==null?typeof t:"null");var r=n!=null?n.concat([e]):null;return Oc(ke,Lt,jg.bind(null,t,e),r)}function t0(e,t){}var Uc=t0;function tv(e,t){var n=Xr(),r=t===void 0?null:t;return n.memoizedState=[e,r],e}function Nc(e,t){var n=fr(),r=t===void 0?null:t,a=n.memoizedState;if(a!==null&&r!==null){var i=a[1];if($p(r,i))return a[0]}return n.memoizedState=[e,r],e}function nv(e,t){var n=Xr(),r=t===void 0?null:t,a=e();return n.memoizedState=[a,r],a}function kc(e,t){var n=fr(),r=t===void 0?null:t,a=n.memoizedState;if(a!==null&&r!==null){var i=a[1];if($p(r,i))return a[0]}var o=e();return n.memoizedState=[o,r],o}function rv(e){var t=Xr();return t.memoizedState=e,e}function Vg(e){var t=fr(),n=Mt,r=n.memoizedState;return Pg(t,r,e)}function Bg(e){var t=fr();if(Mt===null)return t.memoizedState=e,e;var n=Mt.memoizedState;return Pg(t,n,e)}function Pg(e,t,n){var r=!VC(Vi);if(r){if(!Qn(n,t)){var a=Hm();Qe.lanes=Ee(Qe.lanes,a),Pl(a),e.baseState=!0}return t}else return e.baseState&&(e.baseState=!1,Al()),e.memoizedState=n,n}function n0(e,t,n){var r=xr();qt(QC(r,ga)),e(!0);var a=bl.transition;bl.transition={};var i=bl.transition;bl.transition._updatedFibers=new Set;try{e(!1),t()}finally{if(qt(r),bl.transition=a,a===null&&i._updatedFibers){var o=i._updatedFibers.size;o>10&&S("Detected a large number of updates inside startTransition. If this is due to a subscription please re-write it to use React provided hooks. Otherwise concurrent mode guarantees are off the table."),i._updatedFibers.clear()}}}function av(){var e=Dc(!1),t=e[0],n=e[1],r=n0.bind(null,n),a=Xr();return a.memoizedState=r,[t,r]}function $g(){var e=Qp(),t=e[0],n=fr(),r=n.memoizedState;return[t,r]}function Yg(){var e=Xp(),t=e[0],n=fr(),r=n.memoizedState;return[t,r]}var qg=!1;function r0(){return qg}function iv(){var e=Xr(),t=nf(),n=t.identifierPrefix,r;if(Xt()){var a=Sw();r=":"+n+"R"+a;var i=El++;i>0&&(r+="H"+i.toString(32)),r+=":"}else{var o=Jw++;r=":"+n+"r"+o.toString(32)+":"}return e.memoizedState=r,r}function zc(){var e=fr(),t=e.memoizedState;return t}function a0(e,t,n){typeof arguments[3]=="function"&&f("State updates from the useState() and useReducer() Hooks don't support the second callback argument. To execute a side effect after rendering, declare it in the component body with useEffect().");var r=ui(e),a={lane:r,action:n,hasEagerState:!1,eagerState:null,next:null};if(Gg(e))Ig(t,a);else{var i=Eg(e,t,a,r);if(i!==null){var o=Sn();Ft(i,e,r,o),Wg(i,t,r)}}Qg(e,r)}function i0(e,t,n){typeof arguments[3]=="function"&&f("State updates from the useState() and useReducer() Hooks don't support the second callback argument. To execute a side effect after rendering, declare it in the component body with useEffect().");var r=ui(e),a={lane:r,action:n,hasEagerState:!1,eagerState:null,next:null};if(Gg(e))Ig(t,a);else{var i=e.alternate;if(e.lanes===H&&(i===null||i.lanes===H)){var o=t.lastRenderedReducer;if(o!==null){var u;u=X.current,X.current=Ar;try{var c=t.lastRenderedState,h=o(c,n);if(a.hasEagerState=!0,a.eagerState=h,Qn(h,c)){$w(e,t,a,r);return}}catch{}finally{X.current=u}}}var m=Eg(e,t,a,r);if(m!==null){var R=Sn();Ft(m,e,r,R),Wg(m,t,r)}}Qg(e,r)}function Gg(e){var t=e.alternate;return e===Qe||t!==null&&t===Qe}function Ig(e,t){Sl=Tc=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function Wg(e,t,n){if(Fm(n)){var r=t.lanes;r=jm(r,e.pendingLanes);var a=Ee(r,n);t.lanes=a,Td(e,a)}}function Qg(e,t,n){Zf(e,t)}var Fc={readContext:Dt,useCallback:dn,useContext:dn,useEffect:dn,useImperativeHandle:dn,useInsertionEffect:dn,useLayoutEffect:dn,useMemo:dn,useReducer:dn,useRef:dn,useState:dn,useDebugValue:dn,useDeferredValue:dn,useTransition:dn,useMutableSource:dn,useSyncExternalStore:dn,useId:dn,unstable_isNewReconciler:It},Xg=null,Kg=null,Jg=null,Zg=null,Kr=null,Ar=null,Hc=null;{var ov=function(){f("Context can only be read while React is rendering. In classes, you can read it in the render method or getDerivedStateFromProps. In function components, you can read it directly in the function body, but not inside Hooks like useReducer() or useMemo().")},he=function(){f("Do not call Hooks inside useEffect(...), useMemo(...), or other built-in Hooks. You can only call Hooks at the top level of your React function. For more information, see https://reactjs.org/link/rules-of-hooks")};Xg={readContext:function(e){return Dt(e)},useCallback:function(e,t){return k="useCallback",$e(),Bo(t),tv(e,t)},useContext:function(e){return k="useContext",$e(),Dt(e)},useEffect:function(e,t){return k="useEffect",$e(),Bo(t),_c(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",$e(),Bo(n),ev(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",$e(),Bo(t),Jp(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",$e(),Bo(t),Zp(e,t)},useMemo:function(e,t){k="useMemo",$e(),Bo(t);var n=X.current;X.current=Kr;try{return nv(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",$e();var r=X.current;X.current=Kr;try{return qp(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",$e(),Kp(e)},useState:function(e){k="useState",$e();var t=X.current;X.current=Kr;try{return Dc(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",$e(),void 0},useDeferredValue:function(e){return k="useDeferredValue",$e(),rv(e)},useTransition:function(){return k="useTransition",$e(),av()},useMutableSource:function(e,t,n){return k="useMutableSource",$e(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",$e(),Wp(e,t,n)},useId:function(){return k="useId",$e(),iv()},unstable_isNewReconciler:It},Kg={readContext:function(e){return Dt(e)},useCallback:function(e,t){return k="useCallback",Y(),tv(e,t)},useContext:function(e){return k="useContext",Y(),Dt(e)},useEffect:function(e,t){return k="useEffect",Y(),_c(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",Y(),ev(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",Y(),Jp(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",Y(),Zp(e,t)},useMemo:function(e,t){k="useMemo",Y();var n=X.current;X.current=Kr;try{return nv(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",Y();var r=X.current;X.current=Kr;try{return qp(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",Y(),Kp(e)},useState:function(e){k="useState",Y();var t=X.current;X.current=Kr;try{return Dc(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",Y(),void 0},useDeferredValue:function(e){return k="useDeferredValue",Y(),rv(e)},useTransition:function(){return k="useTransition",Y(),av()},useMutableSource:function(e,t,n){return k="useMutableSource",Y(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",Y(),Wp(e,t,n)},useId:function(){return k="useId",Y(),iv()},unstable_isNewReconciler:It},Jg={readContext:function(e){return Dt(e)},useCallback:function(e,t){return k="useCallback",Y(),Nc(e,t)},useContext:function(e){return k="useContext",Y(),Dt(e)},useEffect:function(e,t){return k="useEffect",Y(),Tl(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",Y(),Mc(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",Y(),Ac(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",Y(),Lc(e,t)},useMemo:function(e,t){k="useMemo",Y();var n=X.current;X.current=Ar;try{return kc(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",Y();var r=X.current;X.current=Ar;try{return Gp(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",Y(),wc()},useState:function(e){k="useState",Y();var t=X.current;X.current=Ar;try{return Qp(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",Y(),Uc()},useDeferredValue:function(e){return k="useDeferredValue",Y(),Vg(e)},useTransition:function(){return k="useTransition",Y(),$g()},useMutableSource:function(e,t,n){return k="useMutableSource",Y(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",Y(),xc(e,t)},useId:function(){return k="useId",Y(),zc()},unstable_isNewReconciler:It},Zg={readContext:function(e){return Dt(e)},useCallback:function(e,t){return k="useCallback",Y(),Nc(e,t)},useContext:function(e){return k="useContext",Y(),Dt(e)},useEffect:function(e,t){return k="useEffect",Y(),Tl(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",Y(),Mc(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",Y(),Ac(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",Y(),Lc(e,t)},useMemo:function(e,t){k="useMemo",Y();var n=X.current;X.current=Hc;try{return kc(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",Y();var r=X.current;X.current=Hc;try{return Ip(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",Y(),wc()},useState:function(e){k="useState",Y();var t=X.current;X.current=Hc;try{return Xp(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",Y(),Uc()},useDeferredValue:function(e){return k="useDeferredValue",Y(),Bg(e)},useTransition:function(){return k="useTransition",Y(),Yg()},useMutableSource:function(e,t,n){return k="useMutableSource",Y(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",Y(),xc(e,t)},useId:function(){return k="useId",Y(),zc()},unstable_isNewReconciler:It},Kr={readContext:function(e){return ov(),Dt(e)},useCallback:function(e,t){return k="useCallback",he(),$e(),tv(e,t)},useContext:function(e){return k="useContext",he(),$e(),Dt(e)},useEffect:function(e,t){return k="useEffect",he(),$e(),_c(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",he(),$e(),ev(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",he(),$e(),Jp(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",he(),$e(),Zp(e,t)},useMemo:function(e,t){k="useMemo",he(),$e();var n=X.current;X.current=Kr;try{return nv(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",he(),$e();var r=X.current;X.current=Kr;try{return qp(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",he(),$e(),Kp(e)},useState:function(e){k="useState",he(),$e();var t=X.current;X.current=Kr;try{return Dc(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",he(),$e(),void 0},useDeferredValue:function(e){return k="useDeferredValue",he(),$e(),rv(e)},useTransition:function(){return k="useTransition",he(),$e(),av()},useMutableSource:function(e,t,n){return k="useMutableSource",he(),$e(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",he(),$e(),Wp(e,t,n)},useId:function(){return k="useId",he(),$e(),iv()},unstable_isNewReconciler:It},Ar={readContext:function(e){return ov(),Dt(e)},useCallback:function(e,t){return k="useCallback",he(),Y(),Nc(e,t)},useContext:function(e){return k="useContext",he(),Y(),Dt(e)},useEffect:function(e,t){return k="useEffect",he(),Y(),Tl(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",he(),Y(),Mc(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",he(),Y(),Ac(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",he(),Y(),Lc(e,t)},useMemo:function(e,t){k="useMemo",he(),Y();var n=X.current;X.current=Ar;try{return kc(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",he(),Y();var r=X.current;X.current=Ar;try{return Gp(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",he(),Y(),wc()},useState:function(e){k="useState",he(),Y();var t=X.current;X.current=Ar;try{return Qp(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",he(),Y(),Uc()},useDeferredValue:function(e){return k="useDeferredValue",he(),Y(),Vg(e)},useTransition:function(){return k="useTransition",he(),Y(),$g()},useMutableSource:function(e,t,n){return k="useMutableSource",he(),Y(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",he(),Y(),xc(e,t)},useId:function(){return k="useId",he(),Y(),zc()},unstable_isNewReconciler:It},Hc={readContext:function(e){return ov(),Dt(e)},useCallback:function(e,t){return k="useCallback",he(),Y(),Nc(e,t)},useContext:function(e){return k="useContext",he(),Y(),Dt(e)},useEffect:function(e,t){return k="useEffect",he(),Y(),Tl(e,t)},useImperativeHandle:function(e,t,n){return k="useImperativeHandle",he(),Y(),Mc(e,t,n)},useInsertionEffect:function(e,t){return k="useInsertionEffect",he(),Y(),Ac(e,t)},useLayoutEffect:function(e,t){return k="useLayoutEffect",he(),Y(),Lc(e,t)},useMemo:function(e,t){k="useMemo",he(),Y();var n=X.current;X.current=Ar;try{return kc(e,t)}finally{X.current=n}},useReducer:function(e,t,n){k="useReducer",he(),Y();var r=X.current;X.current=Ar;try{return Ip(e,t,n)}finally{X.current=r}},useRef:function(e){return k="useRef",he(),Y(),wc()},useState:function(e){k="useState",he(),Y();var t=X.current;X.current=Ar;try{return Xp(e)}finally{X.current=t}},useDebugValue:function(e,t){return k="useDebugValue",he(),Y(),Uc()},useDeferredValue:function(e){return k="useDeferredValue",he(),Y(),Bg(e)},useTransition:function(){return k="useTransition",he(),Y(),Yg()},useMutableSource:function(e,t,n){return k="useMutableSource",he(),Y(),void 0},useSyncExternalStore:function(e,t,n){return k="useSyncExternalStore",he(),Y(),xc(e,t)},useId:function(){return k="useId",he(),Y(),zc()},unstable_isNewReconciler:It}}var ri=s.unstable_now,eb=0,jc=-1,xl=-1,Vc=-1,uv=!1,Bc=!1;function tb(){return uv}function o0(){Bc=!0}function u0(){uv=!1,Bc=!1}function l0(){uv=Bc,Bc=!1}function nb(){return eb}function rb(){eb=ri()}function lv(e){xl=ri(),e.actualStartTime<0&&(e.actualStartTime=ri())}function ab(e){xl=-1}function Pc(e,t){if(xl>=0){var n=ri()-xl;e.actualDuration+=n,t&&(e.selfBaseDuration=n),xl=-1}}function Jr(e){if(jc>=0){var t=ri()-jc;jc=-1;for(var n=e.return;n!==null;){switch(n.tag){case F:var r=n.stateNode;r.effectDuration+=t;return;case Ke:var a=n.stateNode;a.effectDuration+=t;return}n=n.return}}}function sv(e){if(Vc>=0){var t=ri()-Vc;Vc=-1;for(var n=e.return;n!==null;){switch(n.tag){case F:var r=n.stateNode;r!==null&&(r.passiveEffectDuration+=t);return;case Ke:var a=n.stateNode;a!==null&&(a.passiveEffectDuration+=t);return}n=n.return}}}function Zr(){jc=ri()}function cv(){Vc=ri()}function fv(e){for(var t=e.child;t;)e.actualDuration+=t.actualDuration,t=t.sibling}function Lr(e,t){if(e&&e.defaultProps){var n=_e({},t),r=e.defaultProps;for(var a in r)n[a]===void 0&&(n[a]=r[a]);return n}return t}var dv={},pv,vv,hv,mv,yv,ib,$c,gv,bv,Sv,Dl;{pv=new Set,vv=new Set,hv=new Set,mv=new Set,gv=new Set,yv=new Set,bv=new Set,Sv=new Set,Dl=new Set;var ob=new Set;$c=function(e,t){if(!(e===null||typeof e=="function")){var n=t+"_"+e;ob.has(n)||(ob.add(n),f("%s(...): Expected the last optional `callback` argument to be a function. Instead received: %s.",t,e))}},ib=function(e,t){if(t===void 0){var n=ze(e)||"Component";yv.has(n)||(yv.add(n),f("%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. You have returned undefined.",n))}},Object.defineProperty(dv,"_processChildContext",{enumerable:!1,value:function(){throw new Error("_processChildContext is not available in React 16+. This likely means you have multiple copies of React and are attempting to nest a React 15 tree inside a React 16 tree using unstable_renderSubtreeIntoContainer, which isn't supported. Try to make sure you have only one copy of React (and ideally, switch to ReactDOM.createPortal).")}}),Object.freeze(dv)}function Ev(e,t,n,r){var a=e.memoizedState,i=n(r,a);{if(e.mode&vt){$t(!0);try{i=n(r,a)}finally{$t(!1)}}ib(t,i)}var o=i==null?a:_e({},a,i);if(e.memoizedState=o,e.lanes===H){var u=e.updateQueue;u.baseState=o}}var Rv={isMounted:ZR,enqueueSetState:function(e,t,n){var r=co(e),a=Sn(),i=ui(r),o=xa(a,i);o.payload=t,n!=null&&($c(n,"setState"),o.callback=n);var u=Za(r,o,i);u!==null&&(Ft(u,r,i,a),gc(u,r,i)),Zf(r,i)},enqueueReplaceState:function(e,t,n){var r=co(e),a=Sn(),i=ui(r),o=xa(a,i);o.tag=Cg,o.payload=t,n!=null&&($c(n,"replaceState"),o.callback=n);var u=Za(r,o,i);u!==null&&(Ft(u,r,i,a),gc(u,r,i)),Zf(r,i)},enqueueForceUpdate:function(e,t){var n=co(e),r=Sn(),a=ui(n),i=xa(r,a);i.tag=hc,t!=null&&($c(t,"forceUpdate"),i.callback=t);var o=Za(n,i,a);o!==null&&(Ft(o,n,a,r),gc(o,n,a)),AC(n,a)}};function ub(e,t,n,r,a,i,o){var u=e.stateNode;if(typeof u.shouldComponentUpdate=="function"){var c=u.shouldComponentUpdate(r,i,o);{if(e.mode&vt){$t(!0);try{c=u.shouldComponentUpdate(r,i,o)}finally{$t(!1)}}c===void 0&&f("%s.shouldComponentUpdate(): Returned undefined instead of a boolean value. Make sure to return true or false.",ze(t)||"Component")}return c}return t.prototype&&t.prototype.isPureReactComponent?!Wu(n,r)||!Wu(a,i):!0}function s0(e,t,n){var r=e.stateNode;{var a=ze(t)||"Component",i=r.render;i||(t.prototype&&typeof t.prototype.render=="function"?f("%s(...): No `render` method found on the returned component instance: did you accidentally return an object from the constructor?",a):f("%s(...): No `render` method found on the returned component instance: you may have forgotten to define `render`.",a)),r.getInitialState&&!r.getInitialState.isReactClassApproved&&!r.state&&f("getInitialState was defined on %s, a plain JavaScript class. This is only supported for classes created using React.createClass. Did you mean to define a state property instead?",a),r.getDefaultProps&&!r.getDefaultProps.isReactClassApproved&&f("getDefaultProps was defined on %s, a plain JavaScript class. This is only supported for classes created using React.createClass. Use a static property to define defaultProps instead.",a),r.propTypes&&f("propTypes was defined as an instance property on %s. Use a static property to define propTypes instead.",a),r.contextType&&f("contextType was defined as an instance property on %s. Use a static property to define contextType instead.",a),t.childContextTypes&&!Dl.has(t)&&(e.mode&vt)===ie&&(Dl.add(t),f(`%s uses the legacy childContextTypes API which is no longer supported and will be removed in the next major release. Use React.createContext() instead
+
+.Learn more about this warning here: https://reactjs.org/link/legacy-context`,a)),t.contextTypes&&!Dl.has(t)&&(e.mode&vt)===ie&&(Dl.add(t),f(`%s uses the legacy contextTypes API which is no longer supported and will be removed in the next major release. Use React.createContext() with static contextType instead.
+
+Learn more about this warning here: https://reactjs.org/link/legacy-context`,a)),r.contextTypes&&f("contextTypes was defined as an instance property on %s. Use a static property to define contextTypes instead.",a),t.contextType&&t.contextTypes&&!bv.has(t)&&(bv.add(t),f("%s declares both contextTypes and contextType static properties. The legacy contextTypes property will be ignored.",a)),typeof r.componentShouldUpdate=="function"&&f("%s has a method called componentShouldUpdate(). Did you mean shouldComponentUpdate()? The name is phrased as a question because the function is expected to return a value.",a),t.prototype&&t.prototype.isPureReactComponent&&typeof r.shouldComponentUpdate<"u"&&f("%s has a method called shouldComponentUpdate(). shouldComponentUpdate should not be used when extending React.PureComponent. Please extend React.Component if shouldComponentUpdate is used.",ze(t)||"A pure component"),typeof r.componentDidUnmount=="function"&&f("%s has a method called componentDidUnmount(). But there is no such lifecycle method. Did you mean componentWillUnmount()?",a),typeof r.componentDidReceiveProps=="function"&&f("%s has a method called componentDidReceiveProps(). But there is no such lifecycle method. If you meant to update the state in response to changing props, use componentWillReceiveProps(). If you meant to fetch data or run side-effects or mutations after React has updated the UI, use componentDidUpdate().",a),typeof r.componentWillRecieveProps=="function"&&f("%s has a method called componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",a),typeof r.UNSAFE_componentWillRecieveProps=="function"&&f("%s has a method called UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",a);var o=r.props!==n;r.props!==void 0&&o&&f("%s(...): When calling super() in `%s`, make sure to pass up the same props that your component's constructor was passed.",a,a),r.defaultProps&&f("Setting defaultProps as an instance property on %s is not supported and will be ignored. Instead, define defaultProps as a static property on %s.",a,a),typeof r.getSnapshotBeforeUpdate=="function"&&typeof r.componentDidUpdate!="function"&&!hv.has(t)&&(hv.add(t),f("%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). This component defines getSnapshotBeforeUpdate() only.",ze(t))),typeof r.getDerivedStateFromProps=="function"&&f("%s: getDerivedStateFromProps() is defined as an instance method and will be ignored. Instead, declare it as a static method.",a),typeof r.getDerivedStateFromError=="function"&&f("%s: getDerivedStateFromError() is defined as an instance method and will be ignored. Instead, declare it as a static method.",a),typeof t.getSnapshotBeforeUpdate=="function"&&f("%s: getSnapshotBeforeUpdate() is defined as a static method and will be ignored. Instead, declare it as an instance method.",a);var u=r.state;u&&(typeof u!="object"||Be(u))&&f("%s.state: must be set to an object or null",a),typeof r.getChildContext=="function"&&typeof t.childContextTypes!="object"&&f("%s.getChildContext(): childContextTypes must be defined in order to use getChildContext().",a)}}function lb(e,t){t.updater=Rv,e.stateNode=t,WR(t,e),t._reactInternalInstance=dv}function sb(e,t,n){var r=!1,a=Xn,i=Xn,o=t.contextType;if("contextType"in t){var u=o===null||o!==void 0&&o.$$typeof===Ae&&o._context===void 0;if(!u&&!Sv.has(t)){Sv.add(t);var c="";o===void 0?c=" However, it is set to undefined. This can be caused by a typo or by mixing up named and default imports. This can also happen due to a circular dependency, so try moving the createContext() call to a separate file.":typeof o!="object"?c=" However, it is set to a "+typeof o+".":o.$$typeof===oe?c=" Did you accidentally pass the Context.Provider instead?":o._context!==void 0?c=" Did you accidentally pass the Context.Consumer instead?":c=" However, it is set to an object with keys {"+Object.keys(o).join(", ")+"}.",f("%s defines an invalid contextType. contextType should point to the Context object returned by React.createContext().%s",ze(t)||"Component",c)}}if(typeof o=="object"&&o!==null)i=Dt(o);else{a=_o(e,t,!0);var h=t.contextTypes;r=h!=null,i=r?Ao(e,a):Xn}var m=new t(n,i);if(e.mode&vt){$t(!0);try{m=new t(n,i)}finally{$t(!1)}}var R=e.memoizedState=m.state!==null&&m.state!==void 0?m.state:null;lb(e,m);{if(typeof t.getDerivedStateFromProps=="function"&&R===null){var E=ze(t)||"Component";vv.has(E)||(vv.add(E),f("`%s` uses `getDerivedStateFromProps` but its initial state is %s. This is not recommended. Instead, define the initial state by assigning an object to `this.state` in the constructor of `%s`. This ensures that `getDerivedStateFromProps` arguments have a consistent shape.",E,m.state===null?"null":"undefined",E))}if(typeof t.getDerivedStateFromProps=="function"||typeof m.getSnapshotBeforeUpdate=="function"){var x=null,w=null,A=null;if(typeof m.componentWillMount=="function"&&m.componentWillMount.__suppressDeprecationWarning!==!0?x="componentWillMount":typeof m.UNSAFE_componentWillMount=="function"&&(x="UNSAFE_componentWillMount"),typeof m.componentWillReceiveProps=="function"&&m.componentWillReceiveProps.__suppressDeprecationWarning!==!0?w="componentWillReceiveProps":typeof m.UNSAFE_componentWillReceiveProps=="function"&&(w="UNSAFE_componentWillReceiveProps"),typeof m.componentWillUpdate=="function"&&m.componentWillUpdate.__suppressDeprecationWarning!==!0?A="componentWillUpdate":typeof m.UNSAFE_componentWillUpdate=="function"&&(A="UNSAFE_componentWillUpdate"),x!==null||w!==null||A!==null){var I=ze(t)||"Component",ae=typeof t.getDerivedStateFromProps=="function"?"getDerivedStateFromProps()":"getSnapshotBeforeUpdate()";mv.has(I)||(mv.add(I),f(`Unsafe legacy lifecycles will not be called for components using new component APIs.
+
+%s uses %s but also contains the following legacy lifecycles:%s%s%s
+
+The above lifecycles should be removed. Learn more about this warning here:
+https://reactjs.org/link/unsafe-component-lifecycles`,I,ae,x!==null?`
+  `+x:"",w!==null?`
+  `+w:"",A!==null?`
+  `+A:""))}}}return r&&Jy(e,a,i),m}function c0(e,t){var n=t.state;typeof t.componentWillMount=="function"&&t.componentWillMount(),typeof t.UNSAFE_componentWillMount=="function"&&t.UNSAFE_componentWillMount(),n!==t.state&&(f("%s.componentWillMount(): Assigning directly to this.state is deprecated (except inside a component's constructor). Use setState instead.",ye(e)||"Component"),Rv.enqueueReplaceState(t,t.state,null))}function cb(e,t,n,r){var a=t.state;if(typeof t.componentWillReceiveProps=="function"&&t.componentWillReceiveProps(n,r),typeof t.UNSAFE_componentWillReceiveProps=="function"&&t.UNSAFE_componentWillReceiveProps(n,r),t.state!==a){{var i=ye(e)||"Component";pv.has(i)||(pv.add(i),f("%s.componentWillReceiveProps(): Assigning directly to this.state is deprecated (except inside a component's constructor). Use setState instead.",i))}Rv.enqueueReplaceState(t,t.state,null)}}function Cv(e,t,n,r){s0(e,t,n);var a=e.stateNode;a.props=n,a.state=e.memoizedState,a.refs={},Mp(e);var i=t.contextType;if(typeof i=="object"&&i!==null)a.context=Dt(i);else{var o=_o(e,t,!0);a.context=Ao(e,o)}{if(a.state===n){var u=ze(t)||"Component";gv.has(u)||(gv.add(u),f("%s: It is not recommended to assign props directly to state because updates to props won't be reflected in state. In most cases, it is better to use props directly.",u))}e.mode&vt&&Or.recordLegacyContextWarning(e,a),Or.recordUnsafeLifecycleWarnings(e,a)}a.state=e.memoizedState;var c=t.getDerivedStateFromProps;if(typeof c=="function"&&(Ev(e,t,c,n),a.state=e.memoizedState),typeof t.getDerivedStateFromProps!="function"&&typeof a.getSnapshotBeforeUpdate!="function"&&(typeof a.UNSAFE_componentWillMount=="function"||typeof a.componentWillMount=="function")&&(c0(e,a),bc(e,n,a,r),a.state=e.memoizedState),typeof a.componentDidMount=="function"){var h=ke;h|=Ci,(e.mode&qr)!==ie&&(h|=ha),e.flags|=h}}function f0(e,t,n,r){var a=e.stateNode,i=e.memoizedProps;a.props=i;var o=a.context,u=t.contextType,c=Xn;if(typeof u=="object"&&u!==null)c=Dt(u);else{var h=_o(e,t,!0);c=Ao(e,h)}var m=t.getDerivedStateFromProps,R=typeof m=="function"||typeof a.getSnapshotBeforeUpdate=="function";!R&&(typeof a.UNSAFE_componentWillReceiveProps=="function"||typeof a.componentWillReceiveProps=="function")&&(i!==n||o!==c)&&cb(e,a,n,c),xg();var E=e.memoizedState,x=a.state=E;if(bc(e,n,a,r),x=e.memoizedState,i===n&&E===x&&!ec()&&!Sc()){if(typeof a.componentDidMount=="function"){var w=ke;w|=Ci,(e.mode&qr)!==ie&&(w|=ha),e.flags|=w}return!1}typeof m=="function"&&(Ev(e,t,m,n),x=e.memoizedState);var A=Sc()||ub(e,t,i,n,E,x,c);if(A){if(!R&&(typeof a.UNSAFE_componentWillMount=="function"||typeof a.componentWillMount=="function")&&(typeof a.componentWillMount=="function"&&a.componentWillMount(),typeof a.UNSAFE_componentWillMount=="function"&&a.UNSAFE_componentWillMount()),typeof a.componentDidMount=="function"){var I=ke;I|=Ci,(e.mode&qr)!==ie&&(I|=ha),e.flags|=I}}else{if(typeof a.componentDidMount=="function"){var ae=ke;ae|=Ci,(e.mode&qr)!==ie&&(ae|=ha),e.flags|=ae}e.memoizedProps=n,e.memoizedState=x}return a.props=n,a.state=x,a.context=c,A}function d0(e,t,n,r,a){var i=t.stateNode;Tg(e,t);var o=t.memoizedProps,u=t.type===t.elementType?o:Lr(t.type,o);i.props=u;var c=t.pendingProps,h=i.context,m=n.contextType,R=Xn;if(typeof m=="object"&&m!==null)R=Dt(m);else{var E=_o(t,n,!0);R=Ao(t,E)}var x=n.getDerivedStateFromProps,w=typeof x=="function"||typeof i.getSnapshotBeforeUpdate=="function";!w&&(typeof i.UNSAFE_componentWillReceiveProps=="function"||typeof i.componentWillReceiveProps=="function")&&(o!==c||h!==R)&&cb(t,i,r,R),xg();var A=t.memoizedState,I=i.state=A;if(bc(t,r,i,a),I=t.memoizedState,o===c&&A===I&&!ec()&&!Sc()&&!jr)return typeof i.componentDidUpdate=="function"&&(o!==e.memoizedProps||A!==e.memoizedState)&&(t.flags|=ke),typeof i.getSnapshotBeforeUpdate=="function"&&(o!==e.memoizedProps||A!==e.memoizedState)&&(t.flags|=Ei),!1;typeof x=="function"&&(Ev(t,n,x,r),I=t.memoizedState);var ae=Sc()||ub(t,n,u,r,A,I,R)||jr;return ae?(!w&&(typeof i.UNSAFE_componentWillUpdate=="function"||typeof i.componentWillUpdate=="function")&&(typeof i.componentWillUpdate=="function"&&i.componentWillUpdate(r,I,R),typeof i.UNSAFE_componentWillUpdate=="function"&&i.UNSAFE_componentWillUpdate(r,I,R)),typeof i.componentDidUpdate=="function"&&(t.flags|=ke),typeof i.getSnapshotBeforeUpdate=="function"&&(t.flags|=Ei)):(typeof i.componentDidUpdate=="function"&&(o!==e.memoizedProps||A!==e.memoizedState)&&(t.flags|=ke),typeof i.getSnapshotBeforeUpdate=="function"&&(o!==e.memoizedProps||A!==e.memoizedState)&&(t.flags|=Ei),t.memoizedProps=r,t.memoizedState=I),i.props=r,i.state=I,i.context=R,ae}function Bi(e,t){return{value:e,source:t,stack:pu(t),digest:null}}function Tv(e,t,n){return{value:e,source:null,stack:n??null,digest:t??null}}function p0(e,t){return!0}function xv(e,t){try{var n=p0(e,t);if(n===!1)return;var r=t.value,a=t.source,i=t.stack,o=i!==null?i:"";if(r!=null&&r._suppressLogging){if(e.tag===U)return;console.error(r)}var u=a?ye(a):null,c=u?"The above error occurred in the <"+u+"> component:":"The above error occurred in one of your React components:",h;if(e.tag===F)h=`Consider adding an error boundary to your tree to customize error handling behavior.
+Visit https://reactjs.org/link/error-boundaries to learn more about error boundaries.`;else{var m=ye(e)||"Anonymous";h="React will try to recreate this component tree from scratch "+("using the error boundary you provided, "+m+".")}var R=c+`
+`+o+`
+
+`+(""+h);console.error(R)}catch(E){setTimeout(function(){throw E})}}var v0=typeof WeakMap=="function"?WeakMap:Map;function fb(e,t,n){var r=xa(at,n);r.tag=Ap,r.payload={element:null};var a=t.value;return r.callback=function(){o_(a),xv(e,t)},r}function Dv(e,t,n){var r=xa(at,n);r.tag=Ap;var a=e.type.getDerivedStateFromError;if(typeof a=="function"){var i=t.value;r.payload=function(){return a(i)},r.callback=function(){RS(e),xv(e,t)}}var o=e.stateNode;return o!==null&&typeof o.componentDidCatch=="function"&&(r.callback=function(){RS(e),xv(e,t),typeof a!="function"&&a_(this);var c=t.value,h=t.stack;this.componentDidCatch(c,{componentStack:h!==null?h:""}),typeof a!="function"&&(Gn(e.lanes,ve)||f("%s: Error boundaries should implement getDerivedStateFromError(). In that method, return a state update to display an error message or fallback UI.",ye(e)||"Unknown"))}),r}function db(e,t,n){var r=e.pingCache,a;if(r===null?(r=e.pingCache=new v0,a=new Set,r.set(t,a)):(a=r.get(t),a===void 0&&(a=new Set,r.set(t,a))),!a.has(n)){a.add(n);var i=u_.bind(null,e,t,n);Tr&&$l(e,n),t.then(i,i)}}function h0(e,t,n,r){var a=e.updateQueue;if(a===null){var i=new Set;i.add(n),e.updateQueue=i}else a.add(n)}function m0(e,t){var n=e.tag;if((e.mode&Me)===ie&&(n===z||n===ne||n===ge)){var r=e.alternate;r?(e.updateQueue=r.updateQueue,e.memoizedState=r.memoizedState,e.lanes=r.lanes):(e.updateQueue=null,e.memoizedState=null)}}function pb(e){var t=e;do{if(t.tag===de&&Xw(t))return t;t=t.return}while(t!==null);return null}function vb(e,t,n,r,a){if((e.mode&Me)===ie){if(e===t)e.flags|=yn;else{if(e.flags|=Pe,n.flags|=Gf,n.flags&=~(QR|xu),n.tag===U){var i=n.alternate;if(i===null)n.tag=Cn;else{var o=xa(at,ve);o.tag=hc,Za(n,o,ve)}}n.lanes=Ee(n.lanes,ve)}return e}return e.flags|=yn,e.lanes=a,e}function y0(e,t,n,r,a){if(n.flags|=xu,Tr&&$l(e,a),r!==null&&typeof r=="object"&&typeof r.then=="function"){var i=r;m0(n),Xt()&&n.mode&Me&&ig();var o=pb(t);if(o!==null){o.flags&=~pa,vb(o,t,n,e,a),o.mode&Me&&db(e,i,a),h0(o,e,i);return}else{if(!jC(a)){db(e,i,a),ih();return}var u=new Error("A component suspended while responding to synchronous input. This will cause the UI to be replaced with a loading indicator. To fix, updates that suspend should be wrapped with startTransition.");r=u}}else if(Xt()&&n.mode&Me){ig();var c=pb(t);if(c!==null){(c.flags&yn)===ue&&(c.flags|=pa),vb(c,t,n,e,a),gp(Bi(r,n));return}}r=Bi(r,n),XO(r);var h=t;do{switch(h.tag){case F:{var m=r;h.flags|=yn;var R=Uu(a);h.lanes=Ee(h.lanes,R);var E=fb(h,m,R);Up(h,E);return}case U:var x=r,w=h.type,A=h.stateNode;if((h.flags&Pe)===ue&&(typeof w.getDerivedStateFromError=="function"||A!==null&&typeof A.componentDidCatch=="function"&&!pS(A))){h.flags|=yn;var I=Uu(a);h.lanes=Ee(h.lanes,I);var ae=Dv(h,x,I);Up(h,ae);return}break}h=h.return}while(h!==null)}function g0(){return null}var wl=p.ReactCurrentOwner,Mr=!1,wv,Ol,Ov,_v,Av,Pi,Lv,Yc,_l;wv={},Ol={},Ov={},_v={},Av={},Pi=!1,Lv={},Yc={},_l={};function gn(e,t,n,r){e===null?t.child=yg(t,null,n,r):t.child=No(t,e.child,n,r)}function b0(e,t,n,r){t.child=No(t,e.child,null,r),t.child=No(t,null,n,r)}function hb(e,t,n,r,a){if(t.type!==t.elementType){var i=n.propTypes;i&&Dr(i,r,"prop",ze(n))}var o=n.render,u=t.ref,c,h;zo(t,a),wu(t);{if(wl.current=t,Yn(!0),c=Po(e,t,o,r,u,a),h=$o(),t.mode&vt){$t(!0);try{c=Po(e,t,o,r,u,a),h=$o()}finally{$t(!1)}}Yn(!1)}return ho(),e!==null&&!Mr?(Lg(e,t,a),Da(e,t,a)):(Xt()&&h&&dp(t),t.flags|=fo,gn(e,t,c,a),t.child)}function mb(e,t,n,r,a){if(e===null){var i=n.type;if(T_(i)&&n.compare===null&&n.defaultProps===void 0){var o=i;return o=Ko(i),t.tag=ge,t.type=o,Nv(t,i),yb(e,t,o,r,a)}{var u=i.propTypes;if(u&&Dr(u,r,"prop",ze(i)),n.defaultProps!==void 0){var c=ze(i)||"Unknown";_l[c]||(f("%s: Support for defaultProps will be removed from memo components in a future major release. Use JavaScript default parameters instead.",c),_l[c]=!0)}}var h=mh(n.type,null,r,t,t.mode,a);return h.ref=t.ref,h.return=t,t.child=h,h}{var m=n.type,R=m.propTypes;R&&Dr(R,r,"prop",ze(m))}var E=e.child,x=Vv(e,a);if(!x){var w=E.memoizedProps,A=n.compare;if(A=A!==null?A:Wu,A(w,r)&&e.ref===t.ref)return Da(e,t,a)}t.flags|=fo;var I=Ii(E,r);return I.ref=t.ref,I.return=t,t.child=I,I}function yb(e,t,n,r,a){if(t.type!==t.elementType){var i=t.elementType;if(i.$$typeof===we){var o=i,u=o._payload,c=o._init;try{i=c(u)}catch{i=null}var h=i&&i.propTypes;h&&Dr(h,r,"prop",ze(i))}}if(e!==null){var m=e.memoizedProps;if(Wu(m,r)&&e.ref===t.ref&&t.type===e.type)if(Mr=!1,t.pendingProps=r=m,Vv(e,a))(e.flags&Gf)!==ue&&(Mr=!0);else return t.lanes=e.lanes,Da(e,t,a)}return Mv(e,t,n,r,a)}function gb(e,t,n){var r=t.pendingProps,a=r.children,i=e!==null?e.memoizedState:null;if(r.mode==="hidden"||er)if((t.mode&Me)===ie){var o={baseLanes:H,cachePool:null,transitions:null};t.memoizedState=o,rf(t,n)}else if(Gn(n,qn)){var R={baseLanes:H,cachePool:null,transitions:null};t.memoizedState=R;var E=i!==null?i.baseLanes:n;rf(t,E)}else{var u=null,c;if(i!==null){var h=i.baseLanes;c=Ee(h,n)}else c=n;t.lanes=t.childLanes=qn;var m={baseLanes:c,cachePool:u,transitions:null};return t.memoizedState=m,t.updateQueue=null,rf(t,c),null}else{var x;i!==null?(x=Ee(i.baseLanes,n),t.memoizedState=null):x=n,rf(t,x)}return gn(e,t,a,n),t.child}function S0(e,t,n){var r=t.pendingProps;return gn(e,t,r,n),t.child}function E0(e,t,n){var r=t.pendingProps.children;return gn(e,t,r,n),t.child}function R0(e,t,n){{t.flags|=ke;{var r=t.stateNode;r.effectDuration=0,r.passiveEffectDuration=0}}var a=t.pendingProps,i=a.children;return gn(e,t,i,n),t.child}function bb(e,t){var n=t.ref;(e===null&&n!==null||e!==null&&e.ref!==n)&&(t.flags|=Ba,t.flags|=If)}function Mv(e,t,n,r,a){if(t.type!==t.elementType){var i=n.propTypes;i&&Dr(i,r,"prop",ze(n))}var o;{var u=_o(t,n,!0);o=Ao(t,u)}var c,h;zo(t,a),wu(t);{if(wl.current=t,Yn(!0),c=Po(e,t,n,r,o,a),h=$o(),t.mode&vt){$t(!0);try{c=Po(e,t,n,r,o,a),h=$o()}finally{$t(!1)}}Yn(!1)}return ho(),e!==null&&!Mr?(Lg(e,t,a),Da(e,t,a)):(Xt()&&h&&dp(t),t.flags|=fo,gn(e,t,c,a),t.child)}function Sb(e,t,n,r,a){{switch(j_(t)){case!1:{var i=t.stateNode,o=t.type,u=new o(t.memoizedProps,i.context),c=u.state;i.updater.enqueueSetState(i,c,null);break}case!0:{t.flags|=Pe,t.flags|=yn;var h=new Error("Simulated error coming from DevTools"),m=Uu(a);t.lanes=Ee(t.lanes,m);var R=Dv(t,Bi(h,t),m);Up(t,R);break}}if(t.type!==t.elementType){var E=n.propTypes;E&&Dr(E,r,"prop",ze(n))}}var x;Wr(n)?(x=!0,nc(t)):x=!1,zo(t,a);var w=t.stateNode,A;w===null?(Gc(e,t),sb(t,n,r),Cv(t,n,r,a),A=!0):e===null?A=f0(t,n,r,a):A=d0(e,t,n,r,a);var I=Uv(e,t,n,A,x,a);{var ae=t.stateNode;A&&ae.props!==r&&(Pi||f("It looks like %s is reassigning its own `this.props` while rendering. This is not supported and can lead to confusing bugs.",ye(t)||"a component"),Pi=!0)}return I}function Uv(e,t,n,r,a,i){bb(e,t);var o=(t.flags&Pe)!==ue;if(!r&&!o)return a&&tg(t,n,!1),Da(e,t,i);var u=t.stateNode;wl.current=t;var c;if(o&&typeof n.getDerivedStateFromError!="function")c=null,ab();else{wu(t);{if(Yn(!0),c=u.render(),t.mode&vt){$t(!0);try{u.render()}finally{$t(!1)}}Yn(!1)}ho()}return t.flags|=fo,e!==null&&o?b0(e,t,c,i):gn(e,t,c,i),t.memoizedState=u.state,a&&tg(t,n,!0),t.child}function Eb(e){var t=e.stateNode;t.pendingContext?Zy(e,t.pendingContext,t.pendingContext!==t.context):t.context&&Zy(e,t.context,!1),Np(e,t.containerInfo)}function C0(e,t,n){if(Eb(t),e===null)throw new Error("Should have a current fiber. This is a bug in React.");var r=t.pendingProps,a=t.memoizedState,i=a.element;Tg(e,t),bc(t,r,null,n);var o=t.memoizedState;t.stateNode;var u=o.element;if(a.isDehydrated){var c={element:u,isDehydrated:!1,cache:o.cache,pendingSuspenseBoundaries:o.pendingSuspenseBoundaries,transitions:o.transitions},h=t.updateQueue;if(h.baseState=c,t.memoizedState=c,t.flags&pa){var m=Bi(new Error("There was an error while hydrating. Because the error happened outside of a Suspense boundary, the entire root will switch to client rendering."),t);return Rb(e,t,u,n,m)}else if(u!==i){var R=Bi(new Error("This root received an early update, before anything was able hydrate. Switched the entire root to client rendering."),t);return Rb(e,t,u,n,R)}else{Dw(t);var E=yg(t,null,u,n);t.child=E;for(var x=E;x;)x.flags=x.flags&~xt|va,x=x.sibling}}else{if(Uo(),u===i)return Da(e,t,n);gn(e,t,u,n)}return t.child}function Rb(e,t,n,r,a){return Uo(),gp(a),t.flags|=pa,gn(e,t,n,r),t.child}function T0(e,t,n){Og(t),e===null&&yp(t);var r=t.type,a=t.pendingProps,i=e!==null?e.memoizedProps:null,o=a.children,u=Jd(r,a);return u?o=null:i!==null&&Jd(r,i)&&(t.flags|=Tu),bb(e,t),gn(e,t,o,n),t.child}function x0(e,t){return e===null&&yp(t),null}function D0(e,t,n,r){Gc(e,t);var a=t.pendingProps,i=n,o=i._payload,u=i._init,c=u(o);t.type=c;var h=t.tag=x_(c),m=Lr(c,a),R;switch(h){case z:return Nv(t,c),t.type=c=Ko(c),R=Mv(null,t,c,m,r),R;case U:return t.type=c=ch(c),R=Sb(null,t,c,m,r),R;case ne:return t.type=c=fh(c),R=hb(null,t,c,m,r),R;case Fe:{if(t.type!==t.elementType){var E=c.propTypes;E&&Dr(E,m,"prop",ze(c))}return R=mb(null,t,c,Lr(c.type,m),r),R}}var x="";throw c!==null&&typeof c=="object"&&c.$$typeof===we&&(x=" Did you wrap a component in React.lazy() more than once?"),new Error("Element type is invalid. Received a promise that resolves to: "+c+". "+("Lazy element type must resolve to a class or function."+x))}function w0(e,t,n,r,a){Gc(e,t),t.tag=U;var i;return Wr(n)?(i=!0,nc(t)):i=!1,zo(t,a),sb(t,n,r),Cv(t,n,r,a),Uv(null,t,n,!0,i,a)}function O0(e,t,n,r){Gc(e,t);var a=t.pendingProps,i;{var o=_o(t,n,!1);i=Ao(t,o)}zo(t,r);var u,c;wu(t);{if(n.prototype&&typeof n.prototype.render=="function"){var h=ze(n)||"Unknown";wv[h]||(f("The <%s /> component appears to have a render method, but doesn't extend React.Component. This is likely to cause errors. Change %s to extend React.Component instead.",h,h),wv[h]=!0)}t.mode&vt&&Or.recordLegacyContextWarning(t,null),Yn(!0),wl.current=t,u=Po(null,t,n,a,i,r),c=$o(),Yn(!1)}if(ho(),t.flags|=fo,typeof u=="object"&&u!==null&&typeof u.render=="function"&&u.$$typeof===void 0){var m=ze(n)||"Unknown";Ol[m]||(f("The <%s /> component appears to be a function component that returns a class instance. Change %s to a class that extends React.Component instead. If you can't use a class try assigning the prototype on the function as a workaround. `%s.prototype = React.Component.prototype`. Don't use an arrow function since it cannot be called with `new` by React.",m,m,m),Ol[m]=!0)}if(typeof u=="object"&&u!==null&&typeof u.render=="function"&&u.$$typeof===void 0){{var R=ze(n)||"Unknown";Ol[R]||(f("The <%s /> component appears to be a function component that returns a class instance. Change %s to a class that extends React.Component instead. If you can't use a class try assigning the prototype on the function as a workaround. `%s.prototype = React.Component.prototype`. Don't use an arrow function since it cannot be called with `new` by React.",R,R,R),Ol[R]=!0)}t.tag=U,t.memoizedState=null,t.updateQueue=null;var E=!1;return Wr(n)?(E=!0,nc(t)):E=!1,t.memoizedState=u.state!==null&&u.state!==void 0?u.state:null,Mp(t),lb(t,u),Cv(t,n,a,r),Uv(null,t,n,!0,E,r)}else{if(t.tag=z,t.mode&vt){$t(!0);try{u=Po(null,t,n,a,i,r),c=$o()}finally{$t(!1)}}return Xt()&&c&&dp(t),gn(null,t,u,r),Nv(t,n),t.child}}function Nv(e,t){{if(t&&t.childContextTypes&&f("%s(...): childContextTypes cannot be defined on a function component.",t.displayName||t.name||"Component"),e.ref!==null){var n="",r=Fa();r&&(n+=`
+
+Check the render method of \``+r+"`.");var a=r||"",i=e._debugSource;i&&(a=i.fileName+":"+i.lineNumber),Av[a]||(Av[a]=!0,f("Function components cannot be given refs. Attempts to access this ref will fail. Did you mean to use React.forwardRef()?%s",n))}if(t.defaultProps!==void 0){var o=ze(t)||"Unknown";_l[o]||(f("%s: Support for defaultProps will be removed from function components in a future major release. Use JavaScript default parameters instead.",o),_l[o]=!0)}if(typeof t.getDerivedStateFromProps=="function"){var u=ze(t)||"Unknown";_v[u]||(f("%s: Function components do not support getDerivedStateFromProps.",u),_v[u]=!0)}if(typeof t.contextType=="object"&&t.contextType!==null){var c=ze(t)||"Unknown";Ov[c]||(f("%s: Function components do not support contextType.",c),Ov[c]=!0)}}}var kv={dehydrated:null,treeContext:null,retryLane:Yt};function zv(e){return{baseLanes:e,cachePool:g0(),transitions:null}}function _0(e,t){var n=null;return{baseLanes:Ee(e.baseLanes,t),cachePool:n,transitions:e.transitions}}function A0(e,t,n,r){if(t!==null){var a=t.memoizedState;if(a===null)return!1}return Fp(e,gl)}function L0(e,t){return xs(e.childLanes,t)}function Cb(e,t,n){var r=t.pendingProps;V_(t)&&(t.flags|=Pe);var a=_r.current,i=!1,o=(t.flags&Pe)!==ue;if(o||A0(a,e)?(i=!0,t.flags&=~Pe):(e===null||e.memoizedState!==null)&&(a=Qw(a,Ag)),a=Ho(a),ti(t,a),e===null){yp(t);var u=t.memoizedState;if(u!==null){var c=u.dehydrated;if(c!==null)return z0(t,c)}var h=r.children,m=r.fallback;if(i){var R=M0(t,h,m,n),E=t.child;return E.memoizedState=zv(n),t.memoizedState=kv,R}else return Fv(t,h)}else{var x=e.memoizedState;if(x!==null){var w=x.dehydrated;if(w!==null)return F0(e,t,o,r,w,x,n)}if(i){var A=r.fallback,I=r.children,ae=N0(e,t,I,A,n),te=t.child,Ne=e.child.memoizedState;return te.memoizedState=Ne===null?zv(n):_0(Ne,n),te.childLanes=L0(e,n),t.memoizedState=kv,ae}else{var Oe=r.children,C=U0(e,t,Oe,n);return t.memoizedState=null,C}}}function Fv(e,t,n){var r=e.mode,a={mode:"visible",children:t},i=Hv(a,r);return i.return=e,e.child=i,i}function M0(e,t,n,r){var a=e.mode,i=e.child,o={mode:"hidden",children:t},u,c;return(a&Me)===ie&&i!==null?(u=i,u.childLanes=H,u.pendingProps=o,e.mode&We&&(u.actualDuration=0,u.actualStartTime=-1,u.selfBaseDuration=0,u.treeBaseDuration=0),c=si(n,a,r,null)):(u=Hv(o,a),c=si(n,a,r,null)),u.return=e,c.return=e,u.sibling=c,e.child=u,c}function Hv(e,t,n){return TS(e,t,H,null)}function Tb(e,t){return Ii(e,t)}function U0(e,t,n,r){var a=e.child,i=a.sibling,o=Tb(a,{mode:"visible",children:n});if((t.mode&Me)===ie&&(o.lanes=r),o.return=t,o.sibling=null,i!==null){var u=t.deletions;u===null?(t.deletions=[i],t.flags|=Si):u.push(i)}return t.child=o,o}function N0(e,t,n,r,a){var i=t.mode,o=e.child,u=o.sibling,c={mode:"hidden",children:n},h;if((i&Me)===ie&&t.child!==o){var m=t.child;h=m,h.childLanes=H,h.pendingProps=c,t.mode&We&&(h.actualDuration=0,h.actualStartTime=-1,h.selfBaseDuration=o.selfBaseDuration,h.treeBaseDuration=o.treeBaseDuration),t.deletions=null}else h=Tb(o,c),h.subtreeFlags=o.subtreeFlags&ma;var R;return u!==null?R=Ii(u,r):(R=si(r,i,a,null),R.flags|=xt),R.return=t,h.return=t,h.sibling=R,t.child=h,R}function qc(e,t,n,r){r!==null&&gp(r),No(t,e.child,null,n);var a=t.pendingProps,i=a.children,o=Fv(t,i);return o.flags|=xt,t.memoizedState=null,o}function k0(e,t,n,r,a){var i=t.mode,o={mode:"visible",children:n},u=Hv(o,i),c=si(r,i,a,null);return c.flags|=xt,u.return=t,c.return=t,u.sibling=c,t.child=u,(t.mode&Me)!==ie&&No(t,e.child,null,a),c}function z0(e,t,n){return(e.mode&Me)===ie?(f("Cannot hydrate Suspense in legacy mode. Switch from ReactDOM.hydrate(element, container) to ReactDOMClient.hydrateRoot(container, <App />).render(element) or remove the Suspense components from the server rendered components."),e.lanes=ve):np(t)?e.lanes=Di:e.lanes=qn,null}function F0(e,t,n,r,a,i,o){if(n)if(t.flags&pa){t.flags&=~pa;var C=Tv(new Error("There was an error while hydrating this Suspense boundary. Switched to client rendering."));return qc(e,t,o,C)}else{if(t.memoizedState!==null)return t.child=e.child,t.flags|=Pe,null;var L=r.children,T=r.fallback,V=k0(e,t,L,T,o),K=t.child;return K.memoizedState=zv(o),t.memoizedState=kv,V}else{if(Tw(),(t.mode&Me)===ie)return qc(e,t,o,null);if(np(a)){var u,c,h;{var m=BD(a);u=m.digest,c=m.message,h=m.stack}var R;c?R=new Error(c):R=new Error("The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering.");var E=Tv(R,u,h);return qc(e,t,o,E)}var x=Gn(o,e.childLanes);if(Mr||x){var w=nf();if(w!==null){var A=IC(w,o);if(A!==Yt&&A!==i.retryLane){i.retryLane=A;var I=at;Ln(e,A),Ft(w,e,A,I)}}ih();var ae=Tv(new Error("This Suspense boundary received an update before it finished hydrating. This caused the boundary to switch to client rendering. The usual way to fix this is to wrap the original update in startTransition."));return qc(e,t,o,ae)}else if(Iy(a)){t.flags|=Pe,t.child=e.child;var te=l_.bind(null,e);return PD(a,te),null}else{ww(t,a,i.treeContext);var Ne=r.children,Oe=Fv(t,Ne);return Oe.flags|=va,Oe}}}function xb(e,t,n){e.lanes=Ee(e.lanes,t);var r=e.alternate;r!==null&&(r.lanes=Ee(r.lanes,t)),Op(e.return,t,n)}function H0(e,t,n){for(var r=t;r!==null;){if(r.tag===de){var a=r.memoizedState;a!==null&&xb(r,n,e)}else if(r.tag===rt)xb(r,n,e);else if(r.child!==null){r.child.return=r,r=r.child;continue}if(r===e)return;for(;r.sibling===null;){if(r.return===null||r.return===e)return;r=r.return}r.sibling.return=r.return,r=r.sibling}}function j0(e){for(var t=e,n=null;t!==null;){var r=t.alternate;r!==null&&Cc(r)===null&&(n=t),t=t.sibling}return n}function V0(e){if(e!==void 0&&e!=="forwards"&&e!=="backwards"&&e!=="together"&&!Lv[e])if(Lv[e]=!0,typeof e=="string")switch(e.toLowerCase()){case"together":case"forwards":case"backwards":{f('"%s" is not a valid value for revealOrder on <SuspenseList />. Use lowercase "%s" instead.',e,e.toLowerCase());break}case"forward":case"backward":{f('"%s" is not a valid value for revealOrder on <SuspenseList />. React uses the -s suffix in the spelling. Use "%ss" instead.',e,e.toLowerCase());break}default:f('"%s" is not a supported revealOrder on <SuspenseList />. Did you mean "together", "forwards" or "backwards"?',e);break}else f('%s is not a supported value for revealOrder on <SuspenseList />. Did you mean "together", "forwards" or "backwards"?',e)}function B0(e,t){e!==void 0&&!Yc[e]&&(e!=="collapsed"&&e!=="hidden"?(Yc[e]=!0,f('"%s" is not a supported value for tail on <SuspenseList />. Did you mean "collapsed" or "hidden"?',e)):t!=="forwards"&&t!=="backwards"&&(Yc[e]=!0,f('<SuspenseList tail="%s" /> is only valid if revealOrder is "forwards" or "backwards". Did you mean to specify revealOrder="forwards"?',e)))}function Db(e,t){{var n=Be(e),r=!n&&typeof ua(e)=="function";if(n||r){var a=n?"array":"iterable";return f("A nested %s was passed to row #%s in <SuspenseList />. Wrap it in an additional SuspenseList to configure its revealOrder: <SuspenseList revealOrder=...> ... <SuspenseList revealOrder=...>{%s}</SuspenseList> ... </SuspenseList>",a,t,a),!1}}return!0}function P0(e,t){if((t==="forwards"||t==="backwards")&&e!==void 0&&e!==null&&e!==!1)if(Be(e)){for(var n=0;n<e.length;n++)if(!Db(e[n],n))return}else{var r=ua(e);if(typeof r=="function"){var a=r.call(e);if(a)for(var i=a.next(),o=0;!i.done;i=a.next()){if(!Db(i.value,o))return;o++}}else f('A single row was passed to a <SuspenseList revealOrder="%s" />. This is not useful since it needs multiple rows. Did you mean to pass multiple children or an array?',t)}}function jv(e,t,n,r,a){var i=e.memoizedState;i===null?e.memoizedState={isBackwards:t,rendering:null,renderingStartTime:0,last:r,tail:n,tailMode:a}:(i.isBackwards=t,i.rendering=null,i.renderingStartTime=0,i.last=r,i.tail=n,i.tailMode=a)}function wb(e,t,n){var r=t.pendingProps,a=r.revealOrder,i=r.tail,o=r.children;V0(a),B0(i,a),P0(o,a),gn(e,t,o,n);var u=_r.current,c=Fp(u,gl);if(c)u=Hp(u,gl),t.flags|=Pe;else{var h=e!==null&&(e.flags&Pe)!==ue;h&&H0(t,t.child,n),u=Ho(u)}if(ti(t,u),(t.mode&Me)===ie)t.memoizedState=null;else switch(a){case"forwards":{var m=j0(t.child),R;m===null?(R=t.child,t.child=null):(R=m.sibling,m.sibling=null),jv(t,!1,R,m,i);break}case"backwards":{var E=null,x=t.child;for(t.child=null;x!==null;){var w=x.alternate;if(w!==null&&Cc(w)===null){t.child=x;break}var A=x.sibling;x.sibling=E,E=x,x=A}jv(t,!0,E,null,i);break}case"together":{jv(t,!1,null,null,void 0);break}default:t.memoizedState=null}return t.child}function $0(e,t,n){Np(t,t.stateNode.containerInfo);var r=t.pendingProps;return e===null?t.child=No(t,null,r,n):gn(e,t,r,n),t.child}var Ob=!1;function Y0(e,t,n){var r=t.type,a=r._context,i=t.pendingProps,o=t.memoizedProps,u=i.value;{"value"in i||Ob||(Ob=!0,f("The `value` prop is required for the `<Context.Provider>`. Did you misspell it or forget to pass it?"));var c=t.type.propTypes;c&&Dr(c,i,"prop","Context.Provider")}if(Sg(t,a,u),o!==null){var h=o.value;if(Qn(h,u)){if(o.children===i.children&&!ec())return Da(e,t,n)}else Vw(t,a,n)}var m=i.children;return gn(e,t,m,n),t.child}var _b=!1;function q0(e,t,n){var r=t.type;r._context===void 0?r!==r.Consumer&&(_b||(_b=!0,f("Rendering <Context> directly is not supported and will be removed in a future major release. Did you mean to render <Context.Consumer> instead?"))):r=r._context;var a=t.pendingProps,i=a.children;typeof i!="function"&&f("A context consumer was rendered with multiple children, or a child that isn't a function. A context consumer expects a single child that is a function. If you did pass a function, make sure there is no trailing or leading whitespace around it."),zo(t,n);var o=Dt(r);wu(t);var u;return wl.current=t,Yn(!0),u=i(o),Yn(!1),ho(),t.flags|=fo,gn(e,t,u,n),t.child}function Al(){Mr=!0}function Gc(e,t){(t.mode&Me)===ie&&e!==null&&(e.alternate=null,t.alternate=null,t.flags|=xt)}function Da(e,t,n){return e!==null&&(t.dependencies=e.dependencies),ab(),Pl(t.lanes),Gn(n,t.childLanes)?(Hw(e,t),t.child):null}function G0(e,t,n){{var r=t.return;if(r===null)throw new Error("Cannot swap the root fiber.");if(e.alternate=null,t.alternate=null,n.index=t.index,n.sibling=t.sibling,n.return=t.return,n.ref=t.ref,t===r.child)r.child=n;else{var a=r.child;if(a===null)throw new Error("Expected parent to have a child.");for(;a.sibling!==t;)if(a=a.sibling,a===null)throw new Error("Expected to find the previous sibling.");a.sibling=n}var i=r.deletions;return i===null?(r.deletions=[e],r.flags|=Si):i.push(e),n.flags|=xt,n}}function Vv(e,t){var n=e.lanes;return!!Gn(n,t)}function I0(e,t,n){switch(t.tag){case F:Eb(t),t.stateNode,Uo();break;case $:Og(t);break;case U:{var r=t.type;Wr(r)&&nc(t);break}case ee:Np(t,t.stateNode.containerInfo);break;case Ce:{var a=t.memoizedProps.value,i=t.type._context;Sg(t,i,a);break}case Ke:{var o=Gn(n,t.childLanes);o&&(t.flags|=ke);{var u=t.stateNode;u.effectDuration=0,u.passiveEffectDuration=0}}break;case de:{var c=t.memoizedState;if(c!==null){if(c.dehydrated!==null)return ti(t,Ho(_r.current)),t.flags|=Pe,null;var h=t.child,m=h.childLanes;if(Gn(n,m))return Cb(e,t,n);ti(t,Ho(_r.current));var R=Da(e,t,n);return R!==null?R.sibling:null}else ti(t,Ho(_r.current));break}case rt:{var E=(e.flags&Pe)!==ue,x=Gn(n,t.childLanes);if(E){if(x)return wb(e,t,n);t.flags|=Pe}var w=t.memoizedState;if(w!==null&&(w.rendering=null,w.tail=null,w.lastEffect=null),ti(t,_r.current),x)break;return null}case xe:case Ve:return t.lanes=H,gb(e,t,n)}return Da(e,t,n)}function Ab(e,t,n){if(t._debugNeedsRemount&&e!==null)return G0(e,t,mh(t.type,t.key,t.pendingProps,t._debugOwner||null,t.mode,t.lanes));if(e!==null){var r=e.memoizedProps,a=t.pendingProps;if(r!==a||ec()||t.type!==e.type)Mr=!0;else{var i=Vv(e,n);if(!i&&(t.flags&Pe)===ue)return Mr=!1,I0(e,t,n);(e.flags&Gf)!==ue?Mr=!0:Mr=!1}}else if(Mr=!1,Xt()&&gw(t)){var o=t.index,u=bw();ag(t,u,o)}switch(t.lanes=H,t.tag){case M:return O0(e,t,t.type,n);case Gt:{var c=t.elementType;return D0(e,t,c,n)}case z:{var h=t.type,m=t.pendingProps,R=t.elementType===h?m:Lr(h,m);return Mv(e,t,h,R,n)}case U:{var E=t.type,x=t.pendingProps,w=t.elementType===E?x:Lr(E,x);return Sb(e,t,E,w,n)}case F:return C0(e,t,n);case $:return T0(e,t,n);case B:return x0(e,t);case de:return Cb(e,t,n);case ee:return $0(e,t,n);case ne:{var A=t.type,I=t.pendingProps,ae=t.elementType===A?I:Lr(A,I);return hb(e,t,A,ae,n)}case ce:return S0(e,t,n);case Je:return E0(e,t,n);case Ke:return R0(e,t,n);case Ce:return Y0(e,t,n);case Ye:return q0(e,t,n);case Fe:{var te=t.type,Ne=t.pendingProps,Oe=Lr(te,Ne);if(t.type!==t.elementType){var C=te.propTypes;C&&Dr(C,Oe,"prop",ze(te))}return Oe=Lr(te.type,Oe),mb(e,t,te,Oe,n)}case ge:return yb(e,t,t.type,t.pendingProps,n);case Cn:{var L=t.type,T=t.pendingProps,V=t.elementType===L?T:Lr(L,T);return w0(e,t,L,V,n)}case rt:return wb(e,t,n);case Fn:break;case xe:return gb(e,t,n)}throw new Error("Unknown unit of work tag ("+t.tag+"). This error is likely caused by a bug in React. Please file an issue.")}function Yo(e){e.flags|=ke}function Lb(e){e.flags|=Ba,e.flags|=If}var Mb,Bv,Ub,Nb;Mb=function(e,t,n,r){for(var a=t.child;a!==null;){if(a.tag===$||a.tag===B)hD(e,a.stateNode);else if(a.tag!==ee){if(a.child!==null){a.child.return=a,a=a.child;continue}}if(a===t)return;for(;a.sibling===null;){if(a.return===null||a.return===t)return;a=a.return}a.sibling.return=a.return,a=a.sibling}},Bv=function(e,t){},Ub=function(e,t,n,r,a){var i=e.memoizedProps;if(i!==r){var o=t.stateNode,u=kp(),c=yD(o,n,i,r,a,u);t.updateQueue=c,c&&Yo(t)}},Nb=function(e,t,n,r){n!==r&&Yo(t)};function Ll(e,t){if(!Xt())switch(e.tailMode){case"hidden":{for(var n=e.tail,r=null;n!==null;)n.alternate!==null&&(r=n),n=n.sibling;r===null?e.tail=null:r.sibling=null;break}case"collapsed":{for(var a=e.tail,i=null;a!==null;)a.alternate!==null&&(i=a),a=a.sibling;i===null?!t&&e.tail!==null?e.tail.sibling=null:e.tail=null:i.sibling=null;break}}}function Jt(e){var t=e.alternate!==null&&e.alternate.child===e.child,n=H,r=ue;if(t){if((e.mode&We)!==ie){for(var c=e.selfBaseDuration,h=e.child;h!==null;)n=Ee(n,Ee(h.lanes,h.childLanes)),r|=h.subtreeFlags&ma,r|=h.flags&ma,c+=h.treeBaseDuration,h=h.sibling;e.treeBaseDuration=c}else for(var m=e.child;m!==null;)n=Ee(n,Ee(m.lanes,m.childLanes)),r|=m.subtreeFlags&ma,r|=m.flags&ma,m.return=e,m=m.sibling;e.subtreeFlags|=r}else{if((e.mode&We)!==ie){for(var a=e.actualDuration,i=e.selfBaseDuration,o=e.child;o!==null;)n=Ee(n,Ee(o.lanes,o.childLanes)),r|=o.subtreeFlags,r|=o.flags,a+=o.actualDuration,i+=o.treeBaseDuration,o=o.sibling;e.actualDuration=a,e.treeBaseDuration=i}else for(var u=e.child;u!==null;)n=Ee(n,Ee(u.lanes,u.childLanes)),r|=u.subtreeFlags,r|=u.flags,u.return=e,u=u.sibling;e.subtreeFlags|=r}return e.childLanes=n,t}function W0(e,t,n){if(Mw()&&(t.mode&Me)!==ie&&(t.flags&Pe)===ue)return fg(t),Uo(),t.flags|=pa|xu|yn,!1;var r=uc(t);if(n!==null&&n.dehydrated!==null)if(e===null){if(!r)throw new Error("A dehydrated suspense component was completed without a hydrated node. This is probably a bug in React.");if(Aw(t),Jt(t),(t.mode&We)!==ie){var a=n!==null;if(a){var i=t.child;i!==null&&(t.treeBaseDuration-=i.treeBaseDuration)}}return!1}else{if(Uo(),(t.flags&Pe)===ue&&(t.memoizedState=null),t.flags|=ke,Jt(t),(t.mode&We)!==ie){var o=n!==null;if(o){var u=t.child;u!==null&&(t.treeBaseDuration-=u.treeBaseDuration)}}return!1}else return dg(),!0}function kb(e,t,n){var r=t.pendingProps;switch(pp(t),t.tag){case M:case Gt:case ge:case z:case ne:case ce:case Je:case Ke:case Ye:case Fe:return Jt(t),null;case U:{var a=t.type;return Wr(a)&&tc(t),Jt(t),null}case F:{var i=t.stateNode;if(Fo(t),sp(t),Vp(),i.pendingContext&&(i.context=i.pendingContext,i.pendingContext=null),e===null||e.child===null){var o=uc(t);if(o)Yo(t);else if(e!==null){var u=e.memoizedState;(!u.isDehydrated||(t.flags&pa)!==ue)&&(t.flags|=Ei,dg())}}return Bv(e,t),Jt(t),null}case $:{zp(t);var c=wg(),h=t.type;if(e!==null&&t.stateNode!=null)Ub(e,t,h,r,c),e.ref!==t.ref&&Lb(t);else{if(!r){if(t.stateNode===null)throw new Error("We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue.");return Jt(t),null}var m=kp(),R=uc(t);if(R)Ow(t,c,m)&&Yo(t);else{var E=vD(h,r,c,m,t);Mb(E,t,!1,!1),t.stateNode=E,mD(E,h,r,c)&&Yo(t)}t.ref!==null&&Lb(t)}return Jt(t),null}case B:{var x=r;if(e&&t.stateNode!=null){var w=e.memoizedProps;Nb(e,t,w,x)}else{if(typeof x!="string"&&t.stateNode===null)throw new Error("We must have new props for new mounts. This error is likely caused by a bug in React. Please file an issue.");var A=wg(),I=kp(),ae=uc(t);ae?_w(t)&&Yo(t):t.stateNode=gD(x,A,I,t)}return Jt(t),null}case de:{jo(t);var te=t.memoizedState;if(e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){var Ne=W0(e,t,te);if(!Ne)return t.flags&yn?t:null}if((t.flags&Pe)!==ue)return t.lanes=n,(t.mode&We)!==ie&&fv(t),t;var Oe=te!==null,C=e!==null&&e.memoizedState!==null;if(Oe!==C&&Oe){var L=t.child;if(L.flags|=Ri,(t.mode&Me)!==ie){var T=e===null&&(t.memoizedProps.unstable_avoidThisFallback!==!0||!hr);T||Fp(_r.current,Ag)?QO():ih()}}var V=t.updateQueue;if(V!==null&&(t.flags|=ke),Jt(t),(t.mode&We)!==ie&&Oe){var K=t.child;K!==null&&(t.treeBaseDuration-=K.treeBaseDuration)}return null}case ee:return Fo(t),Bv(e,t),e===null&&fw(t.stateNode.containerInfo),Jt(t),null;case Ce:var W=t.type._context;return wp(W,t),Jt(t),null;case Cn:{var se=t.type;return Wr(se)&&tc(t),Jt(t),null}case rt:{jo(t);var me=t.memoizedState;if(me===null)return Jt(t),null;var Xe=(t.flags&Pe)!==ue,He=me.rendering;if(He===null)if(Xe)Ll(me,!1);else{var Et=KO()&&(e===null||(e.flags&Pe)===ue);if(!Et)for(var je=t.child;je!==null;){var ht=Cc(je);if(ht!==null){Xe=!0,t.flags|=Pe,Ll(me,!1);var pn=ht.updateQueue;return pn!==null&&(t.updateQueue=pn,t.flags|=ke),t.subtreeFlags=ue,jw(t,n),ti(t,Hp(_r.current,gl)),t.child}je=je.sibling}me.tail!==null&&Pt()>nS()&&(t.flags|=Pe,Xe=!0,Ll(me,!1),t.lanes=Nm)}else{if(!Xe){var rn=Cc(He);if(rn!==null){t.flags|=Pe,Xe=!0;var Jn=rn.updateQueue;if(Jn!==null&&(t.updateQueue=Jn,t.flags|=ke),Ll(me,!0),me.tail===null&&me.tailMode==="hidden"&&!He.alternate&&!Xt())return Jt(t),null}else Pt()*2-me.renderingStartTime>nS()&&n!==qn&&(t.flags|=Pe,Xe=!0,Ll(me,!1),t.lanes=Nm)}if(me.isBackwards)He.sibling=t.child,t.child=He;else{var En=me.last;En!==null?En.sibling=He:t.child=He,me.last=He}}if(me.tail!==null){var Rn=me.tail;me.rendering=Rn,me.tail=Rn.sibling,me.renderingStartTime=Pt(),Rn.sibling=null;var vn=_r.current;return Xe?vn=Hp(vn,gl):vn=Ho(vn),ti(t,vn),Rn}return Jt(t),null}case Fn:break;case xe:case Ve:{ah(t);var La=t.memoizedState,Jo=La!==null;if(e!==null){var Il=e.memoizedState,na=Il!==null;na!==Jo&&!er&&(t.flags|=Ri)}return!Jo||(t.mode&Me)===ie?Jt(t):Gn(ta,qn)&&(Jt(t),t.subtreeFlags&(xt|ke)&&(t.flags|=Ri)),null}case yt:return null;case gt:return null}throw new Error("Unknown unit of work tag ("+t.tag+"). This error is likely caused by a bug in React. Please file an issue.")}function Q0(e,t,n){switch(pp(t),t.tag){case U:{var r=t.type;Wr(r)&&tc(t);var a=t.flags;return a&yn?(t.flags=a&~yn|Pe,(t.mode&We)!==ie&&fv(t),t):null}case F:{t.stateNode,Fo(t),sp(t),Vp();var i=t.flags;return(i&yn)!==ue&&(i&Pe)===ue?(t.flags=i&~yn|Pe,t):null}case $:return zp(t),null;case de:{jo(t);var o=t.memoizedState;if(o!==null&&o.dehydrated!==null){if(t.alternate===null)throw new Error("Threw in newly mounted dehydrated component. This is likely a bug in React. Please file an issue.");Uo()}var u=t.flags;return u&yn?(t.flags=u&~yn|Pe,(t.mode&We)!==ie&&fv(t),t):null}case rt:return jo(t),null;case ee:return Fo(t),null;case Ce:var c=t.type._context;return wp(c,t),null;case xe:case Ve:return ah(t),null;case yt:return null;default:return null}}function zb(e,t,n){switch(pp(t),t.tag){case U:{var r=t.type.childContextTypes;r!=null&&tc(t);break}case F:{t.stateNode,Fo(t),sp(t),Vp();break}case $:{zp(t);break}case ee:Fo(t);break;case de:jo(t);break;case rt:jo(t);break;case Ce:var a=t.type._context;wp(a,t);break;case xe:case Ve:ah(t);break}}var Fb=null;Fb=new Set;var Ic=!1,Zt=!1,X0=typeof WeakSet=="function"?WeakSet:Set,J=null,qo=null,Go=null;function K0(e){$f(null,function(){throw e}),Yf()}var J0=function(e,t){if(t.props=e.memoizedProps,t.state=e.memoizedState,e.mode&We)try{Zr(),t.componentWillUnmount()}finally{Jr(e)}else t.componentWillUnmount()};function Hb(e,t){try{ai(Lt,e)}catch(n){nt(e,t,n)}}function Pv(e,t,n){try{J0(e,n)}catch(r){nt(e,t,r)}}function Z0(e,t,n){try{n.componentDidMount()}catch(r){nt(e,t,r)}}function jb(e,t){try{Bb(e)}catch(n){nt(e,t,n)}}function Io(e,t){var n=e.ref;if(n!==null)if(typeof n=="function"){var r;try{if(mr&&yr&&e.mode&We)try{Zr(),r=n(null)}finally{Jr(e)}else r=n(null)}catch(a){nt(e,t,a)}typeof r=="function"&&f("Unexpected return value from a callback ref in %s. A callback ref should not return a function.",ye(e))}else n.current=null}function Wc(e,t,n){try{n()}catch(r){nt(e,t,r)}}var Vb=!1;function eO(e,t){dD(e.containerInfo),J=t,tO();var n=Vb;return Vb=!1,n}function tO(){for(;J!==null;){var e=J,t=e.child;(e.subtreeFlags&Qf)!==ue&&t!==null?(t.return=e,J=t):nO()}}function nO(){for(;J!==null;){var e=J;ft(e);try{rO(e)}catch(n){nt(e,e.return,n)}Bt();var t=e.sibling;if(t!==null){t.return=e.return,J=t;return}J=e.return}}function rO(e){var t=e.alternate,n=e.flags;if((n&Ei)!==ue){switch(ft(e),e.tag){case z:case ne:case ge:break;case U:{if(t!==null){var r=t.memoizedProps,a=t.memoizedState,i=e.stateNode;e.type===e.elementType&&!Pi&&(i.props!==e.memoizedProps&&f("Expected %s props to match memoized props before getSnapshotBeforeUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",ye(e)||"instance"),i.state!==e.memoizedState&&f("Expected %s state to match memoized state before getSnapshotBeforeUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.",ye(e)||"instance"));var o=i.getSnapshotBeforeUpdate(e.elementType===e.type?r:Lr(e.type,r),a);{var u=Fb;o===void 0&&!u.has(e.type)&&(u.add(e.type),f("%s.getSnapshotBeforeUpdate(): A snapshot value (or null) must be returned. You have returned undefined.",ye(e)))}i.__reactInternalSnapshotBeforeUpdate=o}break}case F:{{var c=e.stateNode;FD(c.containerInfo)}break}case $:case B:case ee:case Cn:break;default:throw new Error("This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue.")}Bt()}}function Ur(e,t,n){var r=t.updateQueue,a=r!==null?r.lastEffect:null;if(a!==null){var i=a.next,o=i;do{if((o.tag&e)===e){var u=o.destroy;o.destroy=void 0,u!==void 0&&((e&Kt)!==Mn?gC(t):(e&Lt)!==Mn&&_m(t),(e&Qr)!==Mn&&Yl(!0),Wc(t,n,u),(e&Qr)!==Mn&&Yl(!1),(e&Kt)!==Mn?bC():(e&Lt)!==Mn&&Am())}o=o.next}while(o!==i)}}function ai(e,t){var n=t.updateQueue,r=n!==null?n.lastEffect:null;if(r!==null){var a=r.next,i=a;do{if((i.tag&e)===e){(e&Kt)!==Mn?mC(t):(e&Lt)!==Mn&&SC(t);var o=i.create;(e&Qr)!==Mn&&Yl(!0),i.destroy=o(),(e&Qr)!==Mn&&Yl(!1),(e&Kt)!==Mn?yC():(e&Lt)!==Mn&&EC();{var u=i.destroy;if(u!==void 0&&typeof u!="function"){var c=void 0;(i.tag&Lt)!==ue?c="useLayoutEffect":(i.tag&Qr)!==ue?c="useInsertionEffect":c="useEffect";var h=void 0;u===null?h=" You returned null. If your effect does not require clean up, return undefined (or nothing).":typeof u.then=="function"?h=`
+
+It looks like you wrote `+c+`(async () => ...) or returned a Promise. Instead, write the async function inside your effect and call it immediately:
+
+`+c+`(() => {
+  async function fetchData() {
+    // You can await here
+    const response = await MyAPI.getData(someId);
+    // ...
+  }
+  fetchData();
+}, [someId]); // Or [] if effect doesn't need props or state
+
+Learn more about data fetching with Hooks: https://reactjs.org/link/hooks-data-fetching`:h=" You returned: "+u,f("%s must not return anything besides a function, which is used for clean-up.%s",c,h)}}}i=i.next}while(i!==a)}}function aO(e,t){if((t.flags&ke)!==ue)switch(t.tag){case Ke:{var n=t.stateNode.passiveEffectDuration,r=t.memoizedProps,a=r.id,i=r.onPostCommit,o=nb(),u=t.alternate===null?"mount":"update";tb()&&(u="nested-update"),typeof i=="function"&&i(a,u,n,o);var c=t.return;e:for(;c!==null;){switch(c.tag){case F:var h=c.stateNode;h.passiveEffectDuration+=n;break e;case Ke:var m=c.stateNode;m.passiveEffectDuration+=n;break e}c=c.return}break}}}function iO(e,t,n,r){if((n.flags&Du)!==ue)switch(n.tag){case z:case ne:case ge:{if(!Zt)if(n.mode&We)try{Zr(),ai(Lt|At,n)}finally{Jr(n)}else ai(Lt|At,n);break}case U:{var a=n.stateNode;if(n.flags&ke&&!Zt)if(t===null)if(n.type===n.elementType&&!Pi&&(a.props!==n.memoizedProps&&f("Expected %s props to match memoized props before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",ye(n)||"instance"),a.state!==n.memoizedState&&f("Expected %s state to match memoized state before componentDidMount. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.",ye(n)||"instance")),n.mode&We)try{Zr(),a.componentDidMount()}finally{Jr(n)}else a.componentDidMount();else{var i=n.elementType===n.type?t.memoizedProps:Lr(n.type,t.memoizedProps),o=t.memoizedState;if(n.type===n.elementType&&!Pi&&(a.props!==n.memoizedProps&&f("Expected %s props to match memoized props before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",ye(n)||"instance"),a.state!==n.memoizedState&&f("Expected %s state to match memoized state before componentDidUpdate. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.",ye(n)||"instance")),n.mode&We)try{Zr(),a.componentDidUpdate(i,o,a.__reactInternalSnapshotBeforeUpdate)}finally{Jr(n)}else a.componentDidUpdate(i,o,a.__reactInternalSnapshotBeforeUpdate)}var u=n.updateQueue;u!==null&&(n.type===n.elementType&&!Pi&&(a.props!==n.memoizedProps&&f("Expected %s props to match memoized props before processing the update queue. This might either be because of a bug in React, or because a component reassigns its own `this.props`. Please file an issue.",ye(n)||"instance"),a.state!==n.memoizedState&&f("Expected %s state to match memoized state before processing the update queue. This might either be because of a bug in React, or because a component reassigns its own `this.state`. Please file an issue.",ye(n)||"instance")),Dg(n,u,a));break}case F:{var c=n.updateQueue;if(c!==null){var h=null;if(n.child!==null)switch(n.child.tag){case $:h=n.child.stateNode;break;case U:h=n.child.stateNode;break}Dg(n,c,h)}break}case $:{var m=n.stateNode;if(t===null&&n.flags&ke){var R=n.type,E=n.memoizedProps;CD(m,R,E)}break}case B:break;case ee:break;case Ke:{{var x=n.memoizedProps,w=x.onCommit,A=x.onRender,I=n.stateNode.effectDuration,ae=nb(),te=t===null?"mount":"update";tb()&&(te="nested-update"),typeof A=="function"&&A(n.memoizedProps.id,te,n.actualDuration,n.treeBaseDuration,n.actualStartTime,ae);{typeof w=="function"&&w(n.memoizedProps.id,te,I,ae),n_(n);var Ne=n.return;e:for(;Ne!==null;){switch(Ne.tag){case F:var Oe=Ne.stateNode;Oe.effectDuration+=I;break e;case Ke:var C=Ne.stateNode;C.effectDuration+=I;break e}Ne=Ne.return}}}break}case de:{pO(e,n);break}case rt:case Cn:case Fn:case xe:case Ve:case gt:break;default:throw new Error("This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue.")}Zt||n.flags&Ba&&Bb(n)}function oO(e){switch(e.tag){case z:case ne:case ge:{if(e.mode&We)try{Zr(),Hb(e,e.return)}finally{Jr(e)}else Hb(e,e.return);break}case U:{var t=e.stateNode;typeof t.componentDidMount=="function"&&Z0(e,e.return,t),jb(e,e.return);break}case $:{jb(e,e.return);break}}}function uO(e,t){for(var n=null,r=e;;){if(r.tag===$){if(n===null){n=r;try{var a=r.stateNode;t?UD(a):kD(r.stateNode,r.memoizedProps)}catch(o){nt(e,e.return,o)}}}else if(r.tag===B){if(n===null)try{var i=r.stateNode;t?ND(i):zD(i,r.memoizedProps)}catch(o){nt(e,e.return,o)}}else if(!((r.tag===xe||r.tag===Ve)&&r.memoizedState!==null&&r!==e)){if(r.child!==null){r.child.return=r,r=r.child;continue}}if(r===e)return;for(;r.sibling===null;){if(r.return===null||r.return===e)return;n===r&&(n=null),r=r.return}n===r&&(n=null),r.sibling.return=r.return,r=r.sibling}}function Bb(e){var t=e.ref;if(t!==null){var n=e.stateNode,r;switch(e.tag){case $:r=n;break;default:r=n}if(typeof t=="function"){var a;if(e.mode&We)try{Zr(),a=t(r)}finally{Jr(e)}else a=t(r);typeof a=="function"&&f("Unexpected return value from a callback ref in %s. A callback ref should not return a function.",ye(e))}else t.hasOwnProperty("current")||f("Unexpected ref object provided for %s. Use either a ref-setter function or React.createRef().",ye(e)),t.current=r}}function lO(e){var t=e.alternate;t!==null&&(t.return=null),e.return=null}function Pb(e){var t=e.alternate;t!==null&&(e.alternate=null,Pb(t));{if(e.child=null,e.deletions=null,e.sibling=null,e.tag===$){var n=e.stateNode;n!==null&&vw(n)}e.stateNode=null,e._debugOwner=null,e.return=null,e.dependencies=null,e.memoizedProps=null,e.memoizedState=null,e.pendingProps=null,e.stateNode=null,e.updateQueue=null}}function sO(e){for(var t=e.return;t!==null;){if($b(t))return t;t=t.return}throw new Error("Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue.")}function $b(e){return e.tag===$||e.tag===F||e.tag===ee}function Yb(e){var t=e;e:for(;;){for(;t.sibling===null;){if(t.return===null||$b(t.return))return null;t=t.return}for(t.sibling.return=t.return,t=t.sibling;t.tag!==$&&t.tag!==B&&t.tag!==Rt;){if(t.flags&xt||t.child===null||t.tag===ee)continue e;t.child.return=t,t=t.child}if(!(t.flags&xt))return t.stateNode}}function cO(e){var t=sO(e);switch(t.tag){case $:{var n=t.stateNode;t.flags&Tu&&(Gy(n),t.flags&=~Tu);var r=Yb(e);Yv(e,r,n);break}case F:case ee:{var a=t.stateNode.containerInfo,i=Yb(e);$v(e,i,a);break}default:throw new Error("Invalid host parent fiber. This error is likely caused by a bug in React. Please file an issue.")}}function $v(e,t,n){var r=e.tag,a=r===$||r===B;if(a){var i=e.stateNode;t?_D(n,i,t):wD(n,i)}else if(r!==ee){var o=e.child;if(o!==null){$v(o,t,n);for(var u=o.sibling;u!==null;)$v(u,t,n),u=u.sibling}}}function Yv(e,t,n){var r=e.tag,a=r===$||r===B;if(a){var i=e.stateNode;t?OD(n,i,t):DD(n,i)}else if(r!==ee){var o=e.child;if(o!==null){Yv(o,t,n);for(var u=o.sibling;u!==null;)Yv(u,t,n),u=u.sibling}}}var en=null,Nr=!1;function fO(e,t,n){{var r=t;e:for(;r!==null;){switch(r.tag){case $:{en=r.stateNode,Nr=!1;break e}case F:{en=r.stateNode.containerInfo,Nr=!0;break e}case ee:{en=r.stateNode.containerInfo,Nr=!0;break e}}r=r.return}if(en===null)throw new Error("Expected to find a host parent. This error is likely caused by a bug in React. Please file an issue.");qb(e,t,n),en=null,Nr=!1}lO(n)}function ii(e,t,n){for(var r=n.child;r!==null;)qb(e,t,r),r=r.sibling}function qb(e,t,n){switch(dC(n),n.tag){case $:Zt||Io(n,t);case B:{{var r=en,a=Nr;en=null,ii(e,t,n),en=r,Nr=a,en!==null&&(Nr?LD(en,n.stateNode):AD(en,n.stateNode))}return}case Rt:{en!==null&&(Nr?MD(en,n.stateNode):tp(en,n.stateNode));return}case ee:{{var i=en,o=Nr;en=n.stateNode.containerInfo,Nr=!0,ii(e,t,n),en=i,Nr=o}return}case z:case ne:case Fe:case ge:{if(!Zt){var u=n.updateQueue;if(u!==null){var c=u.lastEffect;if(c!==null){var h=c.next,m=h;do{var R=m,E=R.destroy,x=R.tag;E!==void 0&&((x&Qr)!==Mn?Wc(n,t,E):(x&Lt)!==Mn&&(_m(n),n.mode&We?(Zr(),Wc(n,t,E),Jr(n)):Wc(n,t,E),Am())),m=m.next}while(m!==h)}}}ii(e,t,n);return}case U:{if(!Zt){Io(n,t);var w=n.stateNode;typeof w.componentWillUnmount=="function"&&Pv(n,t,w)}ii(e,t,n);return}case Fn:{ii(e,t,n);return}case xe:{if(n.mode&Me){var A=Zt;Zt=A||n.memoizedState!==null,ii(e,t,n),Zt=A}else ii(e,t,n);break}default:{ii(e,t,n);return}}}function dO(e){e.memoizedState}function pO(e,t){var n=t.memoizedState;if(n===null){var r=t.alternate;if(r!==null){var a=r.memoizedState;if(a!==null){var i=a.dehydrated;i!==null&&KD(i)}}}}function Gb(e){var t=e.updateQueue;if(t!==null){e.updateQueue=null;var n=e.stateNode;n===null&&(n=e.stateNode=new X0),t.forEach(function(r){var a=s_.bind(null,e,r);if(!n.has(r)){if(n.add(r),Tr)if(qo!==null&&Go!==null)$l(Go,qo);else throw Error("Expected finished root and lanes to be set. This is a bug in React.");r.then(a,a)}})}}function vO(e,t,n){qo=n,Go=e,ft(t),Ib(t,e),ft(t),qo=null,Go=null}function kr(e,t,n){var r=t.deletions;if(r!==null)for(var a=0;a<r.length;a++){var i=r[a];try{fO(e,t,i)}catch(c){nt(i,t,c)}}var o=as();if(t.subtreeFlags&Xf)for(var u=t.child;u!==null;)ft(u),Ib(u,e),u=u.sibling;ft(o)}function Ib(e,t,n){var r=e.alternate,a=e.flags;switch(e.tag){case z:case ne:case Fe:case ge:{if(kr(t,e),ea(e),a&ke){try{Ur(Qr|At,e,e.return),ai(Qr|At,e)}catch(se){nt(e,e.return,se)}if(e.mode&We){try{Zr(),Ur(Lt|At,e,e.return)}catch(se){nt(e,e.return,se)}Jr(e)}else try{Ur(Lt|At,e,e.return)}catch(se){nt(e,e.return,se)}}return}case U:{kr(t,e),ea(e),a&Ba&&r!==null&&Io(r,r.return);return}case $:{kr(t,e),ea(e),a&Ba&&r!==null&&Io(r,r.return);{if(e.flags&Tu){var i=e.stateNode;try{Gy(i)}catch(se){nt(e,e.return,se)}}if(a&ke){var o=e.stateNode;if(o!=null){var u=e.memoizedProps,c=r!==null?r.memoizedProps:u,h=e.type,m=e.updateQueue;if(e.updateQueue=null,m!==null)try{TD(o,m,h,c,u,e)}catch(se){nt(e,e.return,se)}}}}return}case B:{if(kr(t,e),ea(e),a&ke){if(e.stateNode===null)throw new Error("This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue.");var R=e.stateNode,E=e.memoizedProps,x=r!==null?r.memoizedProps:E;try{xD(R,x,E)}catch(se){nt(e,e.return,se)}}return}case F:{if(kr(t,e),ea(e),a&ke&&r!==null){var w=r.memoizedState;if(w.isDehydrated)try{XD(t.containerInfo)}catch(se){nt(e,e.return,se)}}return}case ee:{kr(t,e),ea(e);return}case de:{kr(t,e),ea(e);var A=e.child;if(A.flags&Ri){var I=A.stateNode,ae=A.memoizedState,te=ae!==null;if(I.isHidden=te,te){var Ne=A.alternate!==null&&A.alternate.memoizedState!==null;Ne||WO()}}if(a&ke){try{dO(e)}catch(se){nt(e,e.return,se)}Gb(e)}return}case xe:{var Oe=r!==null&&r.memoizedState!==null;if(e.mode&Me){var C=Zt;Zt=C||Oe,kr(t,e),Zt=C}else kr(t,e);if(ea(e),a&Ri){var L=e.stateNode,T=e.memoizedState,V=T!==null,K=e;if(L.isHidden=V,V&&!Oe&&(K.mode&Me)!==ie){J=K;for(var W=K.child;W!==null;)J=W,mO(W),W=W.sibling}uO(K,V)}return}case rt:{kr(t,e),ea(e),a&ke&&Gb(e);return}case Fn:return;default:{kr(t,e),ea(e);return}}}function ea(e){var t=e.flags;if(t&xt){try{cO(e)}catch(n){nt(e,e.return,n)}e.flags&=~xt}t&va&&(e.flags&=~va)}function hO(e,t,n){qo=n,Go=t,J=e,Wb(e,t,n),qo=null,Go=null}function Wb(e,t,n){for(var r=(e.mode&Me)!==ie;J!==null;){var a=J,i=a.child;if(a.tag===xe&&r){var o=a.memoizedState!==null,u=o||Ic;if(u){qv(e,t,n);continue}else{var c=a.alternate,h=c!==null&&c.memoizedState!==null,m=h||Zt,R=Ic,E=Zt;Ic=u,Zt=m,Zt&&!E&&(J=a,yO(a));for(var x=i;x!==null;)J=x,Wb(x,t,n),x=x.sibling;J=a,Ic=R,Zt=E,qv(e,t,n);continue}}(a.subtreeFlags&Du)!==ue&&i!==null?(i.return=a,J=i):qv(e,t,n)}}function qv(e,t,n){for(;J!==null;){var r=J;if((r.flags&Du)!==ue){var a=r.alternate;ft(r);try{iO(t,a,r,n)}catch(o){nt(r,r.return,o)}Bt()}if(r===e){J=null;return}var i=r.sibling;if(i!==null){i.return=r.return,J=i;return}J=r.return}}function mO(e){for(;J!==null;){var t=J,n=t.child;switch(t.tag){case z:case ne:case Fe:case ge:{if(t.mode&We)try{Zr(),Ur(Lt,t,t.return)}finally{Jr(t)}else Ur(Lt,t,t.return);break}case U:{Io(t,t.return);var r=t.stateNode;typeof r.componentWillUnmount=="function"&&Pv(t,t.return,r);break}case $:{Io(t,t.return);break}case xe:{var a=t.memoizedState!==null;if(a){Qb(e);continue}break}}n!==null?(n.return=t,J=n):Qb(e)}}function Qb(e){for(;J!==null;){var t=J;if(t===e){J=null;return}var n=t.sibling;if(n!==null){n.return=t.return,J=n;return}J=t.return}}function yO(e){for(;J!==null;){var t=J,n=t.child;if(t.tag===xe){var r=t.memoizedState!==null;if(r){Xb(e);continue}}n!==null?(n.return=t,J=n):Xb(e)}}function Xb(e){for(;J!==null;){var t=J;ft(t);try{oO(t)}catch(r){nt(t,t.return,r)}if(Bt(),t===e){J=null;return}var n=t.sibling;if(n!==null){n.return=t.return,J=n;return}J=t.return}}function gO(e,t,n,r){J=t,bO(t,e,n,r)}function bO(e,t,n,r){for(;J!==null;){var a=J,i=a.child;(a.subtreeFlags&po)!==ue&&i!==null?(i.return=a,J=i):SO(e,t,n,r)}}function SO(e,t,n,r){for(;J!==null;){var a=J;if((a.flags&Cr)!==ue){ft(a);try{EO(t,a,n,r)}catch(o){nt(a,a.return,o)}Bt()}if(a===e){J=null;return}var i=a.sibling;if(i!==null){i.return=a.return,J=i;return}J=a.return}}function EO(e,t,n,r){switch(t.tag){case z:case ne:case ge:{if(t.mode&We){cv();try{ai(Kt|At,t)}finally{sv(t)}}else ai(Kt|At,t);break}}}function RO(e){J=e,CO()}function CO(){for(;J!==null;){var e=J,t=e.child;if((J.flags&Si)!==ue){var n=e.deletions;if(n!==null){for(var r=0;r<n.length;r++){var a=n[r];J=a,DO(a,e)}{var i=e.alternate;if(i!==null){var o=i.child;if(o!==null){i.child=null;do{var u=o.sibling;o.sibling=null,o=u}while(o!==null)}}}J=e}}(e.subtreeFlags&po)!==ue&&t!==null?(t.return=e,J=t):TO()}}function TO(){for(;J!==null;){var e=J;(e.flags&Cr)!==ue&&(ft(e),xO(e),Bt());var t=e.sibling;if(t!==null){t.return=e.return,J=t;return}J=e.return}}function xO(e){switch(e.tag){case z:case ne:case ge:{e.mode&We?(cv(),Ur(Kt|At,e,e.return),sv(e)):Ur(Kt|At,e,e.return);break}}}function DO(e,t){for(;J!==null;){var n=J;ft(n),OO(n,t),Bt();var r=n.child;r!==null?(r.return=n,J=r):wO(e)}}function wO(e){for(;J!==null;){var t=J,n=t.sibling,r=t.return;if(Pb(t),t===e){J=null;return}if(n!==null){n.return=r,J=n;return}J=r}}function OO(e,t){switch(e.tag){case z:case ne:case ge:{e.mode&We?(cv(),Ur(Kt,e,t),sv(e)):Ur(Kt,e,t);break}}}function _O(e){switch(e.tag){case z:case ne:case ge:{try{ai(Lt|At,e)}catch(n){nt(e,e.return,n)}break}case U:{var t=e.stateNode;try{t.componentDidMount()}catch(n){nt(e,e.return,n)}break}}}function AO(e){switch(e.tag){case z:case ne:case ge:{try{ai(Kt|At,e)}catch(t){nt(e,e.return,t)}break}}}function LO(e){switch(e.tag){case z:case ne:case ge:{try{Ur(Lt|At,e,e.return)}catch(n){nt(e,e.return,n)}break}case U:{var t=e.stateNode;typeof t.componentWillUnmount=="function"&&Pv(e,e.return,t);break}}}function MO(e){switch(e.tag){case z:case ne:case ge:try{Ur(Kt|At,e,e.return)}catch(t){nt(e,e.return,t)}}}if(typeof Symbol=="function"&&Symbol.for){var Ml=Symbol.for;Ml("selector.component"),Ml("selector.has_pseudo_class"),Ml("selector.role"),Ml("selector.test_id"),Ml("selector.text")}var UO=[];function NO(){UO.forEach(function(e){return e()})}var kO=p.ReactCurrentActQueue;function zO(e){{var t=typeof IS_REACT_ACT_ENVIRONMENT<"u"?IS_REACT_ACT_ENVIRONMENT:void 0,n=typeof jest<"u";return n&&t!==!1}}function Kb(){{var e=typeof IS_REACT_ACT_ENVIRONMENT<"u"?IS_REACT_ACT_ENVIRONMENT:void 0;return!e&&kO.current!==null&&f("The current testing environment is not configured to support act(...)"),e}}var FO=Math.ceil,Gv=p.ReactCurrentDispatcher,Iv=p.ReactCurrentOwner,tn=p.ReactCurrentBatchConfig,zr=p.ReactCurrentActQueue,Nt=0,Jb=1,nn=2,dr=4,wa=0,Ul=1,$i=2,Qc=3,Nl=4,Zb=5,Wv=6,Ue=Nt,bn=null,dt=null,kt=H,ta=H,Qv=Qa(H),zt=wa,kl=null,Xc=H,zl=H,Kc=H,Fl=null,Un=null,Xv=0,eS=500,tS=1/0,HO=500,Oa=null;function Hl(){tS=Pt()+HO}function nS(){return tS}var Jc=!1,Kv=null,Wo=null,Yi=!1,oi=null,jl=H,Jv=[],Zv=null,jO=50,Vl=0,eh=null,th=!1,Zc=!1,VO=50,Qo=0,ef=null,Bl=at,tf=H,rS=!1;function nf(){return bn}function Sn(){return(Ue&(nn|dr))!==Nt?Pt():(Bl!==at||(Bl=Pt()),Bl)}function ui(e){var t=e.mode;if((t&Me)===ie)return ve;if((Ue&nn)!==Nt&&kt!==H)return Uu(kt);var n=kw()!==Nw;if(n){if(tn.transition!==null){var r=tn.transition;r._updatedFibers||(r._updatedFibers=new Set),r._updatedFibers.add(e)}return tf===Yt&&(tf=Hm()),tf}var a=xr();if(a!==Yt)return a;var i=bD();return i}function BO(e){var t=e.mode;return(t&Me)===ie?ve:$C()}function Ft(e,t,n,r){f_(),rS&&f("useInsertionEffect must not schedule updates."),th&&(Zc=!0),Nu(e,n,r),(Ue&nn)!==H&&e===bn?v_(t):(Tr&&Bm(e,t,n),h_(t),e===bn&&((Ue&nn)===Nt&&(zl=Ee(zl,n)),zt===Nl&&li(e,kt)),Nn(e,r),n===ve&&Ue===Nt&&(t.mode&Me)===ie&&!zr.isBatchingLegacy&&(Hl(),rg()))}function PO(e,t,n){var r=e.current;r.lanes=t,Nu(e,t,n),Nn(e,n)}function $O(e){return(Ue&nn)!==Nt}function Nn(e,t){var n=e.callbackNode;FC(e,t);var r=Cs(e,e===bn?kt:H);if(r===H){n!==null&&bS(n),e.callbackNode=null,e.callbackPriority=Yt;return}var a=Oi(r),i=e.callbackPriority;if(i===a&&!(zr.current!==null&&n!==lh)){n==null&&i!==ve&&f("Expected scheduled callback to exist. This error is likely caused by a bug in React. Please file an issue.");return}n!=null&&bS(n);var o;if(a===ve)e.tag===Xa?(zr.isBatchingLegacy!==null&&(zr.didScheduleLegacyUpdate=!0),yw(oS.bind(null,e))):ng(oS.bind(null,e)),zr.current!==null?zr.current.push(Ka):ED(function(){(Ue&(nn|dr))===Nt&&Ka()}),o=null;else{var u;switch(Ym(r)){case In:u=bs;break;case ga:u=Kf;break;case ba:u=xi;break;case Ds:u=Jf;break;default:u=xi;break}o=sh(u,aS.bind(null,e))}e.callbackPriority=a,e.callbackNode=o}function aS(e,t){if(u0(),Bl=at,tf=H,(Ue&(nn|dr))!==Nt)throw new Error("Should not already be working.");var n=e.callbackNode,r=Aa();if(r&&e.callbackNode!==n)return null;var a=Cs(e,e===bn?kt:H);if(a===H)return null;var i=!Ts(e,a)&&!PC(e,a)&&!t,o=i?ZO(e,a):af(e,a);if(o!==wa){if(o===$i){var u=Sd(e);u!==H&&(a=u,o=nh(e,u))}if(o===Ul){var c=kl;throw qi(e,H),li(e,a),Nn(e,Pt()),c}if(o===Wv)li(e,a);else{var h=!Ts(e,a),m=e.current.alternate;if(h&&!qO(m)){if(o=af(e,a),o===$i){var R=Sd(e);R!==H&&(a=R,o=nh(e,R))}if(o===Ul){var E=kl;throw qi(e,H),li(e,a),Nn(e,Pt()),E}}e.finishedWork=m,e.finishedLanes=a,YO(e,o,a)}}return Nn(e,Pt()),e.callbackNode===n?aS.bind(null,e):null}function nh(e,t){var n=Fl;if(ws(e)){var r=qi(e,t);r.flags|=pa,cw(e.containerInfo)}var a=af(e,t);if(a!==$i){var i=Un;Un=n,i!==null&&iS(i)}return a}function iS(e){Un===null?Un=e:Un.push.apply(Un,e)}function YO(e,t,n){switch(t){case wa:case Ul:throw new Error("Root did not complete. This is a bug in React.");case $i:{Gi(e,Un,Oa);break}case Qc:{if(li(e,n),zm(n)&&!SS()){var r=Xv+eS-Pt();if(r>10){var a=Cs(e,H);if(a!==H)break;var i=e.suspendedLanes;if(!bo(i,n)){Sn(),Vm(e,i);break}e.timeoutHandle=Zd(Gi.bind(null,e,Un,Oa),r);break}}Gi(e,Un,Oa);break}case Nl:{if(li(e,n),BC(n))break;if(!SS()){var o=kC(e,n),u=o,c=Pt()-u,h=c_(c)-c;if(h>10){e.timeoutHandle=Zd(Gi.bind(null,e,Un,Oa),h);break}}Gi(e,Un,Oa);break}case Zb:{Gi(e,Un,Oa);break}default:throw new Error("Unknown root exit status.")}}function qO(e){for(var t=e;;){if(t.flags&ys){var n=t.updateQueue;if(n!==null){var r=n.stores;if(r!==null)for(var a=0;a<r.length;a++){var i=r[a],o=i.getSnapshot,u=i.value;try{if(!Qn(o(),u))return!1}catch{return!1}}}}var c=t.child;if(t.subtreeFlags&ys&&c!==null){c.return=t,t=c;continue}if(t===e)return!0;for(;t.sibling===null;){if(t.return===null||t.return===e)return!0;t=t.return}t.sibling.return=t.return,t=t.sibling}return!0}function li(e,t){t=xs(t,Kc),t=xs(t,zl),qC(e,t)}function oS(e){if(l0(),(Ue&(nn|dr))!==Nt)throw new Error("Should not already be working.");Aa();var t=Cs(e,H);if(!Gn(t,ve))return Nn(e,Pt()),null;var n=af(e,t);if(e.tag!==Xa&&n===$i){var r=Sd(e);r!==H&&(t=r,n=nh(e,r))}if(n===Ul){var a=kl;throw qi(e,H),li(e,t),Nn(e,Pt()),a}if(n===Wv)throw new Error("Root did not complete. This is a bug in React.");var i=e.current.alternate;return e.finishedWork=i,e.finishedLanes=t,Gi(e,Un,Oa),Nn(e,Pt()),null}function GO(e,t){t!==H&&(Td(e,Ee(t,ve)),Nn(e,Pt()),(Ue&(nn|dr))===Nt&&(Hl(),Ka()))}function rh(e,t){var n=Ue;Ue|=Jb;try{return e(t)}finally{Ue=n,Ue===Nt&&!zr.isBatchingLegacy&&(Hl(),rg())}}function IO(e,t,n,r,a){var i=xr(),o=tn.transition;try{return tn.transition=null,qt(In),e(t,n,r,a)}finally{qt(i),tn.transition=o,Ue===Nt&&Hl()}}function _a(e){oi!==null&&oi.tag===Xa&&(Ue&(nn|dr))===Nt&&Aa();var t=Ue;Ue|=Jb;var n=tn.transition,r=xr();try{return tn.transition=null,qt(In),e?e():void 0}finally{qt(r),tn.transition=n,Ue=t,(Ue&(nn|dr))===Nt&&Ka()}}function uS(){return(Ue&(nn|dr))!==Nt}function rf(e,t){fn(Qv,ta,e),ta=Ee(ta,t)}function ah(e){ta=Qv.current,cn(Qv,e)}function qi(e,t){e.finishedWork=null,e.finishedLanes=H;var n=e.timeoutHandle;if(n!==ep&&(e.timeoutHandle=ep,SD(n)),dt!==null)for(var r=dt.return;r!==null;){var a=r.alternate;zb(a,r),r=r.return}bn=e;var i=Ii(e.current,null);return dt=i,kt=ta=t,zt=wa,kl=null,Xc=H,zl=H,Kc=H,Fl=null,Un=null,Pw(),Or.discardPendingWarnings(),i}function lS(e,t){do{var n=dt;try{if(pc(),Mg(),Bt(),Iv.current=null,n===null||n.return===null){zt=Ul,kl=t,dt=null;return}if(mr&&n.mode&We&&Pc(n,!0),Vr)if(ho(),t!==null&&typeof t=="object"&&typeof t.then=="function"){var r=t;CC(n,r,kt)}else RC(n,t,kt);y0(e,n.return,n,t,kt),dS(n)}catch(a){t=a,dt===n&&n!==null?(n=n.return,dt=n):n=dt;continue}return}while(!0)}function sS(){var e=Gv.current;return Gv.current=Fc,e===null?Fc:e}function cS(e){Gv.current=e}function WO(){Xv=Pt()}function Pl(e){Xc=Ee(e,Xc)}function QO(){zt===wa&&(zt=Qc)}function ih(){(zt===wa||zt===Qc||zt===$i)&&(zt=Nl),bn!==null&&(Ed(Xc)||Ed(zl))&&li(bn,kt)}function XO(e){zt!==Nl&&(zt=$i),Fl===null?Fl=[e]:Fl.push(e)}function KO(){return zt===wa}function af(e,t){var n=Ue;Ue|=nn;var r=sS();if(bn!==e||kt!==t){if(Tr){var a=e.memoizedUpdaters;a.size>0&&($l(e,kt),a.clear()),Pm(e,t)}Oa=$m(),qi(e,t)}Lm(t);do try{JO();break}catch(i){lS(e,i)}while(!0);if(pc(),Ue=n,cS(r),dt!==null)throw new Error("Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue.");return Mm(),bn=null,kt=H,zt}function JO(){for(;dt!==null;)fS(dt)}function ZO(e,t){var n=Ue;Ue|=nn;var r=sS();if(bn!==e||kt!==t){if(Tr){var a=e.memoizedUpdaters;a.size>0&&($l(e,kt),a.clear()),Pm(e,t)}Oa=$m(),Hl(),qi(e,t)}Lm(t);do try{e_();break}catch(i){lS(e,i)}while(!0);return pc(),cS(r),Ue=n,dt!==null?(OC(),wa):(Mm(),bn=null,kt=H,zt)}function e_(){for(;dt!==null&&!nC();)fS(dt)}function fS(e){var t=e.alternate;ft(e);var n;(e.mode&We)!==ie?(lv(e),n=oh(t,e,ta),Pc(e,!0)):n=oh(t,e,ta),Bt(),e.memoizedProps=e.pendingProps,n===null?dS(e):dt=n,Iv.current=null}function dS(e){var t=e;do{var n=t.alternate,r=t.return;if((t.flags&xu)===ue){ft(t);var a=void 0;if((t.mode&We)===ie?a=kb(n,t,ta):(lv(t),a=kb(n,t,ta),Pc(t,!1)),Bt(),a!==null){dt=a;return}}else{var i=Q0(n,t);if(i!==null){i.flags&=XR,dt=i;return}if((t.mode&We)!==ie){Pc(t,!1);for(var o=t.actualDuration,u=t.child;u!==null;)o+=u.actualDuration,u=u.sibling;t.actualDuration=o}if(r!==null)r.flags|=xu,r.subtreeFlags=ue,r.deletions=null;else{zt=Wv,dt=null;return}}var c=t.sibling;if(c!==null){dt=c;return}t=r,dt=t}while(t!==null);zt===wa&&(zt=Zb)}function Gi(e,t,n){var r=xr(),a=tn.transition;try{tn.transition=null,qt(In),t_(e,t,n,r)}finally{tn.transition=a,qt(r)}return null}function t_(e,t,n,r){do Aa();while(oi!==null);if(d_(),(Ue&(nn|dr))!==Nt)throw new Error("Should not already be working.");var a=e.finishedWork,i=e.finishedLanes;if(hC(i),a===null)return Om(),null;if(i===H&&f("root.finishedLanes should not be empty during a commit. This is a bug in React."),e.finishedWork=null,e.finishedLanes=H,a===e.current)throw new Error("Cannot commit the same tree as before. This error is likely caused by a bug in React. Please file an issue.");e.callbackNode=null,e.callbackPriority=Yt;var o=Ee(a.lanes,a.childLanes);GC(e,o),e===bn&&(bn=null,dt=null,kt=H),((a.subtreeFlags&po)!==ue||(a.flags&po)!==ue)&&(Yi||(Yi=!0,Zv=n,sh(xi,function(){return Aa(),null})));var u=(a.subtreeFlags&(Qf|Xf|Du|po))!==ue,c=(a.flags&(Qf|Xf|Du|po))!==ue;if(u||c){var h=tn.transition;tn.transition=null;var m=xr();qt(In);var R=Ue;Ue|=dr,Iv.current=null,eO(e,a),rb(),vO(e,a,i),pD(e.containerInfo),e.current=a,TC(i),hO(a,e,i),xC(),rC(),Ue=R,qt(m),tn.transition=h}else e.current=a,rb();var E=Yi;if(Yi?(Yi=!1,oi=e,jl=i):(Qo=0,ef=null),o=e.pendingLanes,o===H&&(Wo=null),E||mS(e.current,!1),cC(a.stateNode,r),Tr&&e.memoizedUpdaters.clear(),NO(),Nn(e,Pt()),t!==null)for(var x=e.onRecoverableError,w=0;w<t.length;w++){var A=t[w],I=A.stack,ae=A.digest;x(A.value,{componentStack:I,digest:ae})}if(Jc){Jc=!1;var te=Kv;throw Kv=null,te}return Gn(jl,ve)&&e.tag!==Xa&&Aa(),o=e.pendingLanes,Gn(o,ve)?(o0(),e===eh?Vl++:(Vl=0,eh=e)):Vl=0,Ka(),Om(),null}function Aa(){if(oi!==null){var e=Ym(jl),t=XC(ba,e),n=tn.transition,r=xr();try{return tn.transition=null,qt(t),r_()}finally{qt(r),tn.transition=n}}return!1}function n_(e){Jv.push(e),Yi||(Yi=!0,sh(xi,function(){return Aa(),null}))}function r_(){if(oi===null)return!1;var e=Zv;Zv=null;var t=oi,n=jl;if(oi=null,jl=H,(Ue&(nn|dr))!==Nt)throw new Error("Cannot flush passive effects while already rendering.");th=!0,Zc=!1,DC(n);var r=Ue;Ue|=dr,RO(t.current),gO(t,t.current,n,e);{var a=Jv;Jv=[];for(var i=0;i<a.length;i++){var o=a[i];aO(t,o)}}wC(),mS(t.current,!0),Ue=r,Ka(),Zc?t===ef?Qo++:(Qo=0,ef=t):Qo=0,th=!1,Zc=!1,fC(t);{var u=t.current.stateNode;u.effectDuration=0,u.passiveEffectDuration=0}return!0}function pS(e){return Wo!==null&&Wo.has(e)}function a_(e){Wo===null?Wo=new Set([e]):Wo.add(e)}function i_(e){Jc||(Jc=!0,Kv=e)}var o_=i_;function vS(e,t,n){var r=Bi(n,t),a=fb(e,r,ve),i=Za(e,a,ve),o=Sn();i!==null&&(Nu(i,ve,o),Nn(i,o))}function nt(e,t,n){if(K0(n),Yl(!1),e.tag===F){vS(e,e,n);return}var r=null;for(r=t;r!==null;){if(r.tag===F){vS(r,e,n);return}else if(r.tag===U){var a=r.type,i=r.stateNode;if(typeof a.getDerivedStateFromError=="function"||typeof i.componentDidCatch=="function"&&!pS(i)){var o=Bi(n,e),u=Dv(r,o,ve),c=Za(r,u,ve),h=Sn();c!==null&&(Nu(c,ve,h),Nn(c,h));return}}r=r.return}f(`Internal React error: Attempted to capture a commit phase error inside a detached tree. This indicates a bug in React. Likely causes include deleting the same fiber more than once, committing an already-finished tree, or an inconsistent return pointer.
+
+Error message:
+
+%s`,n)}function u_(e,t,n){var r=e.pingCache;r!==null&&r.delete(t);var a=Sn();Vm(e,n),m_(e),bn===e&&bo(kt,n)&&(zt===Nl||zt===Qc&&zm(kt)&&Pt()-Xv<eS?qi(e,H):Kc=Ee(Kc,n)),Nn(e,a)}function hS(e,t){t===Yt&&(t=BO(e));var n=Sn(),r=Ln(e,t);r!==null&&(Nu(r,t,n),Nn(r,n))}function l_(e){var t=e.memoizedState,n=Yt;t!==null&&(n=t.retryLane),hS(e,n)}function s_(e,t){var n=Yt,r;switch(e.tag){case de:r=e.stateNode;var a=e.memoizedState;a!==null&&(n=a.retryLane);break;case rt:r=e.stateNode;break;default:throw new Error("Pinged unknown suspense boundary type. This is probably a bug in React.")}r!==null&&r.delete(t),hS(e,n)}function c_(e){return e<120?120:e<480?480:e<1080?1080:e<1920?1920:e<3e3?3e3:e<4320?4320:FO(e/1960)*1960}function f_(){if(Vl>jO)throw Vl=0,eh=null,new Error("Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops.");Qo>VO&&(Qo=0,ef=null,f("Maximum update depth exceeded. This can happen when a component calls setState inside useEffect, but useEffect either doesn't have a dependency array, or one of the dependencies changes on every render."))}function d_(){Or.flushLegacyContextWarning(),Or.flushPendingUnsafeLifecycleWarnings()}function mS(e,t){ft(e),of(e,ha,LO),t&&of(e,gs,MO),of(e,ha,_O),t&&of(e,gs,AO),Bt()}function of(e,t,n){for(var r=e,a=null;r!==null;){var i=r.subtreeFlags&t;r!==a&&r.child!==null&&i!==ue?r=r.child:((r.flags&t)!==ue&&n(r),r.sibling!==null?r=r.sibling:r=a=r.return)}}var uf=null;function yS(e){{if((Ue&nn)!==Nt||!(e.mode&Me))return;var t=e.tag;if(t!==M&&t!==F&&t!==U&&t!==z&&t!==ne&&t!==Fe&&t!==ge)return;var n=ye(e)||"ReactComponent";if(uf!==null){if(uf.has(n))return;uf.add(n)}else uf=new Set([n]);var r=ln;try{ft(e),f("Can't perform a React state update on a component that hasn't mounted yet. This indicates that you have a side-effect in your render function that asynchronously later calls tries to update the component. Move this work to useEffect instead.")}finally{r?ft(e):Bt()}}}var oh;{var p_=null;oh=function(e,t,n){var r=xS(p_,t);try{return Ab(e,t,n)}catch(i){if(xw()||i!==null&&typeof i=="object"&&typeof i.then=="function")throw i;if(pc(),Mg(),zb(e,t),xS(t,r),t.mode&We&&lv(t),$f(null,Ab,null,e,t,n),GR()){var a=Yf();typeof a=="object"&&a!==null&&a._suppressLogging&&typeof i=="object"&&i!==null&&!i._suppressLogging&&(i._suppressLogging=!0)}throw i}}}var gS=!1,uh;uh=new Set;function v_(e){if(yi&&!r0())switch(e.tag){case z:case ne:case ge:{var t=dt&&ye(dt)||"Unknown",n=t;if(!uh.has(n)){uh.add(n);var r=ye(e)||"Unknown";f("Cannot update a component (`%s`) while rendering a different component (`%s`). To locate the bad setState() call inside `%s`, follow the stack trace as described in https://reactjs.org/link/setstate-in-render",r,t,t)}break}case U:{gS||(f("Cannot update during an existing state transition (such as within `render`). Render methods should be a pure function of props and state."),gS=!0);break}}}function $l(e,t){if(Tr){var n=e.memoizedUpdaters;n.forEach(function(r){Bm(e,r,t)})}}var lh={};function sh(e,t){{var n=zr.current;return n!==null?(n.push(t),lh):wm(e,t)}}function bS(e){if(e!==lh)return tC(e)}function SS(){return zr.current!==null}function h_(e){{if(e.mode&Me){if(!Kb())return}else if(!zO()||Ue!==Nt||e.tag!==z&&e.tag!==ne&&e.tag!==ge)return;if(zr.current===null){var t=ln;try{ft(e),f(`An update to %s inside a test was not wrapped in act(...).
+
+When testing, code that causes React state updates should be wrapped into act(...):
+
+act(() => {
+  /* fire events that update state */
+});
+/* assert on the output */
+
+This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act`,ye(e))}finally{t?ft(e):Bt()}}}}function m_(e){e.tag!==Xa&&Kb()&&zr.current===null&&f(`A suspended resource finished loading inside a test, but the event was not wrapped in act(...).
+
+When testing, code that resolves suspended data should be wrapped into act(...):
+
+act(() => {
+  /* finish loading suspended data */
+});
+/* assert on the output */
+
+This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act`)}function Yl(e){rS=e}var pr=null,Xo=null,y_=function(e){pr=e};function Ko(e){{if(pr===null)return e;var t=pr(e);return t===void 0?e:t.current}}function ch(e){return Ko(e)}function fh(e){{if(pr===null)return e;var t=pr(e);if(t===void 0){if(e!=null&&typeof e.render=="function"){var n=Ko(e.render);if(e.render!==n){var r={$$typeof:fe,render:n};return e.displayName!==void 0&&(r.displayName=e.displayName),r}}return e}return t.current}}function ES(e,t){{if(pr===null)return!1;var n=e.elementType,r=t.type,a=!1,i=typeof r=="object"&&r!==null?r.$$typeof:null;switch(e.tag){case U:{typeof r=="function"&&(a=!0);break}case z:{(typeof r=="function"||i===we)&&(a=!0);break}case ne:{(i===fe||i===we)&&(a=!0);break}case Fe:case ge:{(i===ct||i===we)&&(a=!0);break}default:return!1}if(a){var o=pr(n);if(o!==void 0&&o===pr(r))return!0}return!1}}function RS(e){{if(pr===null||typeof WeakSet!="function")return;Xo===null&&(Xo=new WeakSet),Xo.add(e)}}var g_=function(e,t){{if(pr===null)return;var n=t.staleFamilies,r=t.updatedFamilies;Aa(),_a(function(){dh(e.current,r,n)})}},b_=function(e,t){{if(e.context!==Xn)return;Aa(),_a(function(){ql(t,e,null,null)})}};function dh(e,t,n){{var r=e.alternate,a=e.child,i=e.sibling,o=e.tag,u=e.type,c=null;switch(o){case z:case ge:case U:c=u;break;case ne:c=u.render;break}if(pr===null)throw new Error("Expected resolveFamily to be set during hot reload.");var h=!1,m=!1;if(c!==null){var R=pr(c);R!==void 0&&(n.has(R)?m=!0:t.has(R)&&(o===U?m=!0:h=!0))}if(Xo!==null&&(Xo.has(e)||r!==null&&Xo.has(r))&&(m=!0),m&&(e._debugNeedsRemount=!0),m||h){var E=Ln(e,ve);E!==null&&Ft(E,e,ve,at)}a!==null&&!m&&dh(a,t,n),i!==null&&dh(i,t,n)}}var S_=function(e,t){{var n=new Set,r=new Set(t.map(function(a){return a.current}));return ph(e.current,r,n),n}};function ph(e,t,n){{var r=e.child,a=e.sibling,i=e.tag,o=e.type,u=null;switch(i){case z:case ge:case U:u=o;break;case ne:u=o.render;break}var c=!1;u!==null&&t.has(u)&&(c=!0),c?E_(e,n):r!==null&&ph(r,t,n),a!==null&&ph(a,t,n)}}function E_(e,t){{var n=R_(e,t);if(n)return;for(var r=e;;){switch(r.tag){case $:t.add(r.stateNode);return;case ee:t.add(r.stateNode.containerInfo);return;case F:t.add(r.stateNode.containerInfo);return}if(r.return===null)throw new Error("Expected to reach root first.");r=r.return}}}function R_(e,t){for(var n=e,r=!1;;){if(n.tag===$)r=!0,t.add(n.stateNode);else if(n.child!==null){n.child.return=n,n=n.child;continue}if(n===e)return r;for(;n.sibling===null;){if(n.return===null||n.return===e)return r;n=n.return}n.sibling.return=n.return,n=n.sibling}return!1}var vh;{vh=!1;try{var CS=Object.preventExtensions({})}catch{vh=!0}}function C_(e,t,n,r){this.tag=e,this.key=n,this.elementType=null,this.type=null,this.stateNode=null,this.return=null,this.child=null,this.sibling=null,this.index=0,this.ref=null,this.pendingProps=t,this.memoizedProps=null,this.updateQueue=null,this.memoizedState=null,this.dependencies=null,this.mode=r,this.flags=ue,this.subtreeFlags=ue,this.deletions=null,this.lanes=H,this.childLanes=H,this.alternate=null,this.actualDuration=Number.NaN,this.actualStartTime=Number.NaN,this.selfBaseDuration=Number.NaN,this.treeBaseDuration=Number.NaN,this.actualDuration=0,this.actualStartTime=-1,this.selfBaseDuration=0,this.treeBaseDuration=0,this._debugSource=null,this._debugOwner=null,this._debugNeedsRemount=!1,this._debugHookTypes=null,!vh&&typeof Object.preventExtensions=="function"&&Object.preventExtensions(this)}var Kn=function(e,t,n,r){return new C_(e,t,n,r)};function hh(e){var t=e.prototype;return!!(t&&t.isReactComponent)}function T_(e){return typeof e=="function"&&!hh(e)&&e.defaultProps===void 0}function x_(e){if(typeof e=="function")return hh(e)?U:z;if(e!=null){var t=e.$$typeof;if(t===fe)return ne;if(t===ct)return Fe}return M}function Ii(e,t){var n=e.alternate;n===null?(n=Kn(e.tag,t,e.key,e.mode),n.elementType=e.elementType,n.type=e.type,n.stateNode=e.stateNode,n._debugSource=e._debugSource,n._debugOwner=e._debugOwner,n._debugHookTypes=e._debugHookTypes,n.alternate=e,e.alternate=n):(n.pendingProps=t,n.type=e.type,n.flags=ue,n.subtreeFlags=ue,n.deletions=null,n.actualDuration=0,n.actualStartTime=-1),n.flags=e.flags&ma,n.childLanes=e.childLanes,n.lanes=e.lanes,n.child=e.child,n.memoizedProps=e.memoizedProps,n.memoizedState=e.memoizedState,n.updateQueue=e.updateQueue;var r=e.dependencies;switch(n.dependencies=r===null?null:{lanes:r.lanes,firstContext:r.firstContext},n.sibling=e.sibling,n.index=e.index,n.ref=e.ref,n.selfBaseDuration=e.selfBaseDuration,n.treeBaseDuration=e.treeBaseDuration,n._debugNeedsRemount=e._debugNeedsRemount,n.tag){case M:case z:case ge:n.type=Ko(e.type);break;case U:n.type=ch(e.type);break;case ne:n.type=fh(e.type);break}return n}function D_(e,t){e.flags&=ma|xt;var n=e.alternate;if(n===null)e.childLanes=H,e.lanes=t,e.child=null,e.subtreeFlags=ue,e.memoizedProps=null,e.memoizedState=null,e.updateQueue=null,e.dependencies=null,e.stateNode=null,e.selfBaseDuration=0,e.treeBaseDuration=0;else{e.childLanes=n.childLanes,e.lanes=n.lanes,e.child=n.child,e.subtreeFlags=ue,e.deletions=null,e.memoizedProps=n.memoizedProps,e.memoizedState=n.memoizedState,e.updateQueue=n.updateQueue,e.type=n.type;var r=n.dependencies;e.dependencies=r===null?null:{lanes:r.lanes,firstContext:r.firstContext},e.selfBaseDuration=n.selfBaseDuration,e.treeBaseDuration=n.treeBaseDuration}return e}function w_(e,t,n){var r;return e===rc?(r=Me,t===!0&&(r|=vt,r|=qr)):r=ie,Tr&&(r|=We),Kn(F,null,null,r)}function mh(e,t,n,r,a,i){var o=M,u=e;if(typeof e=="function")hh(e)?(o=U,u=ch(u)):u=Ko(u);else if(typeof e=="string")o=$;else e:switch(e){case b:return si(n.children,a,i,t);case j:o=Je,a|=vt,(a&Me)!==ie&&(a|=qr);break;case G:return O_(n,a,i,t);case Te:return __(n,a,i,t);case Se:return A_(n,a,i,t);case Er:return TS(n,a,i,t);case Rr:case st:case Vt:case vi:case un:default:{if(typeof e=="object"&&e!==null)switch(e.$$typeof){case oe:o=Ce;break e;case Ae:o=Ye;break e;case fe:o=ne,u=fh(u);break e;case ct:o=Fe;break e;case we:o=Gt,u=null;break e}var c="";{(e===void 0||typeof e=="object"&&e!==null&&Object.keys(e).length===0)&&(c+=" You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.");var h=r?ye(r):null;h&&(c+=`
+
+Check the render method of \``+h+"`.")}throw new Error("Element type is invalid: expected a string (for built-in components) or a class/function (for composite components) "+("but got: "+(e==null?e:typeof e)+"."+c))}}var m=Kn(o,n,t,a);return m.elementType=e,m.type=u,m.lanes=i,m._debugOwner=r,m}function yh(e,t,n){var r=null;r=e._owner;var a=e.type,i=e.key,o=e.props,u=mh(a,i,o,r,t,n);return u._debugSource=e._source,u._debugOwner=e._owner,u}function si(e,t,n,r){var a=Kn(ce,e,r,t);return a.lanes=n,a}function O_(e,t,n,r){typeof e.id!="string"&&f('Profiler must specify an "id" of type `string` as a prop. Received the type `%s` instead.',typeof e.id);var a=Kn(Ke,e,r,t|We);return a.elementType=G,a.lanes=n,a.stateNode={effectDuration:0,passiveEffectDuration:0},a}function __(e,t,n,r){var a=Kn(de,e,r,t);return a.elementType=Te,a.lanes=n,a}function A_(e,t,n,r){var a=Kn(rt,e,r,t);return a.elementType=Se,a.lanes=n,a}function TS(e,t,n,r){var a=Kn(xe,e,r,t);a.elementType=Er,a.lanes=n;var i={isHidden:!1};return a.stateNode=i,a}function gh(e,t,n){var r=Kn(B,e,null,t);return r.lanes=n,r}function L_(){var e=Kn($,null,null,ie);return e.elementType="DELETED",e}function M_(e){var t=Kn(Rt,null,null,ie);return t.stateNode=e,t}function bh(e,t,n){var r=e.children!==null?e.children:[],a=Kn(ee,r,e.key,t);return a.lanes=n,a.stateNode={containerInfo:e.containerInfo,pendingChildren:null,implementation:e.implementation},a}function xS(e,t){return e===null&&(e=Kn(M,null,null,ie)),e.tag=t.tag,e.key=t.key,e.elementType=t.elementType,e.type=t.type,e.stateNode=t.stateNode,e.return=t.return,e.child=t.child,e.sibling=t.sibling,e.index=t.index,e.ref=t.ref,e.pendingProps=t.pendingProps,e.memoizedProps=t.memoizedProps,e.updateQueue=t.updateQueue,e.memoizedState=t.memoizedState,e.dependencies=t.dependencies,e.mode=t.mode,e.flags=t.flags,e.subtreeFlags=t.subtreeFlags,e.deletions=t.deletions,e.lanes=t.lanes,e.childLanes=t.childLanes,e.alternate=t.alternate,e.actualDuration=t.actualDuration,e.actualStartTime=t.actualStartTime,e.selfBaseDuration=t.selfBaseDuration,e.treeBaseDuration=t.treeBaseDuration,e._debugSource=t._debugSource,e._debugOwner=t._debugOwner,e._debugNeedsRemount=t._debugNeedsRemount,e._debugHookTypes=t._debugHookTypes,e}function U_(e,t,n,r,a){this.tag=t,this.containerInfo=e,this.pendingChildren=null,this.current=null,this.pingCache=null,this.finishedWork=null,this.timeoutHandle=ep,this.context=null,this.pendingContext=null,this.callbackNode=null,this.callbackPriority=Yt,this.eventTimes=Cd(H),this.expirationTimes=Cd(at),this.pendingLanes=H,this.suspendedLanes=H,this.pingedLanes=H,this.expiredLanes=H,this.mutableReadLanes=H,this.finishedLanes=H,this.entangledLanes=H,this.entanglements=Cd(H),this.identifierPrefix=r,this.onRecoverableError=a,this.mutableSourceEagerHydrationData=null,this.effectDuration=0,this.passiveEffectDuration=0;{this.memoizedUpdaters=new Set;for(var i=this.pendingUpdatersLaneMap=[],o=0;o<ed;o++)i.push(new Set)}switch(t){case rc:this._debugRootType=n?"hydrateRoot()":"createRoot()";break;case Xa:this._debugRootType=n?"hydrate()":"render()";break}}function DS(e,t,n,r,a,i,o,u,c,h){var m=new U_(e,t,n,u,c),R=w_(t,i);m.current=R,R.stateNode=m;{var E={element:r,isDehydrated:n,cache:null,transitions:null,pendingSuspenseBoundaries:null};R.memoizedState=E}return Mp(R),m}var Sh="18.3.1";function N_(e,t,n){var r=arguments.length>3&&arguments[3]!==void 0?arguments[3]:null;return nr(r),{$$typeof:Sr,key:r==null?null:""+r,children:e,containerInfo:t,implementation:n}}var Eh,Rh;Eh=!1,Rh={};function wS(e){if(!e)return Xn;var t=co(e),n=mw(t);if(t.tag===U){var r=t.type;if(Wr(r))return eg(t,r,n)}return n}function k_(e,t){{var n=co(e);if(n===void 0){if(typeof e.render=="function")throw new Error("Unable to find node on an unmounted component.");var r=Object.keys(e).join(",");throw new Error("Argument appears to not be a ReactComponent. Keys: "+r)}var a=Tm(n);if(a===null)return null;if(a.mode&vt){var i=ye(n)||"Component";if(!Rh[i]){Rh[i]=!0;var o=ln;try{ft(a),n.mode&vt?f("%s is deprecated in StrictMode. %s was passed an instance of %s which is inside StrictMode. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-find-node",t,t,i):f("%s is deprecated in StrictMode. %s was passed an instance of %s which renders StrictMode children. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-find-node",t,t,i)}finally{o?ft(o):Bt()}}}return a.stateNode}}function OS(e,t,n,r,a,i,o,u){var c=!1,h=null;return DS(e,t,c,h,n,r,a,i,o)}function _S(e,t,n,r,a,i,o,u,c,h){var m=!0,R=DS(n,r,m,e,a,i,o,u,c);R.context=wS(null);var E=R.current,x=Sn(),w=ui(E),A=xa(x,w);return A.callback=t??null,Za(E,A,w),PO(R,w,x),R}function ql(e,t,n,r){sC(t,e);var a=t.current,i=Sn(),o=ui(a);_C(o);var u=wS(n);t.context===null?t.context=u:t.pendingContext=u,yi&&ln!==null&&!Eh&&(Eh=!0,f(`Render methods should be a pure function of props and state; triggering nested component updates from render is not allowed. If necessary, trigger nested updates in componentDidUpdate.
+
+Check the render method of %s.`,ye(ln)||"Unknown"));var c=xa(i,o);c.payload={element:e},r=r===void 0?null:r,r!==null&&(typeof r!="function"&&f("render(...): Expected the last optional `callback` argument to be a function. Instead received: %s.",r),c.callback=r);var h=Za(a,c,o);return h!==null&&(Ft(h,a,o,i),gc(h,a,o)),o}function lf(e){var t=e.current;if(!t.child)return null;switch(t.child.tag){case $:return t.child.stateNode;default:return t.child.stateNode}}function z_(e){switch(e.tag){case F:{var t=e.stateNode;if(ws(t)){var n=HC(t);GO(t,n)}break}case de:{_a(function(){var a=Ln(e,ve);if(a!==null){var i=Sn();Ft(a,e,ve,i)}});var r=ve;Ch(e,r);break}}}function AS(e,t){var n=e.memoizedState;n!==null&&n.dehydrated!==null&&(n.retryLane=YC(n.retryLane,t))}function Ch(e,t){AS(e,t);var n=e.alternate;n&&AS(n,t)}function F_(e){if(e.tag===de){var t=Au,n=Ln(e,t);if(n!==null){var r=Sn();Ft(n,e,t,r)}Ch(e,t)}}function H_(e){if(e.tag===de){var t=ui(e),n=Ln(e,t);if(n!==null){var r=Sn();Ft(n,e,t,r)}Ch(e,t)}}function LS(e){var t=eC(e);return t===null?null:t.stateNode}var MS=function(e){return null};function j_(e){return MS(e)}var US=function(e){return!1};function V_(e){return US(e)}var NS=null,kS=null,zS=null,FS=null,HS=null,jS=null,VS=null,BS=null,PS=null;{var $S=function(e,t,n){var r=t[n],a=Be(e)?e.slice():_e({},e);return n+1===t.length?(Be(a)?a.splice(r,1):delete a[r],a):(a[r]=$S(e[r],t,n+1),a)},YS=function(e,t){return $S(e,t,0)},qS=function(e,t,n,r){var a=t[r],i=Be(e)?e.slice():_e({},e);if(r+1===t.length){var o=n[r];i[o]=i[a],Be(i)?i.splice(a,1):delete i[a]}else i[a]=qS(e[a],t,n,r+1);return i},GS=function(e,t,n){if(t.length!==n.length){S("copyWithRename() expects paths of the same length");return}else for(var r=0;r<n.length-1;r++)if(t[r]!==n[r]){S("copyWithRename() expects paths to be the same except for the deepest key");return}return qS(e,t,n,0)},IS=function(e,t,n,r){if(n>=t.length)return r;var a=t[n],i=Be(e)?e.slice():_e({},e);return i[a]=IS(e[a],t,n+1,r),i},WS=function(e,t,n){return IS(e,t,0,n)},Th=function(e,t){for(var n=e.memoizedState;n!==null&&t>0;)n=n.next,t--;return n};NS=function(e,t,n,r){var a=Th(e,t);if(a!==null){var i=WS(a.memoizedState,n,r);a.memoizedState=i,a.baseState=i,e.memoizedProps=_e({},e.memoizedProps);var o=Ln(e,ve);o!==null&&Ft(o,e,ve,at)}},kS=function(e,t,n){var r=Th(e,t);if(r!==null){var a=YS(r.memoizedState,n);r.memoizedState=a,r.baseState=a,e.memoizedProps=_e({},e.memoizedProps);var i=Ln(e,ve);i!==null&&Ft(i,e,ve,at)}},zS=function(e,t,n,r){var a=Th(e,t);if(a!==null){var i=GS(a.memoizedState,n,r);a.memoizedState=i,a.baseState=i,e.memoizedProps=_e({},e.memoizedProps);var o=Ln(e,ve);o!==null&&Ft(o,e,ve,at)}},FS=function(e,t,n){e.pendingProps=WS(e.memoizedProps,t,n),e.alternate&&(e.alternate.pendingProps=e.pendingProps);var r=Ln(e,ve);r!==null&&Ft(r,e,ve,at)},HS=function(e,t){e.pendingProps=YS(e.memoizedProps,t),e.alternate&&(e.alternate.pendingProps=e.pendingProps);var n=Ln(e,ve);n!==null&&Ft(n,e,ve,at)},jS=function(e,t,n){e.pendingProps=GS(e.memoizedProps,t,n),e.alternate&&(e.alternate.pendingProps=e.pendingProps);var r=Ln(e,ve);r!==null&&Ft(r,e,ve,at)},VS=function(e){var t=Ln(e,ve);t!==null&&Ft(t,e,ve,at)},BS=function(e){MS=e},PS=function(e){US=e}}function B_(e){var t=Tm(e);return t===null?null:t.stateNode}function P_(e){return null}function $_(){return ln}function Y_(e){var t=e.findFiberByHostInstance,n=p.ReactCurrentDispatcher;return lC({bundleType:e.bundleType,version:e.version,rendererPackageName:e.rendererPackageName,rendererConfig:e.rendererConfig,overrideHookState:NS,overrideHookStateDeletePath:kS,overrideHookStateRenamePath:zS,overrideProps:FS,overridePropsDeletePath:HS,overridePropsRenamePath:jS,setErrorHandler:BS,setSuspenseHandler:PS,scheduleUpdate:VS,currentDispatcherRef:n,findHostInstanceByFiber:B_,findFiberByHostInstance:t||P_,findHostInstancesForRefresh:S_,scheduleRefresh:g_,scheduleRoot:b_,setRefreshHandler:y_,getCurrentFiber:$_,reconcilerVersion:Sh})}var QS=typeof reportError=="function"?reportError:function(e){console.error(e)};function xh(e){this._internalRoot=e}sf.prototype.render=xh.prototype.render=function(e){var t=this._internalRoot;if(t===null)throw new Error("Cannot update an unmounted root.");{typeof arguments[1]=="function"?f("render(...): does not support the second callback argument. To execute a side effect after rendering, declare it in a component body with useEffect()."):cf(arguments[1])?f("You passed a container to the second argument of root.render(...). You don't need to pass it again since you already passed it to create the root."):typeof arguments[1]<"u"&&f("You passed a second argument to root.render(...) but it only accepts one argument.");var n=t.containerInfo;if(n.nodeType!==Tt){var r=LS(t.current);r&&r.parentNode!==n&&f("render(...): It looks like the React-rendered content of the root container was removed without using React. This is not supported and will cause errors. Instead, call root.unmount() to empty a root's container.")}}ql(e,t,null,null)},sf.prototype.unmount=xh.prototype.unmount=function(){typeof arguments[0]=="function"&&f("unmount(...): does not support a callback argument. To execute a side effect after rendering, declare it in a component body with useEffect().");var e=this._internalRoot;if(e!==null){this._internalRoot=null;var t=e.containerInfo;uS()&&f("Attempted to synchronously unmount a root while React was already rendering. React cannot finish unmounting the root until the current render has completed, which may lead to a race condition."),_a(function(){ql(null,e,null,null)}),Qy(t)}};function q_(e,t){if(!cf(e))throw new Error("createRoot(...): Target container is not a DOM element.");XS(e);var n=!1,r=!1,a="",i=QS;t!=null&&(t.hydrate?S("hydrate through createRoot is deprecated. Use ReactDOMClient.hydrateRoot(container, <App />) instead."):typeof t=="object"&&t!==null&&t.$$typeof===Pr&&f(`You passed a JSX element to createRoot. You probably meant to call root.render instead. Example usage:
+
+  let root = createRoot(domContainer);
+  root.render(<App />);`),t.unstable_strictMode===!0&&(n=!0),t.identifierPrefix!==void 0&&(a=t.identifierPrefix),t.onRecoverableError!==void 0&&(i=t.onRecoverableError),t.transitionCallbacks!==void 0&&t.transitionCallbacks);var o=OS(e,rc,null,n,r,a,i);Xs(o.current,e);var u=e.nodeType===Tt?e.parentNode:e;return Ku(u),new xh(o)}function sf(e){this._internalRoot=e}function G_(e){e&&uT(e)}sf.prototype.unstable_scheduleHydration=G_;function I_(e,t,n){if(!cf(e))throw new Error("hydrateRoot(...): Target container is not a DOM element.");XS(e),t===void 0&&f("Must provide initial children as second argument to hydrateRoot. Example usage: hydrateRoot(domContainer, <App />)");var r=n??null,a=n!=null&&n.hydratedSources||null,i=!1,o=!1,u="",c=QS;n!=null&&(n.unstable_strictMode===!0&&(i=!0),n.identifierPrefix!==void 0&&(u=n.identifierPrefix),n.onRecoverableError!==void 0&&(c=n.onRecoverableError));var h=_S(t,null,e,rc,r,i,o,u,c);if(Xs(h.current,e),Ku(e),a)for(var m=0;m<a.length;m++){var R=a[m];Kw(h,R)}return new sf(h)}function cf(e){return!!(e&&(e.nodeType===_n||e.nodeType===da||e.nodeType===Mf||!Ht))}function Gl(e){return!!(e&&(e.nodeType===_n||e.nodeType===da||e.nodeType===Mf||e.nodeType===Tt&&e.nodeValue===" react-mount-point-unstable "))}function XS(e){e.nodeType===_n&&e.tagName&&e.tagName.toUpperCase()==="BODY"&&f("createRoot(): Creating roots directly with document.body is discouraged, since its children are often manipulated by third-party scripts and browser extensions. This may lead to subtle reconciliation issues. Try using a container element created for your app."),ll(e)&&(e._reactRootContainer?f("You are calling ReactDOMClient.createRoot() on a container that was previously passed to ReactDOM.render(). This is not supported."):f("You are calling ReactDOMClient.createRoot() on a container that has already been passed to createRoot() before. Instead, call root.render() on the existing root instead if you want to update it."))}var W_=p.ReactCurrentOwner,KS;KS=function(e){if(e._reactRootContainer&&e.nodeType!==Tt){var t=LS(e._reactRootContainer.current);t&&t.parentNode!==e&&f("render(...): It looks like the React-rendered content of this container was removed without using React. This is not supported and will cause errors. Instead, call ReactDOM.unmountComponentAtNode to empty a container.")}var n=!!e._reactRootContainer,r=Dh(e),a=!!(r&&Wa(r));a&&!n&&f("render(...): Replacing React-rendered children with a new root component. If you intended to update the children of this node, you should instead have the existing children update their state and render the new components instead of calling ReactDOM.render."),e.nodeType===_n&&e.tagName&&e.tagName.toUpperCase()==="BODY"&&f("render(): Rendering components directly into document.body is discouraged, since its children are often manipulated by third-party scripts and browser extensions. This may lead to subtle reconciliation issues. Try rendering into a container element created for your app.")};function Dh(e){return e?e.nodeType===da?e.documentElement:e.firstChild:null}function JS(){}function Q_(e,t,n,r,a){if(a){if(typeof r=="function"){var i=r;r=function(){var E=lf(o);i.call(E)}}var o=_S(t,r,e,Xa,null,!1,!1,"",JS);e._reactRootContainer=o,Xs(o.current,e);var u=e.nodeType===Tt?e.parentNode:e;return Ku(u),_a(),o}else{for(var c;c=e.lastChild;)e.removeChild(c);if(typeof r=="function"){var h=r;r=function(){var E=lf(m);h.call(E)}}var m=OS(e,Xa,null,!1,!1,"",JS);e._reactRootContainer=m,Xs(m.current,e);var R=e.nodeType===Tt?e.parentNode:e;return Ku(R),_a(function(){ql(t,m,n,r)}),m}}function X_(e,t){e!==null&&typeof e!="function"&&f("%s(...): Expected the last optional `callback` argument to be a function. Instead received: %s.",t,e)}function ff(e,t,n,r,a){KS(n),X_(a===void 0?null:a,"render");var i=n._reactRootContainer,o;if(!i)o=Q_(n,t,e,a,r);else{if(o=i,typeof a=="function"){var u=a;a=function(){var c=lf(o);u.call(c)}}ql(t,o,e,a)}return lf(o)}var ZS=!1;function K_(e){{ZS||(ZS=!0,f("findDOMNode is deprecated and will be removed in the next major release. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-find-node"));var t=W_.current;if(t!==null&&t.stateNode!==null){var n=t.stateNode._warnedAboutRefsInRender;n||f("%s is accessing findDOMNode inside its render(). render() should be a pure function of props and state. It should never access something that requires stale data from the previous render, such as refs. Move this logic to componentDidMount and componentDidUpdate instead.",ze(t.type)||"A component"),t.stateNode._warnedAboutRefsInRender=!0}}return e==null?null:e.nodeType===_n?e:k_(e,"findDOMNode")}function J_(e,t,n){if(f("ReactDOM.hydrate is no longer supported in React 18. Use hydrateRoot instead. Until you switch to the new API, your app will behave as if it's running React 17. Learn more: https://reactjs.org/link/switch-to-createroot"),!Gl(t))throw new Error("Target container is not a DOM element.");{var r=ll(t)&&t._reactRootContainer===void 0;r&&f("You are calling ReactDOM.hydrate() on a container that was previously passed to ReactDOMClient.createRoot(). This is not supported. Did you mean to call hydrateRoot(container, element)?")}return ff(null,e,t,!0,n)}function Z_(e,t,n){if(f("ReactDOM.render is no longer supported in React 18. Use createRoot instead. Until you switch to the new API, your app will behave as if it's running React 17. Learn more: https://reactjs.org/link/switch-to-createroot"),!Gl(t))throw new Error("Target container is not a DOM element.");{var r=ll(t)&&t._reactRootContainer===void 0;r&&f("You are calling ReactDOM.render() on a container that was previously passed to ReactDOMClient.createRoot(). This is not supported. Did you mean to call root.render(element)?")}return ff(null,e,t,!1,n)}function eA(e,t,n,r){if(f("ReactDOM.unstable_renderSubtreeIntoContainer() is no longer supported in React 18. Consider using a portal instead. Until you switch to the createRoot API, your app will behave as if it's running React 17. Learn more: https://reactjs.org/link/switch-to-createroot"),!Gl(n))throw new Error("Target container is not a DOM element.");if(e==null||!IR(e))throw new Error("parentComponent must be a valid React Component");return ff(e,t,n,!1,r)}var eE=!1;function tA(e){if(eE||(eE=!0,f("unmountComponentAtNode is deprecated and will be removed in the next major release. Switch to the createRoot API. Learn more: https://reactjs.org/link/switch-to-createroot")),!Gl(e))throw new Error("unmountComponentAtNode(...): Target container is not a DOM element.");{var t=ll(e)&&e._reactRootContainer===void 0;t&&f("You are calling ReactDOM.unmountComponentAtNode() on a container that was previously passed to ReactDOMClient.createRoot(). This is not supported. Did you mean to call root.unmount()?")}if(e._reactRootContainer){{var n=Dh(e),r=n&&!Wa(n);r&&f("unmountComponentAtNode(): The node you're attempting to unmount was rendered by another copy of React.")}return _a(function(){ff(null,null,e,!1,function(){e._reactRootContainer=null,Qy(e)})}),!0}else{{var a=Dh(e),i=!!(a&&Wa(a)),o=e.nodeType===_n&&Gl(e.parentNode)&&!!e.parentNode._reactRootContainer;i&&f("unmountComponentAtNode(): The node you're attempting to unmount was rendered by React and is not a top-level container. %s",o?"You may have accidentally passed in a React root node instead of its container.":"Instead, have the parent component update its state and rerender in order to remove this component.")}return!1}}KC(z_),ZC(F_),eT(H_),tT(xr),nT(WC),(typeof Map!="function"||Map.prototype==null||typeof Map.prototype.forEach!="function"||typeof Set!="function"||Set.prototype==null||typeof Set.prototype.clear!="function"||typeof Set.prototype.forEach!="function")&&f("React depends on Map and Set built-in types. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills"),zR(rD),jR(rh,IO,_a);function nA(e,t){var n=arguments.length>2&&arguments[2]!==void 0?arguments[2]:null;if(!cf(t))throw new Error("Target container is not a DOM element.");return N_(e,t,null,n)}function rA(e,t,n,r){return eA(e,t,n,r)}var wh={usingClientEntryPoint:!1,Events:[Wa,Oo,Ks,dm,pm,rh]};function aA(e,t){return wh.usingClientEntryPoint||f('You are importing createRoot from "react-dom" which is not supported. You should instead import it from "react-dom/client".'),q_(e,t)}function iA(e,t,n){return wh.usingClientEntryPoint||f('You are importing hydrateRoot from "react-dom" which is not supported. You should instead import it from "react-dom/client".'),I_(e,t,n)}function oA(e){return uS()&&f("flushSync was called from inside a lifecycle method. React cannot flush when React is already rendering. Consider moving this call to a scheduler task or micro task."),_a(e)}var uA=Y_({findFiberByHostInstance:Mi,bundleType:1,version:Sh,rendererPackageName:"react-dom"});if(!uA&&Ct&&window.top===window.self&&(navigator.userAgent.indexOf("Chrome")>-1&&navigator.userAgent.indexOf("Edge")===-1||navigator.userAgent.indexOf("Firefox")>-1)){var tE=window.location.protocol;/^(https?|file):$/.test(tE)&&console.info("%cDownload the React DevTools for a better development experience: https://reactjs.org/link/react-devtools"+(tE==="file:"?`
+You might need to use a local HTTP server (instead of file://): https://reactjs.org/link/react-devtools-faq`:""),"font-weight:bold")}Zn.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=wh,Zn.createPortal=nA,Zn.createRoot=aA,Zn.findDOMNode=K_,Zn.flushSync=oA,Zn.hydrate=J_,Zn.hydrateRoot=iA,Zn.render=Z_,Zn.unmountComponentAtNode=tA,Zn.unstable_batchedUpdates=rh,Zn.unstable_renderSubtreeIntoContainer=rA,Zn.version=Sh,typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop=="function"&&__REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(new Error)})();RE.exports=Zn;var vA=RE.exports,Oh=vA;{var df=Oh.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;Nh.createRoot=function(l,s){df.usingClientEntryPoint=!0;try{return Oh.createRoot(l,s)}finally{df.usingClientEntryPoint=!1}},Nh.hydrateRoot=function(l,s,p){df.usingClientEntryPoint=!0;try{return Oh.hydrateRoot(l,s,p)}finally{df.usingClientEntryPoint=!1}}}function xE(l,s){return function(){return l.apply(s,arguments)}}const{toString:hA}=Object.prototype,{getPrototypeOf:Yh}=Object,gf=(l=>s=>{const p=hA.call(s);return l[p]||(l[p]=p.slice(8,-1).toLowerCase())})(Object.create(null)),Hr=l=>(l=l.toLowerCase(),s=>gf(s)===l),bf=l=>s=>typeof s===l,{isArray:Zo}=Array,Ql=bf("undefined");function mA(l){return l!==null&&!Ql(l)&&l.constructor!==null&&!Ql(l.constructor)&&vr(l.constructor.isBuffer)&&l.constructor.isBuffer(l)}const DE=Hr("ArrayBuffer");function yA(l){let s;return typeof ArrayBuffer<"u"&&ArrayBuffer.isView?s=ArrayBuffer.isView(l):s=l&&l.buffer&&DE(l.buffer),s}const gA=bf("string"),vr=bf("function"),wE=bf("number"),Sf=l=>l!==null&&typeof l=="object",bA=l=>l===!0||l===!1,pf=l=>{if(gf(l)!=="object")return!1;const s=Yh(l);return(s===null||s===Object.prototype||Object.getPrototypeOf(s)===null)&&!(Symbol.toStringTag in l)&&!(Symbol.iterator in l)},SA=Hr("Date"),EA=Hr("File"),RA=Hr("Blob"),CA=Hr("FileList"),TA=l=>Sf(l)&&vr(l.pipe),xA=l=>{let s;return l&&(typeof FormData=="function"&&l instanceof FormData||vr(l.append)&&((s=gf(l))==="formdata"||s==="object"&&vr(l.toString)&&l.toString()==="[object FormData]"))},DA=Hr("URLSearchParams"),[wA,OA,_A,AA]=["ReadableStream","Request","Response","Headers"].map(Hr),LA=l=>l.trim?l.trim():l.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"");function Xl(l,s,{allOwnKeys:p=!1}={}){if(l===null||typeof l>"u")return;let v,y;if(typeof l!="object"&&(l=[l]),Zo(l))for(v=0,y=l.length;v<y;v++)s.call(null,l[v],v,l);else{const S=p?Object.getOwnPropertyNames(l):Object.keys(l),f=S.length;let N;for(v=0;v<f;v++)N=S[v],s.call(null,l[N],N,l)}}function OE(l,s){s=s.toLowerCase();const p=Object.keys(l);let v=p.length,y;for(;v-- >0;)if(y=p[v],s===y.toLowerCase())return y;return null}const _E=typeof globalThis<"u"?globalThis:typeof self<"u"?self:typeof window<"u"?window:global,AE=l=>!Ql(l)&&l!==_E;function kh(){const{caseless:l}=AE(this)&&this||{},s={},p=(v,y)=>{const S=l&&OE(s,y)||y;pf(s[S])&&pf(v)?s[S]=kh(s[S],v):pf(v)?s[S]=kh({},v):Zo(v)?s[S]=v.slice():s[S]=v};for(let v=0,y=arguments.length;v<y;v++)arguments[v]&&Xl(arguments[v],p);return s}const MA=(l,s,p,{allOwnKeys:v}={})=>(Xl(s,(y,S)=>{p&&vr(y)?l[S]=xE(y,p):l[S]=y},{allOwnKeys:v}),l),UA=l=>(l.charCodeAt(0)===65279&&(l=l.slice(1)),l),NA=(l,s,p,v)=>{l.prototype=Object.create(s.prototype,v),l.prototype.constructor=l,Object.defineProperty(l,"super",{value:s.prototype}),p&&Object.assign(l.prototype,p)},kA=(l,s,p,v)=>{let y,S,f;const N={};if(s=s||{},l==null)return s;do{for(y=Object.getOwnPropertyNames(l),S=y.length;S-- >0;)f=y[S],(!v||v(f,l,s))&&!N[f]&&(s[f]=l[f],N[f]=!0);l=p!==!1&&Yh(l)}while(l&&(!p||p(l,s))&&l!==Object.prototype);return s},zA=(l,s,p)=>{l=String(l),(p===void 0||p>l.length)&&(p=l.length),p-=s.length;const v=l.indexOf(s,p);return v!==-1&&v===p},FA=l=>{if(!l)return null;if(Zo(l))return l;let s=l.length;if(!wE(s))return null;const p=new Array(s);for(;s-- >0;)p[s]=l[s];return p},HA=(l=>s=>l&&s instanceof l)(typeof Uint8Array<"u"&&Yh(Uint8Array)),jA=(l,s)=>{const v=(l&&l[Symbol.iterator]).call(l);let y;for(;(y=v.next())&&!y.done;){const S=y.value;s.call(l,S[0],S[1])}},VA=(l,s)=>{let p;const v=[];for(;(p=l.exec(s))!==null;)v.push(p);return v},BA=Hr("HTMLFormElement"),PA=l=>l.toLowerCase().replace(/[-_\s]([a-z\d])(\w*)/g,function(p,v,y){return v.toUpperCase()+y}),nE=(({hasOwnProperty:l})=>(s,p)=>l.call(s,p))(Object.prototype),$A=Hr("RegExp"),LE=(l,s)=>{const p=Object.getOwnPropertyDescriptors(l),v={};Xl(p,(y,S)=>{let f;(f=s(y,S,l))!==!1&&(v[S]=f||y)}),Object.defineProperties(l,v)},YA=l=>{LE(l,(s,p)=>{if(vr(l)&&["arguments","caller","callee"].indexOf(p)!==-1)return!1;const v=l[p];if(vr(v)){if(s.enumerable=!1,"writable"in s){s.writable=!1;return}s.set||(s.set=()=>{throw Error("Can not rewrite read-only method '"+p+"'")})}})},qA=(l,s)=>{const p={},v=y=>{y.forEach(S=>{p[S]=!0})};return Zo(l)?v(l):v(String(l).split(s)),p},GA=()=>{},IA=(l,s)=>l!=null&&Number.isFinite(l=+l)?l:s,_h="abcdefghijklmnopqrstuvwxyz",rE="0123456789",ME={DIGIT:rE,ALPHA:_h,ALPHA_DIGIT:_h+_h.toUpperCase()+rE},WA=(l=16,s=ME.ALPHA_DIGIT)=>{let p="";const{length:v}=s;for(;l--;)p+=s[Math.random()*v|0];return p};function QA(l){return!!(l&&vr(l.append)&&l[Symbol.toStringTag]==="FormData"&&l[Symbol.iterator])}const XA=l=>{const s=new Array(10),p=(v,y)=>{if(Sf(v)){if(s.indexOf(v)>=0)return;if(!("toJSON"in v)){s[y]=v;const S=Zo(v)?[]:{};return Xl(v,(f,N)=>{const z=p(f,y+1);!Ql(z)&&(S[N]=z)}),s[y]=void 0,S}}return v};return p(l,0)},KA=Hr("AsyncFunction"),JA=l=>l&&(Sf(l)||vr(l))&&vr(l.then)&&vr(l.catch),_={isArray:Zo,isArrayBuffer:DE,isBuffer:mA,isFormData:xA,isArrayBufferView:yA,isString:gA,isNumber:wE,isBoolean:bA,isObject:Sf,isPlainObject:pf,isReadableStream:wA,isRequest:OA,isResponse:_A,isHeaders:AA,isUndefined:Ql,isDate:SA,isFile:EA,isBlob:RA,isRegExp:$A,isFunction:vr,isStream:TA,isURLSearchParams:DA,isTypedArray:HA,isFileList:CA,forEach:Xl,merge:kh,extend:MA,trim:LA,stripBOM:UA,inherits:NA,toFlatObject:kA,kindOf:gf,kindOfTest:Hr,endsWith:zA,toArray:FA,forEachEntry:jA,matchAll:VA,isHTMLForm:BA,hasOwnProperty:nE,hasOwnProp:nE,reduceDescriptors:LE,freezeMethods:YA,toObjectSet:qA,toCamelCase:PA,noop:GA,toFiniteNumber:IA,findKey:OE,global:_E,isContextDefined:AE,ALPHABET:ME,generateString:WA,isSpecCompliantForm:QA,toJSONObject:XA,isAsyncFn:KA,isThenable:JA};function Re(l,s,p,v,y){Error.call(this),Error.captureStackTrace?Error.captureStackTrace(this,this.constructor):this.stack=new Error().stack,this.message=l,this.name="AxiosError",s&&(this.code=s),p&&(this.config=p),v&&(this.request=v),y&&(this.response=y)}_.inherits(Re,Error,{toJSON:function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:_.toJSONObject(this.config),code:this.code,status:this.response&&this.response.status?this.response.status:null}}});const UE=Re.prototype,NE={};["ERR_BAD_OPTION_VALUE","ERR_BAD_OPTION","ECONNABORTED","ETIMEDOUT","ERR_NETWORK","ERR_FR_TOO_MANY_REDIRECTS","ERR_DEPRECATED","ERR_BAD_RESPONSE","ERR_BAD_REQUEST","ERR_CANCELED","ERR_NOT_SUPPORT","ERR_INVALID_URL"].forEach(l=>{NE[l]={value:l}});Object.defineProperties(Re,NE);Object.defineProperty(UE,"isAxiosError",{value:!0});Re.from=(l,s,p,v,y,S)=>{const f=Object.create(UE);return _.toFlatObject(l,f,function(z){return z!==Error.prototype},N=>N!=="isAxiosError"),Re.call(f,l.message,s,p,v,y),f.cause=l,f.name=l.name,S&&Object.assign(f,S),f};const ZA=null;function zh(l){return _.isPlainObject(l)||_.isArray(l)}function kE(l){return _.endsWith(l,"[]")?l.slice(0,-2):l}function aE(l,s,p){return l?l.concat(s).map(function(y,S){return y=kE(y),!p&&S?"["+y+"]":y}).join(p?".":""):s}function eL(l){return _.isArray(l)&&!l.some(zh)}const tL=_.toFlatObject(_,{},null,function(s){return/^is[A-Z]/.test(s)});function Ef(l,s,p){if(!_.isObject(l))throw new TypeError("target must be an object");s=s||new FormData,p=_.toFlatObject(p,{metaTokens:!0,dots:!1,indexes:!1},!1,function(ce,Je){return!_.isUndefined(Je[ce])});const v=p.metaTokens,y=p.visitor||M,S=p.dots,f=p.indexes,z=(p.Blob||typeof Blob<"u"&&Blob)&&_.isSpecCompliantForm(s);if(!_.isFunction(y))throw new TypeError("visitor must be a function");function U(B){if(B===null)return"";if(_.isDate(B))return B.toISOString();if(!z&&_.isBlob(B))throw new Re("Blob is not supported. Use a Buffer instead.");return _.isArrayBuffer(B)||_.isTypedArray(B)?z&&typeof Blob=="function"?new Blob([B]):Buffer.from(B):B}function M(B,ce,Je){let Ye=B;if(B&&!Je&&typeof B=="object"){if(_.endsWith(ce,"{}"))ce=v?ce:ce.slice(0,-2),B=JSON.stringify(B);else if(_.isArray(B)&&eL(B)||(_.isFileList(B)||_.endsWith(ce,"[]"))&&(Ye=_.toArray(B)))return ce=kE(ce),Ye.forEach(function(ne,Ke){!(_.isUndefined(ne)||ne===null)&&s.append(f===!0?aE([ce],Ke,S):f===null?ce:ce+"[]",U(ne))}),!1}return zh(B)?!0:(s.append(aE(Je,ce,S),U(B)),!1)}const F=[],ee=Object.assign(tL,{defaultVisitor:M,convertValue:U,isVisitable:zh});function $(B,ce){if(!_.isUndefined(B)){if(F.indexOf(B)!==-1)throw Error("Circular reference detected in "+ce.join("."));F.push(B),_.forEach(B,function(Ye,Ce){(!(_.isUndefined(Ye)||Ye===null)&&y.call(s,Ye,_.isString(Ce)?Ce.trim():Ce,ce,ee))===!0&&$(Ye,ce?ce.concat(Ce):[Ce])}),F.pop()}}if(!_.isObject(l))throw new TypeError("data must be an object");return $(l),s}function iE(l){const s={"!":"%21","'":"%27","(":"%28",")":"%29","~":"%7E","%20":"+","%00":"\0"};return encodeURIComponent(l).replace(/[!'()~]|%20|%00/g,function(v){return s[v]})}function qh(l,s){this._pairs=[],l&&Ef(l,this,s)}const zE=qh.prototype;zE.append=function(s,p){this._pairs.push([s,p])};zE.toString=function(s){const p=s?function(v){return s.call(this,v,iE)}:iE;return this._pairs.map(function(y){return p(y[0])+"="+p(y[1])},"").join("&")};function nL(l){return encodeURIComponent(l).replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}function FE(l,s,p){if(!s)return l;const v=p&&p.encode||nL,y=p&&p.serialize;let S;if(y?S=y(s,p):S=_.isURLSearchParams(s)?s.toString():new qh(s,p).toString(v),S){const f=l.indexOf("#");f!==-1&&(l=l.slice(0,f)),l+=(l.indexOf("?")===-1?"?":"&")+S}return l}class oE{constructor(){this.handlers=[]}use(s,p,v){return this.handlers.push({fulfilled:s,rejected:p,synchronous:v?v.synchronous:!1,runWhen:v?v.runWhen:null}),this.handlers.length-1}eject(s){this.handlers[s]&&(this.handlers[s]=null)}clear(){this.handlers&&(this.handlers=[])}forEach(s){_.forEach(this.handlers,function(v){v!==null&&s(v)})}}const HE={silentJSONParsing:!0,forcedJSONParsing:!0,clarifyTimeoutError:!1},rL=typeof URLSearchParams<"u"?URLSearchParams:qh,aL=typeof FormData<"u"?FormData:null,iL=typeof Blob<"u"?Blob:null,oL={isBrowser:!0,classes:{URLSearchParams:rL,FormData:aL,Blob:iL},protocols:["http","https","file","blob","url","data"]},Gh=typeof window<"u"&&typeof document<"u",uL=(l=>Gh&&["ReactNative","NativeScript","NS"].indexOf(l)<0)(typeof navigator<"u"&&navigator.product),lL=typeof WorkerGlobalScope<"u"&&self instanceof WorkerGlobalScope&&typeof self.importScripts=="function",sL=Gh&&window.location.href||"http://localhost",cL=Object.freeze(Object.defineProperty({__proto__:null,hasBrowserEnv:Gh,hasStandardBrowserEnv:uL,hasStandardBrowserWebWorkerEnv:lL,origin:sL},Symbol.toStringTag,{value:"Module"})),Fr={...cL,...oL};function fL(l,s){return Ef(l,new Fr.classes.URLSearchParams,Object.assign({visitor:function(p,v,y,S){return Fr.isNode&&_.isBuffer(p)?(this.append(v,p.toString("base64")),!1):S.defaultVisitor.apply(this,arguments)}},s))}function dL(l){return _.matchAll(/\w+|\[(\w*)]/g,l).map(s=>s[0]==="[]"?"":s[1]||s[0])}function pL(l){const s={},p=Object.keys(l);let v;const y=p.length;let S;for(v=0;v<y;v++)S=p[v],s[S]=l[S];return s}function jE(l){function s(p,v,y,S){let f=p[S++];if(f==="__proto__")return!0;const N=Number.isFinite(+f),z=S>=p.length;return f=!f&&_.isArray(y)?y.length:f,z?(_.hasOwnProp(y,f)?y[f]=[y[f],v]:y[f]=v,!N):((!y[f]||!_.isObject(y[f]))&&(y[f]=[]),s(p,v,y[f],S)&&_.isArray(y[f])&&(y[f]=pL(y[f])),!N)}if(_.isFormData(l)&&_.isFunction(l.entries)){const p={};return _.forEachEntry(l,(v,y)=>{s(dL(v),y,p,0)}),p}return null}function vL(l,s,p){if(_.isString(l))try{return(s||JSON.parse)(l),_.trim(l)}catch(v){if(v.name!=="SyntaxError")throw v}return(p||JSON.stringify)(l)}const Kl={transitional:HE,adapter:["xhr","http","fetch"],transformRequest:[function(s,p){const v=p.getContentType()||"",y=v.indexOf("application/json")>-1,S=_.isObject(s);if(S&&_.isHTMLForm(s)&&(s=new FormData(s)),_.isFormData(s))return y?JSON.stringify(jE(s)):s;if(_.isArrayBuffer(s)||_.isBuffer(s)||_.isStream(s)||_.isFile(s)||_.isBlob(s)||_.isReadableStream(s))return s;if(_.isArrayBufferView(s))return s.buffer;if(_.isURLSearchParams(s))return p.setContentType("application/x-www-form-urlencoded;charset=utf-8",!1),s.toString();let N;if(S){if(v.indexOf("application/x-www-form-urlencoded")>-1)return fL(s,this.formSerializer).toString();if((N=_.isFileList(s))||v.indexOf("multipart/form-data")>-1){const z=this.env&&this.env.FormData;return Ef(N?{"files[]":s}:s,z&&new z,this.formSerializer)}}return S||y?(p.setContentType("application/json",!1),vL(s)):s}],transformResponse:[function(s){const p=this.transitional||Kl.transitional,v=p&&p.forcedJSONParsing,y=this.responseType==="json";if(_.isResponse(s)||_.isReadableStream(s))return s;if(s&&_.isString(s)&&(v&&!this.responseType||y)){const f=!(p&&p.silentJSONParsing)&&y;try{return JSON.parse(s)}catch(N){if(f)throw N.name==="SyntaxError"?Re.from(N,Re.ERR_BAD_RESPONSE,this,null,this.response):N}}return s}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,env:{FormData:Fr.classes.FormData,Blob:Fr.classes.Blob},validateStatus:function(s){return s>=200&&s<300},headers:{common:{Accept:"application/json, text/plain, */*","Content-Type":void 0}}};_.forEach(["delete","get","head","post","put","patch"],l=>{Kl.headers[l]={}});const hL=_.toObjectSet(["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"]),mL=l=>{const s={};let p,v,y;return l&&l.split(`
+`).forEach(function(f){y=f.indexOf(":"),p=f.substring(0,y).trim().toLowerCase(),v=f.substring(y+1).trim(),!(!p||s[p]&&hL[p])&&(p==="set-cookie"?s[p]?s[p].push(v):s[p]=[v]:s[p]=s[p]?s[p]+", "+v:v)}),s},uE=Symbol("internals");function Wl(l){return l&&String(l).trim().toLowerCase()}function vf(l){return l===!1||l==null?l:_.isArray(l)?l.map(vf):String(l)}function yL(l){const s=Object.create(null),p=/([^\s,;=]+)\s*(?:=\s*([^,;]+))?/g;let v;for(;v=p.exec(l);)s[v[1]]=v[2];return s}const gL=l=>/^[-_a-zA-Z0-9^`|~,!#$%&'*+.]+$/.test(l.trim());function Ah(l,s,p,v,y){if(_.isFunction(v))return v.call(this,s,p);if(y&&(s=p),!!_.isString(s)){if(_.isString(v))return s.indexOf(v)!==-1;if(_.isRegExp(v))return v.test(s)}}function bL(l){return l.trim().toLowerCase().replace(/([a-z\d])(\w*)/g,(s,p,v)=>p.toUpperCase()+v)}function SL(l,s){const p=_.toCamelCase(" "+s);["get","set","has"].forEach(v=>{Object.defineProperty(l,v+p,{value:function(y,S,f){return this[v].call(this,s,y,S,f)},configurable:!0})})}class zn{constructor(s){s&&this.set(s)}set(s,p,v){const y=this;function S(N,z,U){const M=Wl(z);if(!M)throw new Error("header name must be a non-empty string");const F=_.findKey(y,M);(!F||y[F]===void 0||U===!0||U===void 0&&y[F]!==!1)&&(y[F||z]=vf(N))}const f=(N,z)=>_.forEach(N,(U,M)=>S(U,M,z));if(_.isPlainObject(s)||s instanceof this.constructor)f(s,p);else if(_.isString(s)&&(s=s.trim())&&!gL(s))f(mL(s),p);else if(_.isHeaders(s))for(const[N,z]of s.entries())S(z,N,v);else s!=null&&S(p,s,v);return this}get(s,p){if(s=Wl(s),s){const v=_.findKey(this,s);if(v){const y=this[v];if(!p)return y;if(p===!0)return yL(y);if(_.isFunction(p))return p.call(this,y,v);if(_.isRegExp(p))return p.exec(y);throw new TypeError("parser must be boolean|regexp|function")}}}has(s,p){if(s=Wl(s),s){const v=_.findKey(this,s);return!!(v&&this[v]!==void 0&&(!p||Ah(this,this[v],v,p)))}return!1}delete(s,p){const v=this;let y=!1;function S(f){if(f=Wl(f),f){const N=_.findKey(v,f);N&&(!p||Ah(v,v[N],N,p))&&(delete v[N],y=!0)}}return _.isArray(s)?s.forEach(S):S(s),y}clear(s){const p=Object.keys(this);let v=p.length,y=!1;for(;v--;){const S=p[v];(!s||Ah(this,this[S],S,s,!0))&&(delete this[S],y=!0)}return y}normalize(s){const p=this,v={};return _.forEach(this,(y,S)=>{const f=_.findKey(v,S);if(f){p[f]=vf(y),delete p[S];return}const N=s?bL(S):String(S).trim();N!==S&&delete p[S],p[N]=vf(y),v[N]=!0}),this}concat(...s){return this.constructor.concat(this,...s)}toJSON(s){const p=Object.create(null);return _.forEach(this,(v,y)=>{v!=null&&v!==!1&&(p[y]=s&&_.isArray(v)?v.join(", "):v)}),p}[Symbol.iterator](){return Object.entries(this.toJSON())[Symbol.iterator]()}toString(){return Object.entries(this.toJSON()).map(([s,p])=>s+": "+p).join(`
+`)}get[Symbol.toStringTag](){return"AxiosHeaders"}static from(s){return s instanceof this?s:new this(s)}static concat(s,...p){const v=new this(s);return p.forEach(y=>v.set(y)),v}static accessor(s){const v=(this[uE]=this[uE]={accessors:{}}).accessors,y=this.prototype;function S(f){const N=Wl(f);v[N]||(SL(y,f),v[N]=!0)}return _.isArray(s)?s.forEach(S):S(s),this}}zn.accessor(["Content-Type","Content-Length","Accept","Accept-Encoding","User-Agent","Authorization"]);_.reduceDescriptors(zn.prototype,({value:l},s)=>{let p=s[0].toUpperCase()+s.slice(1);return{get:()=>l,set(v){this[p]=v}}});_.freezeMethods(zn);function Lh(l,s){const p=this||Kl,v=s||p,y=zn.from(v.headers);let S=v.data;return _.forEach(l,function(N){S=N.call(p,S,y.normalize(),s?s.status:void 0)}),y.normalize(),S}function VE(l){return!!(l&&l.__CANCEL__)}function eu(l,s,p){Re.call(this,l??"canceled",Re.ERR_CANCELED,s,p),this.name="CanceledError"}_.inherits(eu,Re,{__CANCEL__:!0});function BE(l,s,p){const v=p.config.validateStatus;!p.status||!v||v(p.status)?l(p):s(new Re("Request failed with status code "+p.status,[Re.ERR_BAD_REQUEST,Re.ERR_BAD_RESPONSE][Math.floor(p.status/100)-4],p.config,p.request,p))}function EL(l){const s=/^([-+\w]{1,25})(:?\/\/|:)/.exec(l);return s&&s[1]||""}function RL(l,s){l=l||10;const p=new Array(l),v=new Array(l);let y=0,S=0,f;return s=s!==void 0?s:1e3,function(z){const U=Date.now(),M=v[S];f||(f=U),p[y]=z,v[y]=U;let F=S,ee=0;for(;F!==y;)ee+=p[F++],F=F%l;if(y=(y+1)%l,y===S&&(S=(S+1)%l),U-f<s)return;const $=M&&U-M;return $?Math.round(ee*1e3/$):void 0}}function CL(l,s){let p=0;const v=1e3/s;let y=null;return function(){const f=this===!0,N=Date.now();if(f||N-p>v)return y&&(clearTimeout(y),y=null),p=N,l.apply(null,arguments);y||(y=setTimeout(()=>(y=null,p=Date.now(),l.apply(null,arguments)),v-(N-p)))}}const mf=(l,s,p=3)=>{let v=0;const y=RL(50,250);return CL(S=>{const f=S.loaded,N=S.lengthComputable?S.total:void 0,z=f-v,U=y(z),M=f<=N;v=f;const F={loaded:f,total:N,progress:N?f/N:void 0,bytes:z,rate:U||void 0,estimated:U&&N&&M?(N-f)/U:void 0,event:S,lengthComputable:N!=null};F[s?"download":"upload"]=!0,l(F)},p)},TL=Fr.hasStandardBrowserEnv?function(){const s=/(msie|trident)/i.test(navigator.userAgent),p=document.createElement("a");let v;function y(S){let f=S;return s&&(p.setAttribute("href",f),f=p.href),p.setAttribute("href",f),{href:p.href,protocol:p.protocol?p.protocol.replace(/:$/,""):"",host:p.host,search:p.search?p.search.replace(/^\?/,""):"",hash:p.hash?p.hash.replace(/^#/,""):"",hostname:p.hostname,port:p.port,pathname:p.pathname.charAt(0)==="/"?p.pathname:"/"+p.pathname}}return v=y(window.location.href),function(f){const N=_.isString(f)?y(f):f;return N.protocol===v.protocol&&N.host===v.host}}():function(){return function(){return!0}}(),xL=Fr.hasStandardBrowserEnv?{write(l,s,p,v,y,S){const f=[l+"="+encodeURIComponent(s)];_.isNumber(p)&&f.push("expires="+new Date(p).toGMTString()),_.isString(v)&&f.push("path="+v),_.isString(y)&&f.push("domain="+y),S===!0&&f.push("secure"),document.cookie=f.join("; ")},read(l){const s=document.cookie.match(new RegExp("(^|;\\s*)("+l+")=([^;]*)"));return s?decodeURIComponent(s[3]):null},remove(l){this.write(l,"",Date.now()-864e5)}}:{write(){},read(){return null},remove(){}};function DL(l){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(l)}function wL(l,s){return s?l.replace(/\/?\/$/,"")+"/"+s.replace(/^\/+/,""):l}function PE(l,s){return l&&!DL(s)?wL(l,s):s}const lE=l=>l instanceof zn?{...l}:l;function Xi(l,s){s=s||{};const p={};function v(U,M,F){return _.isPlainObject(U)&&_.isPlainObject(M)?_.merge.call({caseless:F},U,M):_.isPlainObject(M)?_.merge({},M):_.isArray(M)?M.slice():M}function y(U,M,F){if(_.isUndefined(M)){if(!_.isUndefined(U))return v(void 0,U,F)}else return v(U,M,F)}function S(U,M){if(!_.isUndefined(M))return v(void 0,M)}function f(U,M){if(_.isUndefined(M)){if(!_.isUndefined(U))return v(void 0,U)}else return v(void 0,M)}function N(U,M,F){if(F in s)return v(U,M);if(F in l)return v(void 0,U)}const z={url:S,method:S,data:S,baseURL:f,transformRequest:f,transformResponse:f,paramsSerializer:f,timeout:f,timeoutMessage:f,withCredentials:f,withXSRFToken:f,adapter:f,responseType:f,xsrfCookieName:f,xsrfHeaderName:f,onUploadProgress:f,onDownloadProgress:f,decompress:f,maxContentLength:f,maxBodyLength:f,beforeRedirect:f,transport:f,httpAgent:f,httpsAgent:f,cancelToken:f,socketPath:f,responseEncoding:f,validateStatus:N,headers:(U,M)=>y(lE(U),lE(M),!0)};return _.forEach(Object.keys(Object.assign({},l,s)),function(M){const F=z[M]||y,ee=F(l[M],s[M],M);_.isUndefined(ee)&&F!==N||(p[M]=ee)}),p}const $E=l=>{const s=Xi({},l);let{data:p,withXSRFToken:v,xsrfHeaderName:y,xsrfCookieName:S,headers:f,auth:N}=s;s.headers=f=zn.from(f),s.url=FE(PE(s.baseURL,s.url),l.params,l.paramsSerializer),N&&f.set("Authorization","Basic "+btoa((N.username||"")+":"+(N.password?unescape(encodeURIComponent(N.password)):"")));let z;if(_.isFormData(p)){if(Fr.hasStandardBrowserEnv||Fr.hasStandardBrowserWebWorkerEnv)f.setContentType(void 0);else if((z=f.getContentType())!==!1){const[U,...M]=z?z.split(";").map(F=>F.trim()).filter(Boolean):[];f.setContentType([U||"multipart/form-data",...M].join("; "))}}if(Fr.hasStandardBrowserEnv&&(v&&_.isFunction(v)&&(v=v(s)),v||v!==!1&&TL(s.url))){const U=y&&S&&xL.read(S);U&&f.set(y,U)}return s},OL=typeof XMLHttpRequest<"u",_L=OL&&function(l){return new Promise(function(p,v){const y=$E(l);let S=y.data;const f=zn.from(y.headers).normalize();let{responseType:N}=y,z;function U(){y.cancelToken&&y.cancelToken.unsubscribe(z),y.signal&&y.signal.removeEventListener("abort",z)}let M=new XMLHttpRequest;M.open(y.method.toUpperCase(),y.url,!0),M.timeout=y.timeout;function F(){if(!M)return;const $=zn.from("getAllResponseHeaders"in M&&M.getAllResponseHeaders()),ce={data:!N||N==="text"||N==="json"?M.responseText:M.response,status:M.status,statusText:M.statusText,headers:$,config:l,request:M};BE(function(Ye){p(Ye),U()},function(Ye){v(Ye),U()},ce),M=null}"onloadend"in M?M.onloadend=F:M.onreadystatechange=function(){!M||M.readyState!==4||M.status===0&&!(M.responseURL&&M.responseURL.indexOf("file:")===0)||setTimeout(F)},M.onabort=function(){M&&(v(new Re("Request aborted",Re.ECONNABORTED,y,M)),M=null)},M.onerror=function(){v(new Re("Network Error",Re.ERR_NETWORK,y,M)),M=null},M.ontimeout=function(){let B=y.timeout?"timeout of "+y.timeout+"ms exceeded":"timeout exceeded";const ce=y.transitional||HE;y.timeoutErrorMessage&&(B=y.timeoutErrorMessage),v(new Re(B,ce.clarifyTimeoutError?Re.ETIMEDOUT:Re.ECONNABORTED,y,M)),M=null},S===void 0&&f.setContentType(null),"setRequestHeader"in M&&_.forEach(f.toJSON(),function(B,ce){M.setRequestHeader(ce,B)}),_.isUndefined(y.withCredentials)||(M.withCredentials=!!y.withCredentials),N&&N!=="json"&&(M.responseType=y.responseType),typeof y.onDownloadProgress=="function"&&M.addEventListener("progress",mf(y.onDownloadProgress,!0)),typeof y.onUploadProgress=="function"&&M.upload&&M.upload.addEventListener("progress",mf(y.onUploadProgress)),(y.cancelToken||y.signal)&&(z=$=>{M&&(v(!$||$.type?new eu(null,l,M):$),M.abort(),M=null)},y.cancelToken&&y.cancelToken.subscribe(z),y.signal&&(y.signal.aborted?z():y.signal.addEventListener("abort",z)));const ee=EL(y.url);if(ee&&Fr.protocols.indexOf(ee)===-1){v(new Re("Unsupported protocol "+ee+":",Re.ERR_BAD_REQUEST,l));return}M.send(S||null)})},AL=(l,s)=>{let p=new AbortController,v;const y=function(z){if(!v){v=!0,f();const U=z instanceof Error?z:this.reason;p.abort(U instanceof Re?U:new eu(U instanceof Error?U.message:U))}};let S=s&&setTimeout(()=>{y(new Re(`timeout ${s} of ms exceeded`,Re.ETIMEDOUT))},s);const f=()=>{l&&(S&&clearTimeout(S),S=null,l.forEach(z=>{z&&(z.removeEventListener?z.removeEventListener("abort",y):z.unsubscribe(y))}),l=null)};l.forEach(z=>z&&z.addEventListener&&z.addEventListener("abort",y));const{signal:N}=p;return N.unsubscribe=f,[N,()=>{S&&clearTimeout(S),S=null}]},LL=function*(l,s){let p=l.byteLength;if(!s||p<s){yield l;return}let v=0,y;for(;v<p;)y=v+s,yield l.slice(v,y),v=y},ML=async function*(l,s,p){for await(const v of l)yield*LL(ArrayBuffer.isView(v)?v:await p(String(v)),s)},sE=(l,s,p,v,y)=>{const S=ML(l,s,y);let f=0;return new ReadableStream({type:"bytes",async pull(N){const{done:z,value:U}=await S.next();if(z){N.close(),v();return}let M=U.byteLength;p&&p(f+=M),N.enqueue(new Uint8Array(U))},cancel(N){return v(N),S.return()}},{highWaterMark:2})},cE=(l,s)=>{const p=l!=null;return v=>setTimeout(()=>s({lengthComputable:p,total:l,loaded:v}))},Rf=typeof fetch=="function"&&typeof Request=="function"&&typeof Response=="function",YE=Rf&&typeof ReadableStream=="function",Fh=Rf&&(typeof TextEncoder=="function"?(l=>s=>l.encode(s))(new TextEncoder):async l=>new Uint8Array(await new Response(l).arrayBuffer())),UL=YE&&(()=>{let l=!1;const s=new Request(Fr.origin,{body:new ReadableStream,method:"POST",get duplex(){return l=!0,"half"}}).headers.has("Content-Type");return l&&!s})(),fE=64*1024,Hh=YE&&!!(()=>{try{return _.isReadableStream(new Response("").body)}catch{}})(),yf={stream:Hh&&(l=>l.body)};Rf&&(l=>{["text","arrayBuffer","blob","formData","stream"].forEach(s=>{!yf[s]&&(yf[s]=_.isFunction(l[s])?p=>p[s]():(p,v)=>{throw new Re(`Response type '${s}' is not supported`,Re.ERR_NOT_SUPPORT,v)})})})(new Response);const NL=async l=>{if(l==null)return 0;if(_.isBlob(l))return l.size;if(_.isSpecCompliantForm(l))return(await new Request(l).arrayBuffer()).byteLength;if(_.isArrayBufferView(l))return l.byteLength;if(_.isURLSearchParams(l)&&(l=l+""),_.isString(l))return(await Fh(l)).byteLength},kL=async(l,s)=>{const p=_.toFiniteNumber(l.getContentLength());return p??NL(s)},zL=Rf&&(async l=>{let{url:s,method:p,data:v,signal:y,cancelToken:S,timeout:f,onDownloadProgress:N,onUploadProgress:z,responseType:U,headers:M,withCredentials:F="same-origin",fetchOptions:ee}=$E(l);U=U?(U+"").toLowerCase():"text";let[$,B]=y||S||f?AL([y,S],f):[],ce,Je;const Ye=()=>{!ce&&setTimeout(()=>{$&&$.unsubscribe()}),ce=!0};let Ce;try{if(z&&UL&&p!=="get"&&p!=="head"&&(Ce=await kL(M,v))!==0){let Fe=new Request(s,{method:"POST",body:v,duplex:"half"}),ge;_.isFormData(v)&&(ge=Fe.headers.get("content-type"))&&M.setContentType(ge),Fe.body&&(v=sE(Fe.body,fE,cE(Ce,mf(z)),null,Fh))}_.isString(F)||(F=F?"cors":"omit"),Je=new Request(s,{...ee,signal:$,method:p.toUpperCase(),headers:M.normalize().toJSON(),body:v,duplex:"half",withCredentials:F});let ne=await fetch(Je);const Ke=Hh&&(U==="stream"||U==="response");if(Hh&&(N||Ke)){const Fe={};["status","statusText","headers"].forEach(Gt=>{Fe[Gt]=ne[Gt]});const ge=_.toFiniteNumber(ne.headers.get("content-length"));ne=new Response(sE(ne.body,fE,N&&cE(ge,mf(N,!0)),Ke&&Ye,Fh),Fe)}U=U||"text";let de=await yf[_.findKey(yf,U)||"text"](ne,l);return!Ke&&Ye(),B&&B(),await new Promise((Fe,ge)=>{BE(Fe,ge,{data:de,headers:zn.from(ne.headers),status:ne.status,statusText:ne.statusText,config:l,request:Je})})}catch(ne){throw Ye(),ne&&ne.name==="TypeError"&&/fetch/i.test(ne.message)?Object.assign(new Re("Network Error",Re.ERR_NETWORK,l,Je),{cause:ne.cause||ne}):Re.from(ne,ne&&ne.code,l,Je)}}),jh={http:ZA,xhr:_L,fetch:zL};_.forEach(jh,(l,s)=>{if(l){try{Object.defineProperty(l,"name",{value:s})}catch{}Object.defineProperty(l,"adapterName",{value:s})}});const dE=l=>`- ${l}`,FL=l=>_.isFunction(l)||l===null||l===!1,qE={getAdapter:l=>{l=_.isArray(l)?l:[l];const{length:s}=l;let p,v;const y={};for(let S=0;S<s;S++){p=l[S];let f;if(v=p,!FL(p)&&(v=jh[(f=String(p)).toLowerCase()],v===void 0))throw new Re(`Unknown adapter '${f}'`);if(v)break;y[f||"#"+S]=v}if(!v){const S=Object.entries(y).map(([N,z])=>`adapter ${N} `+(z===!1?"is not supported by the environment":"is not available in the build"));let f=s?S.length>1?`since :
+`+S.map(dE).join(`
+`):" "+dE(S[0]):"as no adapter specified";throw new Re("There is no suitable adapter to dispatch the request "+f,"ERR_NOT_SUPPORT")}return v},adapters:jh};function Mh(l){if(l.cancelToken&&l.cancelToken.throwIfRequested(),l.signal&&l.signal.aborted)throw new eu(null,l)}function pE(l){return Mh(l),l.headers=zn.from(l.headers),l.data=Lh.call(l,l.transformRequest),["post","put","patch"].indexOf(l.method)!==-1&&l.headers.setContentType("application/x-www-form-urlencoded",!1),qE.getAdapter(l.adapter||Kl.adapter)(l).then(function(v){return Mh(l),v.data=Lh.call(l,l.transformResponse,v),v.headers=zn.from(v.headers),v},function(v){return VE(v)||(Mh(l),v&&v.response&&(v.response.data=Lh.call(l,l.transformResponse,v.response),v.response.headers=zn.from(v.response.headers))),Promise.reject(v)})}const GE="1.7.2",Ih={};["object","boolean","number","function","string","symbol"].forEach((l,s)=>{Ih[l]=function(v){return typeof v===l||"a"+(s<1?"n ":" ")+l}});const vE={};Ih.transitional=function(s,p,v){function y(S,f){return"[Axios v"+GE+"] Transitional option '"+S+"'"+f+(v?". "+v:"")}return(S,f,N)=>{if(s===!1)throw new Re(y(f," has been removed"+(p?" in "+p:"")),Re.ERR_DEPRECATED);return p&&!vE[f]&&(vE[f]=!0,console.warn(y(f," has been deprecated since v"+p+" and will be removed in the near future"))),s?s(S,f,N):!0}};function HL(l,s,p){if(typeof l!="object")throw new Re("options must be an object",Re.ERR_BAD_OPTION_VALUE);const v=Object.keys(l);let y=v.length;for(;y-- >0;){const S=v[y],f=s[S];if(f){const N=l[S],z=N===void 0||f(N,S,l);if(z!==!0)throw new Re("option "+S+" must be "+z,Re.ERR_BAD_OPTION_VALUE);continue}if(p!==!0)throw new Re("Unknown option "+S,Re.ERR_BAD_OPTION)}}const Vh={assertOptions:HL,validators:Ih},ci=Vh.validators;class Wi{constructor(s){this.defaults=s,this.interceptors={request:new oE,response:new oE}}async request(s,p){try{return await this._request(s,p)}catch(v){if(v instanceof Error){let y;Error.captureStackTrace?Error.captureStackTrace(y={}):y=new Error;const S=y.stack?y.stack.replace(/^.+\n/,""):"";try{v.stack?S&&!String(v.stack).endsWith(S.replace(/^.+\n.+\n/,""))&&(v.stack+=`
+`+S):v.stack=S}catch{}}throw v}}_request(s,p){typeof s=="string"?(p=p||{},p.url=s):p=s||{},p=Xi(this.defaults,p);const{transitional:v,paramsSerializer:y,headers:S}=p;v!==void 0&&Vh.assertOptions(v,{silentJSONParsing:ci.transitional(ci.boolean),forcedJSONParsing:ci.transitional(ci.boolean),clarifyTimeoutError:ci.transitional(ci.boolean)},!1),y!=null&&(_.isFunction(y)?p.paramsSerializer={serialize:y}:Vh.assertOptions(y,{encode:ci.function,serialize:ci.function},!0)),p.method=(p.method||this.defaults.method||"get").toLowerCase();let f=S&&_.merge(S.common,S[p.method]);S&&_.forEach(["delete","get","head","post","put","patch","common"],B=>{delete S[B]}),p.headers=zn.concat(f,S);const N=[];let z=!0;this.interceptors.request.forEach(function(ce){typeof ce.runWhen=="function"&&ce.runWhen(p)===!1||(z=z&&ce.synchronous,N.unshift(ce.fulfilled,ce.rejected))});const U=[];this.interceptors.response.forEach(function(ce){U.push(ce.fulfilled,ce.rejected)});let M,F=0,ee;if(!z){const B=[pE.bind(this),void 0];for(B.unshift.apply(B,N),B.push.apply(B,U),ee=B.length,M=Promise.resolve(p);F<ee;)M=M.then(B[F++],B[F++]);return M}ee=N.length;let $=p;for(F=0;F<ee;){const B=N[F++],ce=N[F++];try{$=B($)}catch(Je){ce.call(this,Je);break}}try{M=pE.call(this,$)}catch(B){return Promise.reject(B)}for(F=0,ee=U.length;F<ee;)M=M.then(U[F++],U[F++]);return M}getUri(s){s=Xi(this.defaults,s);const p=PE(s.baseURL,s.url);return FE(p,s.params,s.paramsSerializer)}}_.forEach(["delete","get","head","options"],function(s){Wi.prototype[s]=function(p,v){return this.request(Xi(v||{},{method:s,url:p,data:(v||{}).data}))}});_.forEach(["post","put","patch"],function(s){function p(v){return function(S,f,N){return this.request(Xi(N||{},{method:s,headers:v?{"Content-Type":"multipart/form-data"}:{},url:S,data:f}))}}Wi.prototype[s]=p(),Wi.prototype[s+"Form"]=p(!0)});class Wh{constructor(s){if(typeof s!="function")throw new TypeError("executor must be a function.");let p;this.promise=new Promise(function(S){p=S});const v=this;this.promise.then(y=>{if(!v._listeners)return;let S=v._listeners.length;for(;S-- >0;)v._listeners[S](y);v._listeners=null}),this.promise.then=y=>{let S;const f=new Promise(N=>{v.subscribe(N),S=N}).then(y);return f.cancel=function(){v.unsubscribe(S)},f},s(function(S,f,N){v.reason||(v.reason=new eu(S,f,N),p(v.reason))})}throwIfRequested(){if(this.reason)throw this.reason}subscribe(s){if(this.reason){s(this.reason);return}this._listeners?this._listeners.push(s):this._listeners=[s]}unsubscribe(s){if(!this._listeners)return;const p=this._listeners.indexOf(s);p!==-1&&this._listeners.splice(p,1)}static source(){let s;return{token:new Wh(function(y){s=y}),cancel:s}}}function jL(l){return function(p){return l.apply(null,p)}}function VL(l){return _.isObject(l)&&l.isAxiosError===!0}const Bh={Continue:100,SwitchingProtocols:101,Processing:102,EarlyHints:103,Ok:200,Created:201,Accepted:202,NonAuthoritativeInformation:203,NoContent:204,ResetContent:205,PartialContent:206,MultiStatus:207,AlreadyReported:208,ImUsed:226,MultipleChoices:300,MovedPermanently:301,Found:302,SeeOther:303,NotModified:304,UseProxy:305,Unused:306,TemporaryRedirect:307,PermanentRedirect:308,BadRequest:400,Unauthorized:401,PaymentRequired:402,Forbidden:403,NotFound:404,MethodNotAllowed:405,NotAcceptable:406,ProxyAuthenticationRequired:407,RequestTimeout:408,Conflict:409,Gone:410,LengthRequired:411,PreconditionFailed:412,PayloadTooLarge:413,UriTooLong:414,UnsupportedMediaType:415,RangeNotSatisfiable:416,ExpectationFailed:417,ImATeapot:418,MisdirectedRequest:421,UnprocessableEntity:422,Locked:423,FailedDependency:424,TooEarly:425,UpgradeRequired:426,PreconditionRequired:428,TooManyRequests:429,RequestHeaderFieldsTooLarge:431,UnavailableForLegalReasons:451,InternalServerError:500,NotImplemented:501,BadGateway:502,ServiceUnavailable:503,GatewayTimeout:504,HttpVersionNotSupported:505,VariantAlsoNegotiates:506,InsufficientStorage:507,LoopDetected:508,NotExtended:510,NetworkAuthenticationRequired:511};Object.entries(Bh).forEach(([l,s])=>{Bh[s]=l});function IE(l){const s=new Wi(l),p=xE(Wi.prototype.request,s);return _.extend(p,Wi.prototype,s,{allOwnKeys:!0}),_.extend(p,s,null,{allOwnKeys:!0}),p.create=function(y){return IE(Xi(l,y))},p}const mt=IE(Kl);mt.Axios=Wi;mt.CanceledError=eu;mt.CancelToken=Wh;mt.isCancel=VE;mt.VERSION=GE;mt.toFormData=Ef;mt.AxiosError=Re;mt.Cancel=mt.CanceledError;mt.all=function(s){return Promise.all(s)};mt.spread=jL;mt.isAxiosError=VL;mt.mergeConfig=Xi;mt.AxiosHeaders=zn;mt.formToJSON=l=>jE(_.isHTMLForm(l)?new FormData(l):l);mt.getAdapter=qE.getAdapter;mt.HttpStatusCode=Bh;mt.default=mt;const Ph="/api".replace(/\/+$/,"");class BL{constructor(s,p=Ph,v=mt){this.basePath=p,this.axios=v,s&&(this.configuration=s,this.basePath=s.basePath||this.basePath)}}const hE="https://example.com";function $h(l,s,p=""){typeof s=="object"?Array.isArray(s)?s.forEach(v=>$h(l,v,p)):Object.keys(s).forEach(v=>$h(l,s[v],`${p}${p!==""?".":""}${v}`)):l.has(p)?l.append(p,s):l.set(p,s)}const mE=function(l,...s){const p=new URLSearchParams(l.search);$h(p,s),l.search=p.toString()},yE=function(l){return l.pathname+l.search+l.hash},gE=function(l,s,p,v){return(y=s,S=p)=>{const f={...l.options,url:((v==null?void 0:v.basePath)||S)+l.url};return y.request(f)}},PL=function(l){return{error:async(s={})=>{const p="/error",v=new URL(p,hE);let y;l&&(y=l.baseOptions);const S={method:"GET",...y,...s},f={};mE(v,{});let z=y&&y.headers?y.headers:{};return S.headers={...f,...z,...s.headers},{url:yE(v),options:S}},ping:async(s={})=>{const p="/ping",v=new URL(p,hE);let y;l&&(y=l.baseOptions);const S={method:"GET",...y,...s},f={};mE(v,{});let z=y&&y.headers?y.headers:{};return S.headers={...f,...z,...s.headers},{url:yE(v),options:S}}}},bE=function(l){const s=PL(l);return{async error(p){const v=await s.error(p);return gE(v,mt,Ph,l)},async ping(p){const v=await s.ping(p);return gE(v,mt,Ph,l)}}};class $L extends BL{error(s){return bE(this.configuration).error(s).then(p=>p(this.axios,this.basePath))}ping(s){return bE(this.configuration).ping(s).then(p=>p(this.axios,this.basePath))}}const YL=new $L,qL=()=>{const[l,s]=Qi.useState(null);return Qi.useEffect(()=>{YL.ping().then(p=>s(p),()=>s({data:"API error"}))},[]),l?kn.jsxDEV("p",{children:["Backend answered: ",l.data," "]},void 0,!0,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/components/RestTest.tsx",lineNumber:17,columnNumber:19},void 0):kn.jsxDEV("p",{children:"Backend did not answer"},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/components/RestTest.tsx",lineNumber:17,columnNumber:63},void 0)},GL=()=>{const[l,s]=Qi.useState(null);return Qi.useEffect(()=>{fetch("/proxy/common/api/version",{headers:{Accept:"application/json"}}).then(p=>p.json().then(v=>s(v)),()=>s({data:"API error"}))},[]),l?kn.jsxDEV("p",{children:["Tag: ",l==null?void 0:l.tag," - Build: ",l==null?void 0:l.build," "]},void 0,!0,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/components/Version.tsx",lineNumber:16,columnNumber:19},void 0):kn.jsxDEV("p",{children:"Backend did not answer"},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/components/Version.tsx",lineNumber:16,columnNumber:75},void 0)},IL=()=>kn.jsxDEV(kn.Fragment,{children:[kn.jsxDEV("img",{src:"/logo.png",width:"800"},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:7,columnNumber:8},void 0),kn.jsxDEV("h1",{children:"Sample React application is working!"},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:8,columnNumber:7},void 0),kn.jsxDEV(GL,{},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:9,columnNumber:7},void 0),kn.jsxDEV(qL,{},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:10,columnNumber:7},void 0),kn.jsxDEV("p",{children:["See api documentation ",kn.jsxDEV("a",{href:"/api/ui/",children:"here"},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:11,columnNumber:32},void 0)]},void 0,!0,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:11,columnNumber:7},void 0)]},void 0,!0,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/App.tsx",lineNumber:6,columnNumber:5},void 0);Nh.createRoot(document.getElementById("root")).render(kn.jsxDEV(dA.StrictMode,{children:kn.jsxDEV(IL,{},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/main.tsx",lineNumber:8,columnNumber:5},void 0)},void 0,!1,{fileName:"/home/user/nwcloud-core/cloud-harness/applications/samples/frontend/src/main.tsx",lineNumber:7,columnNumber:3},void 0));
diff --git a/applications/samples/backend/www/favicon.png b/applications/samples/backend/www/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..93c13b76c7b9432da2e43fcc23c6094538c528c7
GIT binary patch
literal 5899
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

literal 0
HcmV?d00001

diff --git a/applications/samples/backend/www/index.html b/applications/samples/backend/www/index.html
new file mode 100644
index 00000000..f6927d27
--- /dev/null
+++ b/applications/samples/backend/www/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.png" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>CloudHarness sample application</title>
+  <script type="module" crossorigin src="/assets/index-DtmKuX2X.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-Cyl2oP5E.css">
+</head>
+
+<body>
+  <div id="root"></div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/applications/samples/backend/www/logo.png b/applications/samples/backend/www/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e151f12c2f870fb78ffaf925269b205ae64920a
GIT binary patch
literal 180296
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

literal 0
HcmV?d00001

diff --git a/applications/samples/deploy/values.yaml b/applications/samples/deploy/values.yaml
index 6265c681..dac6a457 100644
--- a/applications/samples/deploy/values.yaml
+++ b/applications/samples/deploy/values.yaml
@@ -10,11 +10,11 @@ harness:
     - name: common
   deployment:
     volume:
-        name: my-shared-volume
-        mountpath: /mnt/myvolume
-        auto: true
-        size: 10Mi
-        usenfs: false
+      name: my-shared-volume
+      mountpath: /tmp/myvolume
+      auto: true
+      size: 10Mi
+      usenfs: false
     auto: true
     port: 8080
   uri_role_mapping:
@@ -43,13 +43,12 @@ harness:
     soft:
       - workflows
       - events
-      - accounts 
+      - accounts
       - common
-      - nfsserver
     build:
       - cloudharness-flask
       - cloudharness-frontend-build
-  
+
   resources:
     - name: my-config
       src: "myConfig.json"
@@ -59,12 +58,12 @@ harness:
       dst: "/usr/src/app/important_config.yaml"
   secrets:
     asecret: "value"
-    
+
   test:
     unit:
       enabled: true
       commands:
-      - "pytest /usr/src/app/samples/test"
+        - "pytest /usr/src/app/samples/test"
     e2e:
       enabled: true
       smoketest: true
@@ -76,10 +75,9 @@ harness:
       checks:
         - all
       runParams:
-      - "--skip-deprecated-operations" 
-      - "--hypothesis-suppress-health-check=too_slow" 
-      - "--hypothesis-deadline=180000"
-      - "--request-timeout=180000"
-      - "--hypothesis-max-examples=2"
-      - "--show-errors-tracebacks"
-
+        - "--skip-deprecated-operations"
+        - "--hypothesis-suppress-health-check=too_slow"
+        - "--hypothesis-deadline=180000"
+        - "--request-timeout=180000"
+        - "--hypothesis-max-examples=2"
+        - "--show-errors-tracebacks"
diff --git a/applications/samples/frontend/src/rest/api.ts b/applications/samples/frontend/src/rest/api.ts
index 02d724a1..ac223526 100644
--- a/applications/samples/frontend/src/rest/api.ts
+++ b/applications/samples/frontend/src/rest/api.ts
@@ -13,13 +13,15 @@
  */
 
 
-import { Configuration } from './configuration';
-import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+import type { Configuration } from './configuration';
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
+import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common';
+import type { RequestArgs } from './base';
 // @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base';
+import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from './base';
 
 /**
  * 
@@ -91,7 +93,7 @@ export const AuthApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        validCookie: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        validCookie: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/valid-cookie`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -123,7 +125,7 @@ export const AuthApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        validToken: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        validToken: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/valid`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -167,9 +169,11 @@ export const AuthApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async validCookie(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+        async validCookie(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.validCookie(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['AuthApi.validCookie']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * Check if the token is valid 
@@ -177,9 +181,11 @@ export const AuthApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async validToken(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+        async validToken(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.validToken(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['AuthApi.validToken']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
     }
 };
@@ -226,7 +232,7 @@ export class AuthApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AuthApi
      */
-    public validCookie(options?: AxiosRequestConfig) {
+    public validCookie(options?: RawAxiosRequestConfig) {
         return AuthApiFp(this.configuration).validCookie(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -237,12 +243,13 @@ export class AuthApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AuthApi
      */
-    public validToken(options?: AxiosRequestConfig) {
+    public validToken(options?: RawAxiosRequestConfig) {
         return AuthApiFp(this.configuration).validToken(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * ResourceApi - axios parameter creator
  * @export
@@ -256,7 +263,7 @@ export const ResourceApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createSampleResource: async (sampleResource: SampleResource, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createSampleResource: async (sampleResource: SampleResource, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'sampleResource' is not null or undefined
             assertParamExists('createSampleResource', 'sampleResource', sampleResource)
             const localVarPath = `/sampleresources`;
@@ -292,7 +299,7 @@ export const ResourceApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteSampleResource: async (sampleresourceId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteSampleResource: async (sampleresourceId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'sampleresourceId' is not null or undefined
             assertParamExists('deleteSampleResource', 'sampleresourceId', sampleresourceId)
             const localVarPath = `/sampleresources/{sampleresourceId}`
@@ -326,7 +333,7 @@ export const ResourceApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getSampleResource: async (sampleresourceId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getSampleResource: async (sampleresourceId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'sampleresourceId' is not null or undefined
             assertParamExists('getSampleResource', 'sampleresourceId', sampleresourceId)
             const localVarPath = `/sampleresources/{sampleresourceId}`
@@ -359,7 +366,7 @@ export const ResourceApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getSampleResources: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getSampleResources: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/sampleresources`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -391,7 +398,7 @@ export const ResourceApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateSampleResource: async (sampleresourceId: string, sampleResource: SampleResource, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateSampleResource: async (sampleresourceId: string, sampleResource: SampleResource, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'sampleresourceId' is not null or undefined
             assertParamExists('updateSampleResource', 'sampleresourceId', sampleresourceId)
             // verify required parameter 'sampleResource' is not null or undefined
@@ -440,9 +447,11 @@ export const ResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createSampleResource(sampleResource: SampleResource, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async createSampleResource(sampleResource: SampleResource, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createSampleResource(sampleResource, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['ResourceApi.createSampleResource']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * Deletes an existing `SampleResource`.
@@ -451,9 +460,11 @@ export const ResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteSampleResource(sampleresourceId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteSampleResource(sampleresourceId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['ResourceApi.deleteSampleResource']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * Gets the details of a single instance of a `SampleResource`.
@@ -462,9 +473,11 @@ export const ResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getSampleResource(sampleresourceId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SampleResource>> {
+        async getSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SampleResource>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getSampleResource(sampleresourceId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['ResourceApi.getSampleResource']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * Gets a list of all `SampleResource` entities.
@@ -472,9 +485,11 @@ export const ResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getSampleResources(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SampleResource>>> {
+        async getSampleResources(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SampleResource>>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getSampleResources(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['ResourceApi.getSampleResources']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * Updates an existing `SampleResource`.
@@ -484,9 +499,11 @@ export const ResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateSampleResource(sampleresourceId, sampleResource, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['ResourceApi.updateSampleResource']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
     }
 };
@@ -566,7 +583,7 @@ export class ResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ResourceApi
      */
-    public createSampleResource(sampleResource: SampleResource, options?: AxiosRequestConfig) {
+    public createSampleResource(sampleResource: SampleResource, options?: RawAxiosRequestConfig) {
         return ResourceApiFp(this.configuration).createSampleResource(sampleResource, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -578,7 +595,7 @@ export class ResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ResourceApi
      */
-    public deleteSampleResource(sampleresourceId: string, options?: AxiosRequestConfig) {
+    public deleteSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig) {
         return ResourceApiFp(this.configuration).deleteSampleResource(sampleresourceId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -590,7 +607,7 @@ export class ResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ResourceApi
      */
-    public getSampleResource(sampleresourceId: string, options?: AxiosRequestConfig) {
+    public getSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig) {
         return ResourceApiFp(this.configuration).getSampleResource(sampleresourceId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -601,7 +618,7 @@ export class ResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ResourceApi
      */
-    public getSampleResources(options?: AxiosRequestConfig) {
+    public getSampleResources(options?: RawAxiosRequestConfig) {
         return ResourceApiFp(this.configuration).getSampleResources(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -614,12 +631,13 @@ export class ResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ResourceApi
      */
-    public updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: AxiosRequestConfig) {
+    public updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: RawAxiosRequestConfig) {
         return ResourceApiFp(this.configuration).updateSampleResource(sampleresourceId, sampleResource, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * TestApi - axios parameter creator
  * @export
@@ -633,7 +651,7 @@ export const TestApiAxiosParamCreator = function (configuration?: Configuration)
          * @deprecated
          * @throws {RequiredError}
          */
-        error: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        error: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/error`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -663,7 +681,7 @@ export const TestApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        ping: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        ping: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/ping`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -704,9 +722,11 @@ export const TestApiFp = function(configuration?: Configuration) {
          * @deprecated
          * @throws {RequiredError}
          */
-        async error(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+        async error(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.error(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['TestApi.error']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * 
@@ -714,9 +734,11 @@ export const TestApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async ping(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<number>> {
+        async ping(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<number>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.ping(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['TestApi.ping']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
     }
 };
@@ -765,7 +787,7 @@ export class TestApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof TestApi
      */
-    public error(options?: AxiosRequestConfig) {
+    public error(options?: RawAxiosRequestConfig) {
         return TestApiFp(this.configuration).error(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -776,12 +798,13 @@ export class TestApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof TestApi
      */
-    public ping(options?: AxiosRequestConfig) {
+    public ping(options?: RawAxiosRequestConfig) {
         return TestApiFp(this.configuration).ping(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * WorkflowsApi - axios parameter creator
  * @export
@@ -794,7 +817,7 @@ export const WorkflowsApiAxiosParamCreator = function (configuration?: Configura
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        submitAsync: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        submitAsync: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/operation_async`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -825,7 +848,7 @@ export const WorkflowsApiAxiosParamCreator = function (configuration?: Configura
          * @deprecated
          * @throws {RequiredError}
          */
-        submitSync: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        submitSync: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/operation_sync`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -858,7 +881,7 @@ export const WorkflowsApiAxiosParamCreator = function (configuration?: Configura
          * @deprecated
          * @throws {RequiredError}
          */
-        submitSyncWithResults: async (a: number, b: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        submitSyncWithResults: async (a: number, b: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'a' is not null or undefined
             assertParamExists('submitSyncWithResults', 'a', a)
             // verify required parameter 'b' is not null or undefined
@@ -910,9 +933,11 @@ export const WorkflowsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async submitAsync(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse202>> {
+        async submitAsync(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse202>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.submitAsync(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['WorkflowsApi.submitAsync']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * 
@@ -921,9 +946,11 @@ export const WorkflowsApiFp = function(configuration?: Configuration) {
          * @deprecated
          * @throws {RequiredError}
          */
-        async submitSync(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<object>> {
+        async submitSync(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<object>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.submitSync(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['WorkflowsApi.submitSync']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
          * 
@@ -934,9 +961,11 @@ export const WorkflowsApiFp = function(configuration?: Configuration) {
          * @deprecated
          * @throws {RequiredError}
          */
-        async submitSyncWithResults(a: number, b: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+        async submitSyncWithResults(a: number, b: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.submitSyncWithResults(a, b, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const index = configuration?.serverIndex ?? 0;
+            const operationBasePath = operationServerMap['WorkflowsApi.submitSyncWithResults']?.[index]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
     }
 };
@@ -996,7 +1025,7 @@ export class WorkflowsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof WorkflowsApi
      */
-    public submitAsync(options?: AxiosRequestConfig) {
+    public submitAsync(options?: RawAxiosRequestConfig) {
         return WorkflowsApiFp(this.configuration).submitAsync(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1008,7 +1037,7 @@ export class WorkflowsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof WorkflowsApi
      */
-    public submitSync(options?: AxiosRequestConfig) {
+    public submitSync(options?: RawAxiosRequestConfig) {
         return WorkflowsApiFp(this.configuration).submitSync(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1022,9 +1051,10 @@ export class WorkflowsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof WorkflowsApi
      */
-    public submitSyncWithResults(a: number, b: number, options?: AxiosRequestConfig) {
+    public submitSyncWithResults(a: number, b: number, options?: RawAxiosRequestConfig) {
         return WorkflowsApiFp(this.configuration).submitSyncWithResults(a, b, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
diff --git a/applications/samples/frontend/src/rest/base.ts b/applications/samples/frontend/src/rest/base.ts
index 7b1f3d33..303664f3 100644
--- a/applications/samples/frontend/src/rest/base.ts
+++ b/applications/samples/frontend/src/rest/base.ts
@@ -13,10 +13,11 @@
  */
 
 
-import { Configuration } from "./configuration";
+import type { Configuration } from './configuration';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
+import globalAxios from 'axios';
 
 export const BASE_PATH = "/api".replace(/\/+$/, "");
 
@@ -38,7 +39,7 @@ export const COLLECTION_FORMATS = {
  */
 export interface RequestArgs {
     url: string;
-    options: AxiosRequestConfig;
+    options: RawAxiosRequestConfig;
 }
 
 /**
@@ -52,7 +53,7 @@ export class BaseAPI {
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
             this.configuration = configuration;
-            this.basePath = configuration.basePath || this.basePath;
+            this.basePath = configuration.basePath ?? basePath;
         }
     }
 };
@@ -64,8 +65,22 @@ export class BaseAPI {
  * @extends {Error}
  */
 export class RequiredError extends Error {
-    name: "RequiredError" = "RequiredError";
     constructor(public field: string, msg?: string) {
         super(msg);
+        this.name = "RequiredError"
     }
 }
+
+interface ServerMap {
+    [key: string]: {
+        url: string,
+        description: string,
+    }[];
+}
+
+/**
+ *
+ * @export
+ */
+export const operationServerMap: ServerMap = {
+}
diff --git a/applications/samples/frontend/src/rest/common.ts b/applications/samples/frontend/src/rest/common.ts
index d75d12e4..8fd2234c 100644
--- a/applications/samples/frontend/src/rest/common.ts
+++ b/applications/samples/frontend/src/rest/common.ts
@@ -13,9 +13,10 @@
  */
 
 
-import { Configuration } from "./configuration";
-import { RequiredError, RequestArgs } from "./base";
-import { AxiosInstance, AxiosResponse } from 'axios';
+import type { Configuration } from "./configuration";
+import type { RequestArgs } from "./base";
+import type { AxiosInstance, AxiosResponse } from 'axios';
+import { RequiredError } from "./base";
 
 /**
  *
@@ -84,6 +85,7 @@ export const setOAuthToObject = async function (object: any, name: string, scope
 }
 
 function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void {
+    if (parameter == null) return;
     if (typeof parameter === "object") {
         if (Array.isArray(parameter)) {
             (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
@@ -142,7 +144,7 @@ export const toPathString = function (url: URL) {
  */
 export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
     return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-        const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
+        const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
         return axios.request<T, R>(axiosRequestArgs);
     };
 }
diff --git a/applications/samples/frontend/src/rest/configuration.ts b/applications/samples/frontend/src/rest/configuration.ts
index 15d4df3d..6f3aede4 100644
--- a/applications/samples/frontend/src/rest/configuration.ts
+++ b/applications/samples/frontend/src/rest/configuration.ts
@@ -19,6 +19,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
     basePath?: string;
+    serverIndex?: number;
     baseOptions?: any;
     formDataCtor?: new () => any;
 }
@@ -58,6 +59,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * override server index
+     *
+     * @type {number}
+     * @memberof Configuration
+     */
+    serverIndex?: number;
     /**
      * base options for axios calls
      *
@@ -80,6 +88,7 @@ export class Configuration {
         this.password = param.password;
         this.accessToken = param.accessToken;
         this.basePath = param.basePath;
+        this.serverIndex = param.serverIndex;
         this.baseOptions = param.baseOptions;
         this.formDataCtor = param.formDataCtor;
     }
diff --git a/applications/samples/test/e2e/samples.spec.ts b/applications/samples/test/e2e/samples.spec.ts
index dcdc1d7b..a55b6f7a 100644
--- a/applications/samples/test/e2e/samples.spec.ts
+++ b/applications/samples/test/e2e/samples.spec.ts
@@ -28,7 +28,7 @@ describe("Sandbox", () => {
       return el.textContent;
     });
 
-    expect(await page.title()).toEqual("Samples");
+    expect(await page.title()).toEqual("CloudHarness sample application");
     expect(title).toEqual("Sample React application is working!");
   });
 });
diff --git a/applications/workflows/api/openapi.yaml b/applications/workflows/api/openapi.yaml
index 801477f4..b2d674d6 100644
--- a/applications/workflows/api/openapi.yaml
+++ b/applications/workflows/api/openapi.yaml
@@ -1,4 +1,4 @@
-openapi: 3.0.0
+openapi: 3.0.3
 info:
     title: Workflows API
     version: 0.1.0
@@ -11,66 +11,20 @@ servers:
     - url: /api
       description: Metacell host
 paths:
-    /operations:
+    "/operations/{name}":
         get:
             tags:
                 - Create and Access
-            parameters:
-                -
-                    example: Pending
-                    name: status
-                    description: filter by status
-                    schema:
-                        $ref: '#/components/schemas/OperationStatus'
-                    in: query
-                -
-                    examples:
-                        example1:
-                            value: >-
-                                "eyJ2IjoibWV0YS5rOHMuaW8vdjEiLCJydiI6NDUzMDMzOCwic3RhcnQiOiJoZWxsby13b3JsZC05YnE2ZFx1MDAwMCJ8"
-                    name: previous_search_token
-                    description: continue previous search (pagination chunks)
-                    schema:
-                        type: string
-                    in: query
-                -
-                    name: limit
-                    description: maximum number of records to return per page
-                    schema:
-                        default: 10
-                        maximum: 50
-                        minimum: 1
-                        type: integer
-                    in: query
             responses:
-                '200':
+                "200":
                     content:
                         application/json:
                             schema:
-                                $ref: '#/components/schemas/OperationSearchResult'
-                    description: search results matching criteria
-                '400':
-                    description: bad input parameter
-            operationId: listOperations
-            summary: lists operations
-            description: |
-                see all operations for the user
-    '/operations/{name}':
-        get:
-            tags:
-                - Create and Access
-            responses:
-                '200':
-                    content:
-                        application/json:
-                            schema:
-                                type: object
-                                items:
-                                    $ref: '#/components/schemas/Operation'
+                                type: string
                     description: search results matching criteria
-                '400':
+                "400":
                     description: Bad request
-                '404':
+                "404":
                     description: not found
             operationId: getOperation
             summary: get operation by name
@@ -80,77 +34,117 @@ paths:
             tags:
                 - Create and Access
             parameters:
-                -
-                    example: my-workflow
-                    name: name
-                    schema:
-                        type: string
-                    in: path
-                    required: true
+                - example: my-workflow
+                  name: name
+                  schema:
+                      type: string
+                  in: path
+                  required: true
             responses:
-                '200':
+                "200":
                     description: delete OK
-                '404':
+                "404":
                     description: not found
             operationId: deleteOperation
             summary: deletes operation by name
             description: |
                 delete operation by its name
         parameters:
-            -
-                examples:
-                    my-operation:
-                        value: my-operation
-                name: name
-                schema:
-                    pattern: '^[0-9A-Za-z\s\-]+$'
-                    type: string
-                in: path
-                required: true
-    '/operations/{name}/logs':
+            - name: name
+              schema:
+                  pattern: '^[0-9A-Za-z\s\-]+$'
+                  type: string
+              in: path
+              required: true
+    "/operations/{name}/logs":
         get:
             tags:
                 - Create and Access
             responses:
-                '200':
+                "200":
                     content:
                         text/plain:
                             schema:
                                 type: string
                                 example: Hello world
                     description: search results matching criteria
-                '400':
+                "400":
                     description: Bad request
-                '404':
+                "404":
                     description: not found
             operationId: logOperation
             summary: get operation by name
             description: |
                 retrieves an operation log by its name
         parameters:
-            -
-                examples:
-                    e1:
-                        value: '"my-operation"'
-                    e2:
-                        value: my-operation-122a
-                name: name
-                schema:
-                    pattern: '^[0-9A-Za-z\s\-]+$'
-                    type: string
-                in: path
-                required: true
+            - examples:
+                  e1:
+                      value: '"my-operation"'
+                  e2:
+                      value: my-operation-122a
+              name: name
+              schema:
+                  pattern: '^[0-9A-Za-z\s\-]+$'
+                  type: string
+              in: path
+              required: true
+    /operations:
+        get:
+            tags:
+                - Create and Access
+            parameters:
+                - examples:
+                      p:
+                          value: Pending
+                  name: status
+                  description: filter by status
+                  schema:
+                      $ref: "#/components/schemas/OperationStatus"
+                  in: query
+                - examples:
+                      example1:
+                          value: >-
+                              "eyJ2IjoibWV0YS5rOHMuaW8vdjEiLCJydiI6NDUzMDMzOCwic3RhcnQiOiJoZWxsby13b3JsZC05YnE2ZFx1MDAwMCJ8"
+                  name: previous_search_token
+                  description: continue previous search (pagination chunks)
+                  schema:
+                      type: string
+                  in: query
+                - examples:
+                      e1:
+                          value: "10"
+                  name: limit
+                  description: maximum number of records to return per page
+                  schema:
+                      default: 10
+                      maximum: 50
+                      minimum: 1
+                      type: integer
+                  in: query
+            responses:
+                "200":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/OperationSearchResult"
+                    description: search results matching criteria
+                "400":
+                    description: bad input parameter
+            operationId: listOperations
+            summary: lists operations
+            description: |
+                see all operations for the user
 components:
     schemas:
         OperationSearchResult:
             description: a list of operations with meta data about the result
             properties:
                 meta:
-                    $ref: '#/components/schemas/SearchResultData'
+                    $ref: "#/components/schemas/SearchResultData"
                 items:
                     type: array
                     items:
-                        $ref: '#/components/schemas/Operation'
+                        $ref: "#/components/schemas/Operation"
         SearchResultData:
             description: describes a search
             properties:
@@ -163,7 +157,7 @@ components:
                 message:
                     description: usually set when an error occurred
                     type: string
-                    example: ''
+                    example: ""
                 name:
                     description: operation name
                     type: string
@@ -171,9 +165,9 @@ components:
                     format: date-time
                     type: string
                     readOnly: true
-                    example: '2016-08-29T09:12:33.001Z'
+                    example: "2016-08-29T09:12:33.001Z"
                 status:
-                    $ref: '#/components/schemas/OperationStatus'
+                    $ref: "#/components/schemas/OperationStatus"
                 workflow:
                     description: low level representation as an Argo json
                     type: string
@@ -188,6 +182,5 @@ components:
                 - Failed
             type: string
 tags:
-    -
-        name: Create and Access
-        description: 'standard creation, listing and retrieve'
+    - name: Create and Access
+      description: "standard creation, listing and retrieve"
diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index 935d508e..6c1c0f35 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -1,35 +1,47 @@
-version: "1.0"
+version: '1.0'
 stages:
-  - prepare
-  - build
-  - unittest
-  - deploy
-  - qa
+- prepare
+- build
+- unittest
+- deploy
+- qa
 steps:
   main_clone:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
-    revision: "${{CF_BRANCH}}"
+    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
+    revision: '${{CF_BRANCH}}'
     git: github
+  post_main_clone:
+    title: Post main clone
+    type: parallel
+    stage: prepare
+    steps:
+    - 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 install.sh
-      - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
-        -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
-      - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
-      - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
+    - bash cloud-harness/install.sh
+    - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
+      -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
+    - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
+    - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:
     commands:
-      - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
+    - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
     environment:
-      - ACTION=auth
-      - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
+    - ACTION=auth
+    - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
     title: View helm chart
@@ -42,47 +54,43 @@ steps:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-base/Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-base
         title: Cloudharness base
         working_directory: ./.
-        tag: "${{CLOUDHARNESS_BASE_TAG}}"
+        tag: '${{CLOUDHARNESS_BASE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
                 == false
       cloudharness-frontend-build:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-frontend-build/Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-frontend-build
         title: Cloudharness frontend build
         working_directory: ./.
-        tag: "${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}"
+        tag: '${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}') == false
   build_static_images:
     title: Build static images
@@ -93,291 +101,246 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/cloudharness-flask
         title: Cloudharness flask
         working_directory: ./infrastructure/common-images/cloudharness-flask
-        tag: "${{CLOUDHARNESS_FLASK_TAG}}"
+        tag: '${{CLOUDHARNESS_FLASK_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
                 == false
   build_application_images:
     type: parallel
     stage: build
     steps:
-      nfsserver:
-        type: build
-        stage: build
-        dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
-        buildkit: true
-        build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-        image_name: cloudharness/nfsserver
-        title: Nfsserver
-        working_directory: ./applications/nfsserver
-        tag: "${{NFSSERVER_TAG}}"
-        when:
-          condition:
-            any:
-              buildDoesNotExist:
-                includes('${{NFSSERVER_TAG_EXISTS}}', '{{NFSSERVER_TAG_EXISTS}}')
-                == true
-              forceNoCache:
-                includes('${{NFSSERVER_TAG_FORCE_BUILD}}', '{{NFSSERVER_TAG_FORCE_BUILD}}')
-                == false
       accounts:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/accounts
         title: Accounts
         working_directory: ./applications/accounts
-        tag: "${{ACCOUNTS_TAG}}"
+        tag: '${{ACCOUNTS_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
                 == false
       samples:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
-          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
+        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/samples
         title: Samples
         working_directory: ./applications/samples
-        tag: "${{SAMPLES_TAG}}"
+        tag: '${{SAMPLES_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
                 == false
       samples-print-file:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-print-file
         title: Samples print file
         working_directory: ./applications/samples/tasks/print-file
-        tag: "${{SAMPLES_PRINT_FILE_TAG}}"
+        tag: '${{SAMPLES_PRINT_FILE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
                 == false
       samples-secret:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-secret
         title: Samples secret
         working_directory: ./applications/samples/tasks/secret
-        tag: "${{SAMPLES_SECRET_TAG}}"
+        tag: '${{SAMPLES_SECRET_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
                 == false
       samples-sum:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-sum
         title: Samples sum
         working_directory: ./applications/samples/tasks/sum
-        tag: "${{SAMPLES_SUM_TAG}}"
+        tag: '${{SAMPLES_SUM_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
                 == false
       common:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/common
         title: Common
         working_directory: ./applications/common/server
-        tag: "${{COMMON_TAG}}"
+        tag: '${{COMMON_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
                 == false
       workflows-send-result-event:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-send-result-event
         title: Workflows send result event
         working_directory: ./applications/workflows/tasks/send-result-event
-        tag: "${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}"
+        tag: '${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}') == false
       workflows-extract-download:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/workflows-extract-download
         title: Workflows extract download
         working_directory: ./applications/workflows/tasks/extract-download
-        tag: "${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}"
+        tag: '${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}') == false
       workflows-notify-queue:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-notify-queue
         title: Workflows notify queue
         working_directory: ./applications/workflows/tasks/notify-queue
-        tag: "${{WORKFLOWS_NOTIFY_QUEUE_TAG}}"
+        tag: '${{WORKFLOWS_NOTIFY_QUEUE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}') == false
       workflows:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/workflows
         title: Workflows
         working_directory: ./applications/workflows/server
-        tag: "${{WORKFLOWS_TAG}}"
+        tag: '${{WORKFLOWS_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
                 == false
   tests_unit:
     stage: unittest
@@ -386,8 +349,8 @@ steps:
       samples_ut:
         title: Unit tests for samples
         commands:
-          - pytest /usr/src/app/samples/test
-        image: "${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}"
+        - pytest /usr/src/app/samples/test
+        image: '${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}'
   deployment:
     stage: deploy
     type: helm
@@ -397,14 +360,14 @@ steps:
       helm_version: 3.6.2
       chart_name: deployment/helm
       release_name: test-${{NAMESPACE_BASENAME}}
-      kube_context: "${{CLUSTER_NAME}}"
+      kube_context: '${{CLUSTER_NAME}}'
       namespace: test-${{NAMESPACE_BASENAME}}
-      chart_version: "${{CF_SHORT_REVISION}}"
+      chart_version: '${{CF_SHORT_REVISION}}'
       cmd_ps: --timeout 600s --create-namespace
       custom_value_files:
-        - ./deployment/helm/values.yaml
+      - ./deployment/helm/values.yaml
       custom_values:
-        - apps_samples_harness_secrets_asecret=${{ASECRET}}
+      - apps_samples_harness_secrets_asecret=${{ASECRET}}
   build_test_images:
     title: Build test images
     type: parallel
@@ -414,134 +377,130 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/test-e2e
         title: Test e2e
         working_directory: ./test/test-e2e
-        tag: "${{TEST_E2E_TAG}}"
+        tag: '${{TEST_E2E_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
                 == false
       test-api:
         type: build
         stage: build
         dockerfile: test/test-api/Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/test-api
         title: Test api
         working_directory: ./.
-        tag: "${{TEST_API_TAG}}"
+        tag: '${{TEST_API_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
                 == false
   wait_deployment:
     stage: qa
     title: Wait deployment to be ready
     image: codefresh/kubectl
     commands:
-      - kubectl config use-context ${{CLUSTER_NAME}}
-      - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
-      - kubectl rollout status deployment/accounts
-      - kubectl rollout status deployment/samples
-      - kubectl rollout status deployment/common
-      - kubectl rollout status deployment/workflows
-      - sleep 60
+    - kubectl config use-context ${{CLUSTER_NAME}}
+    - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
+    - kubectl rollout status deployment/accounts
+    - kubectl rollout status deployment/samples
+    - kubectl rollout status deployment/common
+    - kubectl rollout status deployment/workflows
+    - sleep 60
   tests_api:
     stage: qa
     title: Api tests
     working_directory: /home/test
-    image: "${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}"
+    image: '${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}'
     fail_fast: false
     commands:
-      - echo $APP_NAME
+    - echo $APP_NAME
     scale:
       samples_api_test:
         title: samples api test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/samples:/home/test"
-          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
+        - '${{CF_REPO_NAME}}/applications/samples:/home/test'
+        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
-          - APP_URL=https://samples.${{DOMAIN}}/api
-          - USERNAME=sample@testuser.com
-          - PASSWORD=test
+        - APP_URL=https://samples.${{DOMAIN}}/api
+        - USERNAME=sample@testuser.com
+        - PASSWORD=test
         commands:
-          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-            https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
-            --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
-            --show-errors-tracebacks
-          - pytest -v test/api
+        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
+          --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
+          --show-errors-tracebacks
+        - pytest -v test/api
       common_api_test:
         title: common api test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/common:/home/test"
-          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
+        - '${{CF_REPO_NAME}}/applications/common:/home/test'
+        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
-          - APP_URL=https://common.${{DOMAIN}}/api
+        - APP_URL=https://common.${{DOMAIN}}/api
         commands:
-          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-            https://common.${{DOMAIN}}/api -c all
+        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+          https://common.${{DOMAIN}}/api -c all
       workflows_api_test:
         title: workflows api test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/workflows:/home/test"
-          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
+        - '${{CF_REPO_NAME}}/applications/workflows:/home/test'
+        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
-          - APP_URL=https://workflows.${{DOMAIN}}/api
+        - APP_URL=https://workflows.${{DOMAIN}}/api
         commands:
-          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-            https://workflows.${{DOMAIN}}/api -c all
+        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+          https://workflows.${{DOMAIN}}/api -c all
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-            - cf_export  FAILED=failed
+          - cf_export  FAILED=failed
   tests_e2e:
     stage: qa
     title: End to end tests
     working_directory: /home/test
-    image: "${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}"
+    image: '${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}'
     fail_fast: false
     commands:
-      - yarn test
+    - yarn test
     scale:
       samples_e2e_test:
         title: samples e2e test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples"
+        - '${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples'
         environment:
-          - APP_URL=https://samples.${{DOMAIN}}
-          - USERNAME=sample@testuser.com
-          - PASSWORD=test
+        - APP_URL=https://samples.${{DOMAIN}}
+        - USERNAME=sample@testuser.com
+        - PASSWORD=test
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-            - cf_export  FAILED=failed
+          - cf_export  FAILED=failed
   approval:
     type: pending-approval
     stage: qa
@@ -549,7 +508,7 @@ steps:
     description: The pipeline will fail after ${{WAIT_ON_FAIL}} minutes
     timeout:
       timeUnit: minutes
-      duration: "${{WAIT_ON_FAIL}}"
+      duration: '${{WAIT_ON_FAIL}}'
       finalState: denied
     when:
       condition:
@@ -561,5 +520,5 @@ steps:
     image: codefresh/kubectl
     stage: qa
     commands:
-      - kubectl config use-context ${{CLUSTER_NAME}}
-      - kubectl delete ns test-${{NAMESPACE_BASENAME}}
+    - kubectl config use-context ${{CLUSTER_NAME}}
+    - kubectl delete ns test-${{NAMESPACE_BASENAME}}
diff --git a/libraries/cloudharness-common/cloudharness/utils/server.py b/libraries/cloudharness-common/cloudharness/utils/server.py
index 2d54437a..3df18454 100644
--- a/libraries/cloudharness-common/cloudharness/utils/server.py
+++ b/libraries/cloudharness-common/cloudharness/utils/server.py
@@ -71,7 +71,8 @@ def init_flask(title='CH service API', init_app_fn=None, webapp=False, json_enco
     global app
 
     # Some magic inspection to get the caller's absolute path
-    import inspect, os
+    import inspect
+    import os
     frm = inspect.stack()[1]
     mod = inspect.getmodule(frm[0])
     caller_path = os.path.dirname(os.path.realpath(mod.__file__))
@@ -92,7 +93,8 @@ def init_flask(title='CH service API', init_app_fn=None, webapp=False, json_enco
         app.logger.setLevel(gunicorn_logger.level)
 
         if webapp:
-            init_webapp_routes(app, www_path=os.path.join(os.path.dirname(caller_path), 'www'))
+            init_webapp_routes(app, www_path=os.path.join(
+                os.path.dirname(caller_path), 'www'))
         connexion_app.add_api(os.path.join(caller_path, 'openapi/openapi.yaml'),
                               arguments={'title': title},
                               pythonic_params=True, resolver=resolver)
@@ -108,10 +110,11 @@ def handle_exception(e: Exception):
             }
 
             try:
-               if not get_current_configuration().is_sentry_enabled():
+                if not get_current_configuration().is_sentry_enabled():
                     data['trace'] = traceback.format_exc()
             except:
-                logging.error("Error checking sentry configuration", exc_info=True)
+                logging.error(
+                    "Error checking sentry configuration", exc_info=True)
                 data['trace'] = traceback.format_exc()
             logging.error(str(e), exc_info=True)
             return json.dumps(data), 500
diff --git a/libraries/cloudharness-common/cloudharness/workflows/operations.py b/libraries/cloudharness-common/cloudharness/workflows/operations.py
index 1e0ee9f3..20b89967 100644
--- a/libraries/cloudharness-common/cloudharness/workflows/operations.py
+++ b/libraries/cloudharness-common/cloudharness/workflows/operations.py
@@ -2,7 +2,7 @@
 from collections.abc import Iterable
 from typing import List, Union
 
-import pyaml
+import yaml
 
 from cloudharness import log
 from cloudharness.events.client import EventClient
@@ -14,6 +14,7 @@
 POLLING_WAIT_SECONDS = 1
 SERVICE_ACCOUNT = 'argo-workflows'
 
+
 class OperationStatus(object):
     PENDING = "Pending"
     RUNNING = "Running"
@@ -21,11 +22,10 @@ class OperationStatus(object):
     SUCCEEDED = "Succeeded"
     SKIPPED = "Skipped"
     FAILED = "Failed"
-class BadOperationConfiguration(RuntimeError):
-    pass
-
 
 
+class BadOperationConfiguration(RuntimeError):
+    pass
 
 
 class ManagedOperation:
@@ -51,7 +51,6 @@ def execute(self, **parameters):
         raise NotImplementedError(f"{self.__class__.__name__} is abstract")
 
 
-
 class ContainerizedOperation(ManagedOperation):
     """
     Abstract Containarized operation based on an argo workflow
@@ -83,10 +82,10 @@ def __init__(self, basename: str, pod_context: Union[PodExecutionContext, list,
                 shared_path = shared_directory
             else:
                 self.volumes = shared_directory
-                assert len(set(shared_directory)) == len(shared_directory), "Shared directories are not unique"
+                assert len(set(shared_directory)) == len(
+                    shared_directory), "Shared directories are not unique"
                 assert len(set(s.split(":")[0] for s in shared_directory)) == len(
                     shared_directory), "Shared directories volumes are not unique"
-            
 
             if shared_path:
                 for task in self.task_list():
@@ -148,17 +147,18 @@ def spec(self):
 
         volumes_mounts = list(self.volumes) or []
         # Tasks volumes must be declared at workflow level
-        volumes_mounts += list({v for task in self.task_list() for v in task.volume_mounts if task.volume_mounts})
-        
+        volumes_mounts += list({v for task in self.task_list()
+                               for v in task.volume_mounts if task.volume_mounts})
+
         spec['volumeClaimTemplates'] = [self.spec_volumeclaim(volume) for volume in volumes_mounts if
-                                            ':' not in volume]  # without PVC prefix (e.g. /location)
+                                        # without PVC prefix (e.g. /location)
+                                        ':' not in volume]
         spec['volumes'] += [self.spec_volume(volume) for volume in volumes_mounts if
-                                ':' in volume]  # with PVC prefix (e.g. pvc-001:/location)
+                            # with PVC prefix (e.g. pvc-001:/location)
+                            ':' in volume]
 
         return spec
 
-
-
     def add_on_exit_notify_handler(self, spec):
         queue = self.on_exit_notify['queue']
         payload = self.on_exit_notify['payload']
@@ -182,7 +182,8 @@ def modify_template(self, template):
             template['metadata'] = dict()
         if 'labels' not in template["metadata"]:
             template["metadata"]["labels"] = dict()
-        template["metadata"]["labels"] = template["metadata"]["labels"] | {c.key: c.value for c in self.pod_contexts}
+        template["metadata"]["labels"] = template["metadata"]["labels"] | {
+            c.key: c.value for c in self.pod_contexts}
 
         if self.volumes:
             if 'container' in template:
@@ -198,7 +199,7 @@ def submit(self):
         """Created and submits the Argo workflow"""
         op = self.to_workflow()
 
-        log.debug("Submitting workflow\n" + pyaml.dump(op))
+        log.debug("Submitting workflow\n" + yaml.dump(op))
 
         # TODO use rest api for that? Include this into cloudharness.workflows?
         self.persisted = argo.submit_workflow(op)
@@ -219,10 +220,6 @@ def is_error(self):
             return self.persisted.status in (OperationStatus.ERROR, OperationStatus.FAILED)
         return False
 
-    
-
-    
-
     def spec_volumeclaim(self, volume):
         # when the volume is NOT prefixed by a PVC (e.g. /location) then create a temporary PVC for the workflow
         if ':' not in volume:
@@ -313,7 +310,8 @@ def execute(self, timeout=None):
             time.sleep(POLLING_WAIT_SECONDS)
             log.debug(f"Polling argo workflow {self.persisted.name}")
             self.persisted = argo.get_workflow(self.persisted.name)
-            log.debug(f"Polling succeeded for {self.persisted.name}. Current phase: {self.persisted.status}")
+            log.debug(f"Polling succeeded for {
+                      self.persisted.name}. Current phase: {self.persisted.status}")
             if timeout and time.time() - start_time > timeout:
                 log.error("Timeout exceeded while polling for results")
                 return self.persisted
@@ -356,12 +354,15 @@ def __init__(self, basename, tasks, shared_directory="", shared_volume_size=10,
         :param pod_context: PodExecutionContext - represents affinity with other pods in the system
         """
         self.tasks = tasks
-        AsyncOperation.__init__(self, basename, pod_context, shared_directory=shared_directory, *args, **kwargs)
+        AsyncOperation.__init__(self, basename, pod_context,
+                                shared_directory=shared_directory, *args, **kwargs)
 
         self.shared_volume_size = shared_volume_size
         if len(self.task_list()) != len(set(self.task_list())):
-            raise BadOperationConfiguration('Tasks in the same operation must have different names')
-        self.entrypoint_template = {'name': self.entrypoint, 'steps': self.steps_spec()}
+            raise BadOperationConfiguration(
+                'Tasks in the same operation must have different names')
+        self.entrypoint_template = {
+            'name': self.entrypoint, 'steps': self.steps_spec()}
 
     def steps_spec(self):
         raise NotImplementedError()
diff --git a/libraries/cloudharness-common/setup.py b/libraries/cloudharness-common/setup.py
index 8e775bc9..0971fe99 100644
--- a/libraries/cloudharness-common/setup.py
+++ b/libraries/cloudharness-common/setup.py
@@ -25,7 +25,7 @@
     'cachetools >= 5.3.2',
     'blinker >= 1.7.0',
     'jinja2 >= 3.1.4',
-    'kafka-python >= 2.0.2',
+    'kafka-python-ng >= 2.2.0',
     'requests >= 2.31.0',
     'python-dateutil >= 2.8.2',
     'sentry-sdk >= 1.39.2',
diff --git a/libraries/cloudharness-utils/setup.py b/libraries/cloudharness-utils/setup.py
index fd994d21..67de60c8 100644
--- a/libraries/cloudharness-utils/setup.py
+++ b/libraries/cloudharness-utils/setup.py
@@ -23,7 +23,7 @@
     'ruamel.yaml',
     'cloudharness_model',
     'docker',
-    'ruamel.yaml',
+    'pyaml',
     'cloudharness_model'
 ]
 
diff --git a/tools/cloudharness-test/cloudharness_test/apitest_init.py b/tools/cloudharness-test/cloudharness_test/apitest_init.py
index 1f83eabd..e39e4d92 100644
--- a/tools/cloudharness-test/cloudharness_test/apitest_init.py
+++ b/tools/cloudharness-test/cloudharness_test/apitest_init.py
@@ -19,13 +19,13 @@
         try:
             openapi_uri = openapi_uri = app_url + "/openapi.json"
             schema = st.from_uri(openapi_uri)
-        except st.exceptions.SchemaLoadingError as e:
+        except st.exceptions.SchemaError as e:
             # Use alternative configuration
             try:
                 openapi_uri = app_url.replace("/api", "") + "/openapi.json"
                 print(requests.get(openapi_uri))
                 schema = st.from_uri(openapi_uri)
-            except st.exceptions.SchemaLoadingError as e:
+            except st.exceptions.SchemaError as e:
                 raise Exception(
                     f"Cannot setup api tests: {openapi_uri} not valid. Check your deployment is up and configuration") from e
 
diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index 978b0322..0dd00f8b 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -16,7 +16,7 @@
 LIB_NAME = 'cloudharness_cli'
 ROOT = dn(dn(dn(HERE)))
 
-OPENAPI_GEN_URL = 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.2.0/openapi-generator-cli-7.2.0.jar'
+OPENAPI_GEN_URL = 'https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.7.0/openapi-generator-cli-7.7.0.jar'
 
 
 def generate_server(app_path, overrides_folder=""):
@@ -27,7 +27,7 @@ def generate_server(app_path, overrides_folder=""):
         f"{app_path}/server") else f"server"
     out_path = f"{app_path}/{out_name}"
     command = f"java -jar {CODEGEN} generate -i {openapi_file} -g python-flask -o {out_path} " \
-              f"-c {openapi_dir}/config.json " + \
+        f"-c {openapi_dir}/config.json " + \
         (f"-t {overrides_folder}" if overrides_folder else "")
     os.system(command)
 
@@ -42,12 +42,14 @@ def generate_model(base_path=ROOT):
     lib_path = f"{base_path}/libraries/models"
 
     # Generate model stuff: use python-flask generator
-    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python-flask -o {lib_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
+    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python-flask -o {
+        lib_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
     os.system(command)
 
     # Generate docs: use python generator
     tmp_path = f"{lib_path}/tmp"
-    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python -o {tmp_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
+    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python -o {
+        tmp_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
     os.system(command)
     try:
         source_dir = join(tmp_path, "docs/models")
@@ -72,20 +74,21 @@ def generate_python_client(module, openapi_file, client_src_path, lib_name=LIB_N
 
     module = to_python_module(module)
     command = f"java -jar {CODEGEN} generate " \
-              f"-i {openapi_file} " \
-              f"-g python " \
-              f"-o {client_src_path}/tmp-{module} " \
-              f"packageName={lib_name}.{module}"
+        f"-i {openapi_file} " \
+        f"-g python " \
+        f"-o {client_src_path}/tmp-{module} " \
+        f"packageName={lib_name}.{module}"
     os.system(command)
 
 
 def generate_ts_client(openapi_file):
     get_dependencies()
-    out_dir = f"{os.path.dirname(os.path.dirname(openapi_file))}/frontend/src/rest"
+    out_dir = f"{os.path.dirname(
+        os.path.dirname(openapi_file))}/frontend/src/rest"
     command = f"java -jar {CODEGEN} generate " \
-              f"-i {openapi_file} " \
-              f"-g typescript-axios " \
-              f"-o {out_dir}"
+        f"-i {openapi_file} " \
+        f"-g typescript-axios " \
+        f"-o {out_dir}"
     os.system(command)
 
     replaceindir(out_dir, "http://localhost", '')

From 6a9ac4c0866e3545538450ca2a9feb3b154f4257 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 29 Jul 2024 18:57:49 +0200
Subject: [PATCH 100/210] Fix test pipeline

---
 deployment/codefresh-test.yaml | 398 +++++++++++++++++----------------
 1 file changed, 208 insertions(+), 190 deletions(-)

diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index 6c1c0f35..70846144 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -1,47 +1,35 @@
-version: '1.0'
+version: "1.0"
 stages:
-- prepare
-- build
-- unittest
-- deploy
-- qa
+  - prepare
+  - build
+  - unittest
+  - deploy
+  - qa
 steps:
   main_clone:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
-    revision: '${{CF_BRANCH}}'
+    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
+    revision: "${{CF_BRANCH}}"
     git: github
-  post_main_clone:
-    title: Post main clone
-    type: parallel
-    stage: prepare
-    steps:
-    - 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
-    - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
-      -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
-    - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
-    - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
+      - bash install.sh
+      - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
+        -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
+      - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
+      - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:
     commands:
-    - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
+      - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
     environment:
-    - ACTION=auth
-    - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
+      - ACTION=auth
+      - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
     title: View helm chart
@@ -54,43 +42,47 @@ steps:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-base/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-base
         title: Cloudharness base
         working_directory: ./.
-        tag: '${{CLOUDHARNESS_BASE_TAG}}'
+        tag: "${{CLOUDHARNESS_BASE_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
                 == false
       cloudharness-frontend-build:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-frontend-build/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-frontend-build
         title: Cloudharness frontend build
         working_directory: ./.
-        tag: '${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}'
+        tag: "${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}') == false
   build_static_images:
     title: Build static images
@@ -101,23 +93,25 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/cloudharness-flask
         title: Cloudharness flask
         working_directory: ./infrastructure/common-images/cloudharness-flask
-        tag: '${{CLOUDHARNESS_FLASK_TAG}}'
+        tag: "${{CLOUDHARNESS_FLASK_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
                 == false
   build_application_images:
     type: parallel
@@ -127,220 +121,240 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/accounts
         title: Accounts
         working_directory: ./applications/accounts
-        tag: '${{ACCOUNTS_TAG}}'
+        tag: "${{ACCOUNTS_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
                 == false
       samples:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
+          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/samples
         title: Samples
         working_directory: ./applications/samples
-        tag: '${{SAMPLES_TAG}}'
+        tag: "${{SAMPLES_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
                 == false
       samples-print-file:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-print-file
         title: Samples print file
         working_directory: ./applications/samples/tasks/print-file
-        tag: '${{SAMPLES_PRINT_FILE_TAG}}'
+        tag: "${{SAMPLES_PRINT_FILE_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
                 == false
       samples-secret:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-secret
         title: Samples secret
         working_directory: ./applications/samples/tasks/secret
-        tag: '${{SAMPLES_SECRET_TAG}}'
+        tag: "${{SAMPLES_SECRET_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
                 == false
       samples-sum:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-sum
         title: Samples sum
         working_directory: ./applications/samples/tasks/sum
-        tag: '${{SAMPLES_SUM_TAG}}'
+        tag: "${{SAMPLES_SUM_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
                 == false
       common:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/common
         title: Common
         working_directory: ./applications/common/server
-        tag: '${{COMMON_TAG}}'
+        tag: "${{COMMON_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
                 == false
       workflows-send-result-event:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-send-result-event
         title: Workflows send result event
         working_directory: ./applications/workflows/tasks/send-result-event
-        tag: '${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}'
+        tag: "${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}') == false
       workflows-extract-download:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/workflows-extract-download
         title: Workflows extract download
         working_directory: ./applications/workflows/tasks/extract-download
-        tag: '${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}'
+        tag: "${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}') == false
       workflows-notify-queue:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-notify-queue
         title: Workflows notify queue
         working_directory: ./applications/workflows/tasks/notify-queue
-        tag: '${{WORKFLOWS_NOTIFY_QUEUE_TAG}}'
+        tag: "${{WORKFLOWS_NOTIFY_QUEUE_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}') == true
-              forceNoCache: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
+              forceNoCache:
+                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}') == false
       workflows:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/workflows
         title: Workflows
         working_directory: ./applications/workflows/server
-        tag: '${{WORKFLOWS_TAG}}'
+        tag: "${{WORKFLOWS_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
                 == false
   tests_unit:
     stage: unittest
@@ -349,8 +363,8 @@ steps:
       samples_ut:
         title: Unit tests for samples
         commands:
-        - pytest /usr/src/app/samples/test
-        image: '${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}'
+          - pytest /usr/src/app/samples/test
+        image: "${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}"
   deployment:
     stage: deploy
     type: helm
@@ -360,14 +374,14 @@ steps:
       helm_version: 3.6.2
       chart_name: deployment/helm
       release_name: test-${{NAMESPACE_BASENAME}}
-      kube_context: '${{CLUSTER_NAME}}'
+      kube_context: "${{CLUSTER_NAME}}"
       namespace: test-${{NAMESPACE_BASENAME}}
-      chart_version: '${{CF_SHORT_REVISION}}'
+      chart_version: "${{CF_SHORT_REVISION}}"
       cmd_ps: --timeout 600s --create-namespace
       custom_value_files:
-      - ./deployment/helm/values.yaml
+        - ./deployment/helm/values.yaml
       custom_values:
-      - apps_samples_harness_secrets_asecret=${{ASECRET}}
+        - apps_samples_harness_secrets_asecret=${{ASECRET}}
   build_test_images:
     title: Build test images
     type: parallel
@@ -377,130 +391,134 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/test-e2e
         title: Test e2e
         working_directory: ./test/test-e2e
-        tag: '${{TEST_E2E_TAG}}'
+        tag: "${{TEST_E2E_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
                 == false
       test-api:
         type: build
         stage: build
         dockerfile: test/test-api/Dockerfile
-        registry: '${{CODEFRESH_REGISTRY}}'
+        registry: "${{CODEFRESH_REGISTRY}}"
         buildkit: true
         build_arguments:
-        - DOMAIN=${{DOMAIN}}
-        - NOCACHE=${{CF_BUILD_ID}}
-        - REGISTRY=${{REGISTRY}}/cloudharness/
-        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+          - DOMAIN=${{DOMAIN}}
+          - NOCACHE=${{CF_BUILD_ID}}
+          - REGISTRY=${{REGISTRY}}/cloudharness/
+          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/test-api
         title: Test api
         working_directory: ./.
-        tag: '${{TEST_API_TAG}}'
+        tag: "${{TEST_API_TAG}}"
         when:
           condition:
             any:
-              buildDoesNotExist: includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
+              buildDoesNotExist:
+                includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
                 == true
-              forceNoCache: includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
+              forceNoCache:
+                includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
                 == false
   wait_deployment:
     stage: qa
     title: Wait deployment to be ready
     image: codefresh/kubectl
     commands:
-    - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
-    - kubectl rollout status deployment/accounts
-    - kubectl rollout status deployment/samples
-    - kubectl rollout status deployment/common
-    - kubectl rollout status deployment/workflows
-    - sleep 60
+      - kubectl config use-context ${{CLUSTER_NAME}}
+      - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
+      - kubectl rollout status deployment/accounts
+      - kubectl rollout status deployment/samples
+      - kubectl rollout status deployment/common
+      - kubectl rollout status deployment/workflows
+      - sleep 60
   tests_api:
     stage: qa
     title: Api tests
     working_directory: /home/test
-    image: '${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}'
+    image: "${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}"
     fail_fast: false
     commands:
-    - echo $APP_NAME
+      - echo $APP_NAME
     scale:
       samples_api_test:
         title: samples api test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/samples:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
+          - "${{CF_REPO_NAME}}/applications/samples:/home/test"
+          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
         environment:
-        - APP_URL=https://samples.${{DOMAIN}}/api
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
+          - APP_URL=https://samples.${{DOMAIN}}/api
+          - USERNAME=sample@testuser.com
+          - PASSWORD=test
         commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
-          --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
-          --show-errors-tracebacks
-        - pytest -v test/api
+          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+            https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
+            --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
+            --show-errors-tracebacks
+          - pytest -v test/api
       common_api_test:
         title: common api test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/common:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
+          - "${{CF_REPO_NAME}}/applications/common:/home/test"
+          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
         environment:
-        - APP_URL=https://common.${{DOMAIN}}/api
+          - APP_URL=https://common.${{DOMAIN}}/api
         commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://common.${{DOMAIN}}/api -c all
+          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+            https://common.${{DOMAIN}}/api -c all
       workflows_api_test:
         title: workflows api test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/workflows:/home/test'
-        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
+          - "${{CF_REPO_NAME}}/applications/workflows:/home/test"
+          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
         environment:
-        - APP_URL=https://workflows.${{DOMAIN}}/api
+          - APP_URL=https://workflows.${{DOMAIN}}/api
         commands:
-        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://workflows.${{DOMAIN}}/api -c all
+          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+            https://workflows.${{DOMAIN}}/api -c all
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-          - cf_export  FAILED=failed
+            - cf_export  FAILED=failed
   tests_e2e:
     stage: qa
     title: End to end tests
     working_directory: /home/test
-    image: '${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}'
+    image: "${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}"
     fail_fast: false
     commands:
-    - yarn test
+      - yarn test
     scale:
       samples_e2e_test:
         title: samples e2e test
         volumes:
-        - '${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples'
+          - "${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples"
         environment:
-        - APP_URL=https://samples.${{DOMAIN}}
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
+          - APP_URL=https://samples.${{DOMAIN}}
+          - USERNAME=sample@testuser.com
+          - PASSWORD=test
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-          - cf_export  FAILED=failed
+            - cf_export  FAILED=failed
   approval:
     type: pending-approval
     stage: qa
@@ -508,7 +526,7 @@ steps:
     description: The pipeline will fail after ${{WAIT_ON_FAIL}} minutes
     timeout:
       timeUnit: minutes
-      duration: '${{WAIT_ON_FAIL}}'
+      duration: "${{WAIT_ON_FAIL}}"
       finalState: denied
     when:
       condition:
@@ -520,5 +538,5 @@ steps:
     image: codefresh/kubectl
     stage: qa
     commands:
-    - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl delete ns test-${{NAMESPACE_BASENAME}}
+      - kubectl config use-context ${{CLUSTER_NAME}}
+      - kubectl delete ns test-${{NAMESPACE_BASENAME}}

From 37392d8abe6380fca0a8f1dd0f3b4f26fd5b3e6f Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 10:15:24 +0200
Subject: [PATCH 101/210] Fix unparsable Python file

---
 .../cloudharness-common/cloudharness/workflows/operations.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/workflows/operations.py b/libraries/cloudharness-common/cloudharness/workflows/operations.py
index 20b89967..3a2be2f3 100644
--- a/libraries/cloudharness-common/cloudharness/workflows/operations.py
+++ b/libraries/cloudharness-common/cloudharness/workflows/operations.py
@@ -310,8 +310,8 @@ def execute(self, timeout=None):
             time.sleep(POLLING_WAIT_SECONDS)
             log.debug(f"Polling argo workflow {self.persisted.name}")
             self.persisted = argo.get_workflow(self.persisted.name)
-            log.debug(f"Polling succeeded for {
-                      self.persisted.name}. Current phase: {self.persisted.status}")
+            log.debug(f"Polling succeeded for \
+               {self.persisted.name}. Current phase: {self.persisted.status}")
             if timeout and time.time() - start_time > timeout:
                 log.error("Timeout exceeded while polling for results")
                 return self.persisted

From 3a0e4f14f8d5cda23819a1cc3ffb5323752ad278 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 30 Jul 2024 10:32:25 +0100
Subject: [PATCH 102/210] CH-91 Updated model documentation generation to use
 the directory docs are actually generated to

---
 docs/model/ApiTestsConfig.md                  | 33 ++++++++++++
 docs/model/ApplicationAccountsConfig.md       | 31 ++++++++++++
 docs/model/ApplicationConfig.md               | 30 +++++++++++
 docs/model/ApplicationDependenciesConfig.md   | 33 ++++++++++++
 docs/model/ApplicationHarnessConfig.md        | 50 +++++++++++++++++++
 docs/model/ApplicationProbe.md                | 33 ++++++++++++
 docs/model/ApplicationTestConfig.md           | 32 ++++++++++++
 docs/model/ApplicationUser.md                 | 33 ++++++++++++
 docs/model/AutoArtifactSpec.md                | 31 ++++++++++++
 docs/model/BackupConfig.md                    | 38 ++++++++++++++
 docs/model/CDCEvent.md                        | 34 +++++++++++++
 docs/model/CDCEventMeta.md                    | 34 +++++++++++++
 docs/model/CpuMemoryConfig.md                 | 31 ++++++++++++
 docs/model/DatabaseDeploymentConfig.md        | 40 +++++++++++++++
 docs/model/DeploymentAutoArtifactConfig.md    | 36 +++++++++++++
 docs/model/DeploymentResourcesConf.md         | 31 ++++++++++++
 docs/model/DeploymentVolumeSpec.md            | 34 +++++++++++++
 docs/model/E2ETestsConfig.md                  | 33 ++++++++++++
 docs/model/FileResourcesConfig.md             | 32 ++++++++++++
 docs/model/GitDependencyConfig.md             | 32 ++++++++++++
 docs/model/HarnessMainConfig.md               | 44 ++++++++++++++++
 docs/model/IngressConfig.md                   | 33 ++++++++++++
 docs/model/IngressConfigAllOfLetsencrypt.md   | 30 +++++++++++
 docs/model/JupyterHubConfig.md                | 33 ++++++++++++
 docs/model/NameValue.md                       | 31 ++++++++++++
 docs/model/RegistryConfig.md                  | 31 ++++++++++++
 docs/model/ServiceAutoArtifactConfig.md       | 32 ++++++++++++
 docs/model/UnitTestsConfig.md                 | 31 ++++++++++++
 docs/model/UriRoleMappingConfig.md            | 31 ++++++++++++
 docs/model/User.md                            | 47 +++++++++++++++++
 docs/model/UserCredential.md                  | 37 ++++++++++++++
 docs/model/UserGroup.md                       | 36 +++++++++++++
 docs/model/UserRole.md                        | 35 +++++++++++++
 .../ch_cli_tools/openapi.py                   |  2 +-
 34 files changed, 1133 insertions(+), 1 deletion(-)
 create mode 100644 docs/model/ApiTestsConfig.md
 create mode 100644 docs/model/ApplicationAccountsConfig.md
 create mode 100644 docs/model/ApplicationConfig.md
 create mode 100644 docs/model/ApplicationDependenciesConfig.md
 create mode 100644 docs/model/ApplicationHarnessConfig.md
 create mode 100644 docs/model/ApplicationProbe.md
 create mode 100644 docs/model/ApplicationTestConfig.md
 create mode 100644 docs/model/ApplicationUser.md
 create mode 100644 docs/model/AutoArtifactSpec.md
 create mode 100644 docs/model/BackupConfig.md
 create mode 100644 docs/model/CDCEvent.md
 create mode 100644 docs/model/CDCEventMeta.md
 create mode 100644 docs/model/CpuMemoryConfig.md
 create mode 100644 docs/model/DatabaseDeploymentConfig.md
 create mode 100644 docs/model/DeploymentAutoArtifactConfig.md
 create mode 100644 docs/model/DeploymentResourcesConf.md
 create mode 100644 docs/model/DeploymentVolumeSpec.md
 create mode 100644 docs/model/E2ETestsConfig.md
 create mode 100644 docs/model/FileResourcesConfig.md
 create mode 100644 docs/model/GitDependencyConfig.md
 create mode 100644 docs/model/HarnessMainConfig.md
 create mode 100644 docs/model/IngressConfig.md
 create mode 100644 docs/model/IngressConfigAllOfLetsencrypt.md
 create mode 100644 docs/model/JupyterHubConfig.md
 create mode 100644 docs/model/NameValue.md
 create mode 100644 docs/model/RegistryConfig.md
 create mode 100644 docs/model/ServiceAutoArtifactConfig.md
 create mode 100644 docs/model/UnitTestsConfig.md
 create mode 100644 docs/model/UriRoleMappingConfig.md
 create mode 100644 docs/model/User.md
 create mode 100644 docs/model/UserCredential.md
 create mode 100644 docs/model/UserGroup.md
 create mode 100644 docs/model/UserRole.md

diff --git a/docs/model/ApiTestsConfig.md b/docs/model/ApiTestsConfig.md
new file mode 100644
index 00000000..c0c0a347
--- /dev/null
+++ b/docs/model/ApiTestsConfig.md
@@ -0,0 +1,33 @@
+# ApiTestsConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enabled** | **bool** | Enables api tests for this application (default: false) | 
+**autotest** | **bool** | Specify whether to run the common smoke tests | 
+**run_params** | **List[str]** | Additional schemathesis parameters | [optional] 
+**checks** | **List[str]** | One of the Schemathesis checks:  - not_a_server_error. The response has 5xx HTTP status; - status_code_conformance. The response status is not defined in the API schema; - content_type_conformance. The response content type is not defined in the API schema; - response_schema_conformance. The response content does not conform to the schema defined for this specific response; - response_headers_conformance. The response headers does not contain all defined headers. | 
+
+## Example
+
+```python
+from cloudharness_model.models.api_tests_config import ApiTestsConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApiTestsConfig from a JSON string
+api_tests_config_instance = ApiTestsConfig.from_json(json)
+# print the JSON string representation of the object
+print ApiTestsConfig.to_json()
+
+# convert the object into a dict
+api_tests_config_dict = api_tests_config_instance.to_dict()
+# create an instance of ApiTestsConfig from a dict
+api_tests_config_form_dict = api_tests_config.from_dict(api_tests_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationAccountsConfig.md b/docs/model/ApplicationAccountsConfig.md
new file mode 100644
index 00000000..542dc891
--- /dev/null
+++ b/docs/model/ApplicationAccountsConfig.md
@@ -0,0 +1,31 @@
+# ApplicationAccountsConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**roles** | **List[str]** | Specify roles to be created in this deployment specific for this application | [optional] 
+**users** | [**List[ApplicationUser]**](ApplicationUser.md) | Defines test users to be added to the deployment, specific for this application | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.application_accounts_config import ApplicationAccountsConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationAccountsConfig from a JSON string
+application_accounts_config_instance = ApplicationAccountsConfig.from_json(json)
+# print the JSON string representation of the object
+print ApplicationAccountsConfig.to_json()
+
+# convert the object into a dict
+application_accounts_config_dict = application_accounts_config_instance.to_dict()
+# create an instance of ApplicationAccountsConfig from a dict
+application_accounts_config_form_dict = application_accounts_config.from_dict(application_accounts_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationConfig.md b/docs/model/ApplicationConfig.md
new file mode 100644
index 00000000..c62c5523
--- /dev/null
+++ b/docs/model/ApplicationConfig.md
@@ -0,0 +1,30 @@
+# ApplicationConfig
+
+Place here the values to configure your application helm templates.
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**harness** | [**ApplicationHarnessConfig**](ApplicationHarnessConfig.md) |  | 
+
+## Example
+
+```python
+from cloudharness_model.models.application_config import ApplicationConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationConfig from a JSON string
+application_config_instance = ApplicationConfig.from_json(json)
+# print the JSON string representation of the object
+print ApplicationConfig.to_json()
+
+# convert the object into a dict
+application_config_dict = application_config_instance.to_dict()
+# create an instance of ApplicationConfig from a dict
+application_config_form_dict = application_config.from_dict(application_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationDependenciesConfig.md b/docs/model/ApplicationDependenciesConfig.md
new file mode 100644
index 00000000..1adfc23c
--- /dev/null
+++ b/docs/model/ApplicationDependenciesConfig.md
@@ -0,0 +1,33 @@
+# ApplicationDependenciesConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**hard** | **List[str]** | Hard dependencies indicate that the application may not start without these other applications. | [optional] 
+**soft** | **List[str]** | Soft dependencies indicate that the application will work partially without these other applications. | [optional] 
+**build** | **List[str]** | Hard dependencies indicate that the application Docker image build requires these base/common images | [optional] 
+**git** | [**List[GitDependencyConfig]**](GitDependencyConfig.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.application_dependencies_config import ApplicationDependenciesConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationDependenciesConfig from a JSON string
+application_dependencies_config_instance = ApplicationDependenciesConfig.from_json(json)
+# print the JSON string representation of the object
+print ApplicationDependenciesConfig.to_json()
+
+# convert the object into a dict
+application_dependencies_config_dict = application_dependencies_config_instance.to_dict()
+# create an instance of ApplicationDependenciesConfig from a dict
+application_dependencies_config_form_dict = application_dependencies_config.from_dict(application_dependencies_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationHarnessConfig.md b/docs/model/ApplicationHarnessConfig.md
new file mode 100644
index 00000000..0d6fc57a
--- /dev/null
+++ b/docs/model/ApplicationHarnessConfig.md
@@ -0,0 +1,50 @@
+# ApplicationHarnessConfig
+
+Define helm variables that allow CloudHarness to enable and configure your  application's deployment
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**deployment** | [**DeploymentAutoArtifactConfig**](DeploymentAutoArtifactConfig.md) |  | [optional] 
+**service** | [**ServiceAutoArtifactConfig**](ServiceAutoArtifactConfig.md) |  | [optional] 
+**subdomain** | **str** | If specified, an ingress will be created at [subdomain].[.Values.domain] | [optional] 
+**aliases** | **List[str]** | If specified, an ingress will be created at [alias].[.Values.domain] for each alias | [optional] 
+**domain** | **str** | If specified, an ingress will be created at [domain] | [optional] 
+**dependencies** | [**ApplicationDependenciesConfig**](ApplicationDependenciesConfig.md) |  | [optional] 
+**secured** | **bool** | When true, the application is shielded with a getekeeper | [optional] 
+**uri_role_mapping** | [**List[UriRoleMappingConfig]**](UriRoleMappingConfig.md) | Map uri/roles to secure with the Gatekeeper (if &#x60;secured: true&#x60;) | [optional] 
+**secrets** | **Dict[str, object]** |  | [optional] 
+**use_services** | **List[str]** | Specify which services this application uses in the frontend to create proxy ingresses. e.g.  &#x60;&#x60;&#x60; - name: samples &#x60;&#x60;&#x60; | [optional] 
+**database** | [**DatabaseDeploymentConfig**](DatabaseDeploymentConfig.md) |  | [optional] 
+**resources** | [**List[FileResourcesConfig]**](FileResourcesConfig.md) | Application file resources. Maps from deploy/resources folder and mounts as configmaps | [optional] 
+**readiness_probe** | [**ApplicationProbe**](ApplicationProbe.md) |  | [optional] 
+**startup_probe** | [**ApplicationProbe**](ApplicationProbe.md) |  | [optional] 
+**liveness_probe** | [**ApplicationProbe**](ApplicationProbe.md) |  | [optional] 
+**source_root** | **str** |  | [optional] 
+**name** | **str** | Application&#39;s name. Do not edit, the value is automatically set from the application directory&#39;s name | [optional] 
+**jupyterhub** | [**JupyterHubConfig**](JupyterHubConfig.md) |  | [optional] 
+**accounts** | [**ApplicationAccountsConfig**](ApplicationAccountsConfig.md) |  | [optional] 
+**test** | [**ApplicationTestConfig**](ApplicationTestConfig.md) |  | [optional] 
+**quotas** | **Dict[str, object]** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.application_harness_config import ApplicationHarnessConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationHarnessConfig from a JSON string
+application_harness_config_instance = ApplicationHarnessConfig.from_json(json)
+# print the JSON string representation of the object
+print ApplicationHarnessConfig.to_json()
+
+# convert the object into a dict
+application_harness_config_dict = application_harness_config_instance.to_dict()
+# create an instance of ApplicationHarnessConfig from a dict
+application_harness_config_form_dict = application_harness_config.from_dict(application_harness_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationProbe.md b/docs/model/ApplicationProbe.md
new file mode 100644
index 00000000..404de194
--- /dev/null
+++ b/docs/model/ApplicationProbe.md
@@ -0,0 +1,33 @@
+# ApplicationProbe
+
+Define a Kubernetes probe See also the [official documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**path** | **str** |  | 
+**period_seconds** | **float** |  | [optional] 
+**failure_threshold** | **float** |  | [optional] 
+**initial_delay_seconds** | **float** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.application_probe import ApplicationProbe
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationProbe from a JSON string
+application_probe_instance = ApplicationProbe.from_json(json)
+# print the JSON string representation of the object
+print ApplicationProbe.to_json()
+
+# convert the object into a dict
+application_probe_dict = application_probe_instance.to_dict()
+# create an instance of ApplicationProbe from a dict
+application_probe_form_dict = application_probe.from_dict(application_probe_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationTestConfig.md b/docs/model/ApplicationTestConfig.md
new file mode 100644
index 00000000..c0922e1f
--- /dev/null
+++ b/docs/model/ApplicationTestConfig.md
@@ -0,0 +1,32 @@
+# ApplicationTestConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**unit** | [**UnitTestsConfig**](UnitTestsConfig.md) |  | 
+**api** | [**ApiTestsConfig**](ApiTestsConfig.md) |  | 
+**e2e** | [**E2ETestsConfig**](E2ETestsConfig.md) |  | 
+
+## Example
+
+```python
+from cloudharness_model.models.application_test_config import ApplicationTestConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationTestConfig from a JSON string
+application_test_config_instance = ApplicationTestConfig.from_json(json)
+# print the JSON string representation of the object
+print ApplicationTestConfig.to_json()
+
+# convert the object into a dict
+application_test_config_dict = application_test_config_instance.to_dict()
+# create an instance of ApplicationTestConfig from a dict
+application_test_config_form_dict = application_test_config.from_dict(application_test_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ApplicationUser.md b/docs/model/ApplicationUser.md
new file mode 100644
index 00000000..d276a038
--- /dev/null
+++ b/docs/model/ApplicationUser.md
@@ -0,0 +1,33 @@
+# ApplicationUser
+
+Defines a user
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**username** | **str** |  | 
+**password** | **str** |  | [optional] 
+**client_roles** | **List[str]** |  | [optional] 
+**realm_roles** | **List[str]** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.application_user import ApplicationUser
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ApplicationUser from a JSON string
+application_user_instance = ApplicationUser.from_json(json)
+# print the JSON string representation of the object
+print ApplicationUser.to_json()
+
+# convert the object into a dict
+application_user_dict = application_user_instance.to_dict()
+# create an instance of ApplicationUser from a dict
+application_user_form_dict = application_user.from_dict(application_user_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/AutoArtifactSpec.md b/docs/model/AutoArtifactSpec.md
new file mode 100644
index 00000000..f637301c
--- /dev/null
+++ b/docs/model/AutoArtifactSpec.md
@@ -0,0 +1,31 @@
+# AutoArtifactSpec
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**auto** | **bool** | When true, enables automatic template | 
+**name** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.auto_artifact_spec import AutoArtifactSpec
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of AutoArtifactSpec from a JSON string
+auto_artifact_spec_instance = AutoArtifactSpec.from_json(json)
+# print the JSON string representation of the object
+print AutoArtifactSpec.to_json()
+
+# convert the object into a dict
+auto_artifact_spec_dict = auto_artifact_spec_instance.to_dict()
+# create an instance of AutoArtifactSpec from a dict
+auto_artifact_spec_form_dict = auto_artifact_spec.from_dict(auto_artifact_spec_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/BackupConfig.md b/docs/model/BackupConfig.md
new file mode 100644
index 00000000..9f18eb44
--- /dev/null
+++ b/docs/model/BackupConfig.md
@@ -0,0 +1,38 @@
+# BackupConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**active** | **bool** |  | [optional] 
+**keep_days** | **int** |  | [optional] 
+**keep_weeks** | **int** |  | [optional] 
+**keep_months** | **int** |  | [optional] 
+**schedule** | **str** | Cron expression | [optional] 
+**suffix** | **object** | The file suffix added to backup files | [optional] 
+**volumesize** | **str** | The volume size for backups (all backups share the same volume) | [optional] 
+**dir** | **str** |  | 
+**resources** | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) |  | 
+
+## Example
+
+```python
+from cloudharness_model.models.backup_config import BackupConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of BackupConfig from a JSON string
+backup_config_instance = BackupConfig.from_json(json)
+# print the JSON string representation of the object
+print BackupConfig.to_json()
+
+# convert the object into a dict
+backup_config_dict = backup_config_instance.to_dict()
+# create an instance of BackupConfig from a dict
+backup_config_form_dict = backup_config.from_dict(backup_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/CDCEvent.md b/docs/model/CDCEvent.md
new file mode 100644
index 00000000..faf90671
--- /dev/null
+++ b/docs/model/CDCEvent.md
@@ -0,0 +1,34 @@
+# CDCEvent
+
+A message sent to the orchestration queue. Applications can listen to these events to react to data change events happening on other applications.
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**operation** | **str** | the operation on the object e.g. create / update / delete | 
+**uid** | **str** | the unique identifier attribute of the object | 
+**message_type** | **str** | the type of the message (relates to the object type) e.g. jobs | 
+**resource** | **Dict[str, object]** |  | [optional] 
+**meta** | [**CDCEventMeta**](CDCEventMeta.md) |  | 
+
+## Example
+
+```python
+from cloudharness_model.models.cdc_event import CDCEvent
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of CDCEvent from a JSON string
+cdc_event_instance = CDCEvent.from_json(json)
+# print the JSON string representation of the object
+print CDCEvent.to_json()
+
+# convert the object into a dict
+cdc_event_dict = cdc_event_instance.to_dict()
+# create an instance of CDCEvent from a dict
+cdc_event_form_dict = cdc_event.from_dict(cdc_event_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/CDCEventMeta.md b/docs/model/CDCEventMeta.md
new file mode 100644
index 00000000..b3d633f0
--- /dev/null
+++ b/docs/model/CDCEventMeta.md
@@ -0,0 +1,34 @@
+# CDCEventMeta
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**app_name** | **str** | The name of the application/microservice sending the message | 
+**user** | [**User**](User.md) |  | [optional] 
+**args** | **List[Dict[str, object]]** | the caller function arguments | [optional] 
+**kwargs** | **object** | the caller function keyword arguments | [optional] 
+**description** | **str** | General description -- for human consumption | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.cdc_event_meta import CDCEventMeta
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of CDCEventMeta from a JSON string
+cdc_event_meta_instance = CDCEventMeta.from_json(json)
+# print the JSON string representation of the object
+print CDCEventMeta.to_json()
+
+# convert the object into a dict
+cdc_event_meta_dict = cdc_event_meta_instance.to_dict()
+# create an instance of CDCEventMeta from a dict
+cdc_event_meta_form_dict = cdc_event_meta.from_dict(cdc_event_meta_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/CpuMemoryConfig.md b/docs/model/CpuMemoryConfig.md
new file mode 100644
index 00000000..7819d202
--- /dev/null
+++ b/docs/model/CpuMemoryConfig.md
@@ -0,0 +1,31 @@
+# CpuMemoryConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cpu** | **str** |  | [optional] 
+**memory** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.cpu_memory_config import CpuMemoryConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of CpuMemoryConfig from a JSON string
+cpu_memory_config_instance = CpuMemoryConfig.from_json(json)
+# print the JSON string representation of the object
+print CpuMemoryConfig.to_json()
+
+# convert the object into a dict
+cpu_memory_config_dict = cpu_memory_config_instance.to_dict()
+# create an instance of CpuMemoryConfig from a dict
+cpu_memory_config_form_dict = cpu_memory_config.from_dict(cpu_memory_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/DatabaseDeploymentConfig.md b/docs/model/DatabaseDeploymentConfig.md
new file mode 100644
index 00000000..45db673b
--- /dev/null
+++ b/docs/model/DatabaseDeploymentConfig.md
@@ -0,0 +1,40 @@
+# DatabaseDeploymentConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**auto** | **bool** | When true, enables automatic template | 
+**name** | **str** |  | [optional] 
+**type** | **str** | Define the database type.  One of (mongo, postgres, neo4j, sqlite3) | [optional] 
+**size** | **str** | Specify database disk size | [optional] 
+**user** | **str** | database username | [optional] 
+**var_pass** | **str** | Database password | [optional] 
+**image_ref** | **str** | Used for referencing images from the build | [optional] 
+**mongo** | **Dict[str, object]** |  | [optional] 
+**postgres** | **Dict[str, object]** |  | [optional] 
+**neo4j** | **object** | Neo4j database specific configuration | [optional] 
+**resources** | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.database_deployment_config import DatabaseDeploymentConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of DatabaseDeploymentConfig from a JSON string
+database_deployment_config_instance = DatabaseDeploymentConfig.from_json(json)
+# print the JSON string representation of the object
+print DatabaseDeploymentConfig.to_json()
+
+# convert the object into a dict
+database_deployment_config_dict = database_deployment_config_instance.to_dict()
+# create an instance of DatabaseDeploymentConfig from a dict
+database_deployment_config_form_dict = database_deployment_config.from_dict(database_deployment_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/DeploymentAutoArtifactConfig.md b/docs/model/DeploymentAutoArtifactConfig.md
new file mode 100644
index 00000000..707059d0
--- /dev/null
+++ b/docs/model/DeploymentAutoArtifactConfig.md
@@ -0,0 +1,36 @@
+# DeploymentAutoArtifactConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**auto** | **bool** | When true, enables automatic template | 
+**name** | **str** |  | [optional] 
+**port** | **str** | Deployment port | [optional] 
+**replicas** | **int** | Number of replicas | [optional] 
+**image** | **str** | Image name to use in the deployment. Leave it blank to set from the application&#39;s Docker file | [optional] 
+**resources** | [**DeploymentResourcesConf**](DeploymentResourcesConf.md) |  | [optional] 
+**volume** | [**DeploymentVolumeSpec**](DeploymentVolumeSpec.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.deployment_auto_artifact_config import DeploymentAutoArtifactConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of DeploymentAutoArtifactConfig from a JSON string
+deployment_auto_artifact_config_instance = DeploymentAutoArtifactConfig.from_json(json)
+# print the JSON string representation of the object
+print DeploymentAutoArtifactConfig.to_json()
+
+# convert the object into a dict
+deployment_auto_artifact_config_dict = deployment_auto_artifact_config_instance.to_dict()
+# create an instance of DeploymentAutoArtifactConfig from a dict
+deployment_auto_artifact_config_form_dict = deployment_auto_artifact_config.from_dict(deployment_auto_artifact_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/DeploymentResourcesConf.md b/docs/model/DeploymentResourcesConf.md
new file mode 100644
index 00000000..7a0c10d1
--- /dev/null
+++ b/docs/model/DeploymentResourcesConf.md
@@ -0,0 +1,31 @@
+# DeploymentResourcesConf
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**requests** | [**CpuMemoryConfig**](CpuMemoryConfig.md) |  | [optional] 
+**limits** | [**CpuMemoryConfig**](CpuMemoryConfig.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of DeploymentResourcesConf from a JSON string
+deployment_resources_conf_instance = DeploymentResourcesConf.from_json(json)
+# print the JSON string representation of the object
+print DeploymentResourcesConf.to_json()
+
+# convert the object into a dict
+deployment_resources_conf_dict = deployment_resources_conf_instance.to_dict()
+# create an instance of DeploymentResourcesConf from a dict
+deployment_resources_conf_form_dict = deployment_resources_conf.from_dict(deployment_resources_conf_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/DeploymentVolumeSpec.md b/docs/model/DeploymentVolumeSpec.md
new file mode 100644
index 00000000..66693cb8
--- /dev/null
+++ b/docs/model/DeploymentVolumeSpec.md
@@ -0,0 +1,34 @@
+# DeploymentVolumeSpec
+
+Defines a volume attached to the deployment. Automatically created the volume claim and mounts.
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**auto** | **bool** | When true, enables automatic template | 
+**name** | **str** |  | [optional] 
+**mountpath** | **str** | The mount path for the volume | 
+**size** | **object** | The volume size.   E.g. 5Gi | [optional] 
+**usenfs** | **bool** | Set to &#x60;true&#x60; to use the nfs on the created volume and mount as ReadWriteMany. | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.deployment_volume_spec import DeploymentVolumeSpec
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of DeploymentVolumeSpec from a JSON string
+deployment_volume_spec_instance = DeploymentVolumeSpec.from_json(json)
+# print the JSON string representation of the object
+print DeploymentVolumeSpec.to_json()
+
+# convert the object into a dict
+deployment_volume_spec_dict = deployment_volume_spec_instance.to_dict()
+# create an instance of DeploymentVolumeSpec from a dict
+deployment_volume_spec_form_dict = deployment_volume_spec.from_dict(deployment_volume_spec_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/E2ETestsConfig.md b/docs/model/E2ETestsConfig.md
new file mode 100644
index 00000000..1f5756f2
--- /dev/null
+++ b/docs/model/E2ETestsConfig.md
@@ -0,0 +1,33 @@
+# E2ETestsConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enabled** | **bool** | Enables end to end testing for this application (default: false) | 
+**smoketest** | **bool** | Specify whether to run the common smoke tests | 
+**ignore_console_errors** | **bool** |  | [optional] 
+**ignore_request_errors** | **bool** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.e2_e_tests_config import E2ETestsConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of E2ETestsConfig from a JSON string
+e2_e_tests_config_instance = E2ETestsConfig.from_json(json)
+# print the JSON string representation of the object
+print E2ETestsConfig.to_json()
+
+# convert the object into a dict
+e2_e_tests_config_dict = e2_e_tests_config_instance.to_dict()
+# create an instance of E2ETestsConfig from a dict
+e2_e_tests_config_form_dict = e2_e_tests_config.from_dict(e2_e_tests_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/FileResourcesConfig.md b/docs/model/FileResourcesConfig.md
new file mode 100644
index 00000000..4d72981e
--- /dev/null
+++ b/docs/model/FileResourcesConfig.md
@@ -0,0 +1,32 @@
+# FileResourcesConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** |  | 
+**src** | **str** |  | 
+**dst** | **str** |  | 
+
+## Example
+
+```python
+from cloudharness_model.models.file_resources_config import FileResourcesConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of FileResourcesConfig from a JSON string
+file_resources_config_instance = FileResourcesConfig.from_json(json)
+# print the JSON string representation of the object
+print FileResourcesConfig.to_json()
+
+# convert the object into a dict
+file_resources_config_dict = file_resources_config_instance.to_dict()
+# create an instance of FileResourcesConfig from a dict
+file_resources_config_form_dict = file_resources_config.from_dict(file_resources_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/GitDependencyConfig.md b/docs/model/GitDependencyConfig.md
new file mode 100644
index 00000000..51779d4d
--- /dev/null
+++ b/docs/model/GitDependencyConfig.md
@@ -0,0 +1,32 @@
+# GitDependencyConfig
+
+Defines a git repo to be cloned inside the application path
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**url** | **str** |  | 
+**branch_tag** | **str** |  | 
+**path** | **str** | Defines the path where the repo is cloned. default: /git | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.git_dependency_config import GitDependencyConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of GitDependencyConfig from a JSON string
+git_dependency_config_instance = GitDependencyConfig.from_json(json)
+# print the JSON string representation of the object
+print GitDependencyConfig.to_json()
+
+# convert the object into a dict
+git_dependency_config_dict = git_dependency_config_instance.to_dict()
+# create an instance of GitDependencyConfig from a dict
+git_dependency_config_form_dict = git_dependency_config.from_dict(git_dependency_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/HarnessMainConfig.md b/docs/model/HarnessMainConfig.md
new file mode 100644
index 00000000..5cecf052
--- /dev/null
+++ b/docs/model/HarnessMainConfig.md
@@ -0,0 +1,44 @@
+# HarnessMainConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**local** | **bool** | If set to true, local DNS mapping is added to pods. | 
+**secured_gatekeepers** | **bool** | Enables/disables Gatekeepers on secured applications. Set to false for testing/development | 
+**domain** | **str** | The root domain | 
+**namespace** | **str** | The K8s namespace. | 
+**mainapp** | **str** | Defines the app to map to the root domain | 
+**registry** | [**RegistryConfig**](RegistryConfig.md) |  | [optional] 
+**tag** | **str** | Docker tag used to push/pull the built images. | [optional] 
+**apps** | [**Dict[str, ApplicationConfig]**](ApplicationConfig.md) |  | 
+**env** | [**List[NameValue]**](NameValue.md) | Environmental variables added to all pods (deprecated, please use envmap) | [optional] 
+**privenv** | [**NameValue**](NameValue.md) |  | [optional] 
+**backup** | [**BackupConfig**](BackupConfig.md) |  | [optional] 
+**name** | **str** | Base name | [optional] 
+**task_images** | **Dict[str, object]** |  | [optional] 
+**build_hash** | **str** |  | [optional] 
+**envmap** | **Dict[str, object]** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.harness_main_config import HarnessMainConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of HarnessMainConfig from a JSON string
+harness_main_config_instance = HarnessMainConfig.from_json(json)
+# print the JSON string representation of the object
+print HarnessMainConfig.to_json()
+
+# convert the object into a dict
+harness_main_config_dict = harness_main_config_instance.to_dict()
+# create an instance of HarnessMainConfig from a dict
+harness_main_config_form_dict = harness_main_config.from_dict(harness_main_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/IngressConfig.md b/docs/model/IngressConfig.md
new file mode 100644
index 00000000..0c53184e
--- /dev/null
+++ b/docs/model/IngressConfig.md
@@ -0,0 +1,33 @@
+# IngressConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**auto** | **bool** | When true, enables automatic template | 
+**name** | **str** |  | [optional] 
+**ssl_redirect** | **bool** |  | [optional] 
+**letsencrypt** | [**IngressConfigAllOfLetsencrypt**](IngressConfigAllOfLetsencrypt.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.ingress_config import IngressConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of IngressConfig from a JSON string
+ingress_config_instance = IngressConfig.from_json(json)
+# print the JSON string representation of the object
+print IngressConfig.to_json()
+
+# convert the object into a dict
+ingress_config_dict = ingress_config_instance.to_dict()
+# create an instance of IngressConfig from a dict
+ingress_config_form_dict = ingress_config.from_dict(ingress_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/IngressConfigAllOfLetsencrypt.md b/docs/model/IngressConfigAllOfLetsencrypt.md
new file mode 100644
index 00000000..836a9ee9
--- /dev/null
+++ b/docs/model/IngressConfigAllOfLetsencrypt.md
@@ -0,0 +1,30 @@
+# IngressConfigAllOfLetsencrypt
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**email** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.ingress_config_all_of_letsencrypt import IngressConfigAllOfLetsencrypt
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of IngressConfigAllOfLetsencrypt from a JSON string
+ingress_config_all_of_letsencrypt_instance = IngressConfigAllOfLetsencrypt.from_json(json)
+# print the JSON string representation of the object
+print IngressConfigAllOfLetsencrypt.to_json()
+
+# convert the object into a dict
+ingress_config_all_of_letsencrypt_dict = ingress_config_all_of_letsencrypt_instance.to_dict()
+# create an instance of IngressConfigAllOfLetsencrypt from a dict
+ingress_config_all_of_letsencrypt_form_dict = ingress_config_all_of_letsencrypt.from_dict(ingress_config_all_of_letsencrypt_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/JupyterHubConfig.md b/docs/model/JupyterHubConfig.md
new file mode 100644
index 00000000..ccc2e304
--- /dev/null
+++ b/docs/model/JupyterHubConfig.md
@@ -0,0 +1,33 @@
+# JupyterHubConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**args** | **List[str]** | arguments passed to the container | [optional] 
+**extra_config** | **Dict[str, object]** |  | [optional] 
+**spawner_extra_config** | **Dict[str, object]** |  | [optional] 
+**application_hook** | **object** | change the hook function (advanced)  Specify the Python name of the function (full module path, the module must be  installed in the Docker image) | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.jupyter_hub_config import JupyterHubConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of JupyterHubConfig from a JSON string
+jupyter_hub_config_instance = JupyterHubConfig.from_json(json)
+# print the JSON string representation of the object
+print JupyterHubConfig.to_json()
+
+# convert the object into a dict
+jupyter_hub_config_dict = jupyter_hub_config_instance.to_dict()
+# create an instance of JupyterHubConfig from a dict
+jupyter_hub_config_form_dict = jupyter_hub_config.from_dict(jupyter_hub_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/NameValue.md b/docs/model/NameValue.md
new file mode 100644
index 00000000..cfcf6f34
--- /dev/null
+++ b/docs/model/NameValue.md
@@ -0,0 +1,31 @@
+# NameValue
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** |  | 
+**value** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.name_value import NameValue
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of NameValue from a JSON string
+name_value_instance = NameValue.from_json(json)
+# print the JSON string representation of the object
+print NameValue.to_json()
+
+# convert the object into a dict
+name_value_dict = name_value_instance.to_dict()
+# create an instance of NameValue from a dict
+name_value_form_dict = name_value.from_dict(name_value_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/RegistryConfig.md b/docs/model/RegistryConfig.md
new file mode 100644
index 00000000..88bbdd7b
--- /dev/null
+++ b/docs/model/RegistryConfig.md
@@ -0,0 +1,31 @@
+# RegistryConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** |  | 
+**secret** | **str** | Optional secret used for pulling from docker registry. | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.registry_config import RegistryConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of RegistryConfig from a JSON string
+registry_config_instance = RegistryConfig.from_json(json)
+# print the JSON string representation of the object
+print RegistryConfig.to_json()
+
+# convert the object into a dict
+registry_config_dict = registry_config_instance.to_dict()
+# create an instance of RegistryConfig from a dict
+registry_config_form_dict = registry_config.from_dict(registry_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/ServiceAutoArtifactConfig.md b/docs/model/ServiceAutoArtifactConfig.md
new file mode 100644
index 00000000..dc4c74d8
--- /dev/null
+++ b/docs/model/ServiceAutoArtifactConfig.md
@@ -0,0 +1,32 @@
+# ServiceAutoArtifactConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**auto** | **bool** | When true, enables automatic template | 
+**name** | **str** |  | [optional] 
+**port** | **int** | Service port | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.service_auto_artifact_config import ServiceAutoArtifactConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ServiceAutoArtifactConfig from a JSON string
+service_auto_artifact_config_instance = ServiceAutoArtifactConfig.from_json(json)
+# print the JSON string representation of the object
+print ServiceAutoArtifactConfig.to_json()
+
+# convert the object into a dict
+service_auto_artifact_config_dict = service_auto_artifact_config_instance.to_dict()
+# create an instance of ServiceAutoArtifactConfig from a dict
+service_auto_artifact_config_form_dict = service_auto_artifact_config.from_dict(service_auto_artifact_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/UnitTestsConfig.md b/docs/model/UnitTestsConfig.md
new file mode 100644
index 00000000..9aed04eb
--- /dev/null
+++ b/docs/model/UnitTestsConfig.md
@@ -0,0 +1,31 @@
+# UnitTestsConfig
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enabled** | **bool** | Enables unit tests for this application (default: true) | 
+**commands** | **List[str]** | Commands to run unit tests | 
+
+## Example
+
+```python
+from cloudharness_model.models.unit_tests_config import UnitTestsConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of UnitTestsConfig from a JSON string
+unit_tests_config_instance = UnitTestsConfig.from_json(json)
+# print the JSON string representation of the object
+print UnitTestsConfig.to_json()
+
+# convert the object into a dict
+unit_tests_config_dict = unit_tests_config_instance.to_dict()
+# create an instance of UnitTestsConfig from a dict
+unit_tests_config_form_dict = unit_tests_config.from_dict(unit_tests_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/UriRoleMappingConfig.md b/docs/model/UriRoleMappingConfig.md
new file mode 100644
index 00000000..11f78073
--- /dev/null
+++ b/docs/model/UriRoleMappingConfig.md
@@ -0,0 +1,31 @@
+# UriRoleMappingConfig
+
+Defines the application Gatekeeper configuration, if enabled (i.e. `secured: true`.
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uri** | **str** |  | 
+**roles** | **List[str]** | Roles allowed to access the present uri | 
+
+## Example
+
+```python
+from cloudharness_model.models.uri_role_mapping_config import UriRoleMappingConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of UriRoleMappingConfig from a JSON string
+uri_role_mapping_config_instance = UriRoleMappingConfig.from_json(json)
+# print the JSON string representation of the object
+print UriRoleMappingConfig.to_json()
+
+# convert the object into a dict
+uri_role_mapping_config_dict = uri_role_mapping_config_instance.to_dict()
+# create an instance of UriRoleMappingConfig from a dict
+uri_role_mapping_config_form_dict = uri_role_mapping_config.from_dict(uri_role_mapping_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/User.md b/docs/model/User.md
new file mode 100644
index 00000000..e5864f66
--- /dev/null
+++ b/docs/model/User.md
@@ -0,0 +1,47 @@
+# User
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**access** | **Dict[str, object]** |  | [optional] 
+**attributes** | **Dict[str, object]** |  | [optional] 
+**client_roles** | **Dict[str, object]** |  | [optional] 
+**created_timestamp** | **int** |  | [optional] 
+**credentials** | [**List[UserCredential]**](UserCredential.md) |  | [optional] 
+**disableable_credential_types** | **List[str]** |  | [optional] 
+**email** | **str** |  | [optional] 
+**email_verified** | **bool** |  | [optional] 
+**enabled** | **bool** |  | [optional] 
+**federation_link** | **str** |  | [optional] 
+**first_name** | **str** |  | [optional] 
+**groups** | **List[str]** |  | [optional] 
+**id** | **str** |  | [optional] 
+**last_name** | **str** |  | [optional] 
+**realm_roles** | **List[str]** |  | [optional] 
+**required_actions** | **List[str]** |  | [optional] 
+**service_account_client_id** | **str** |  | [optional] 
+**username** | **str** |  | [optional] 
+**additional_properties** | **object** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.user import User
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of User from a JSON string
+user_instance = User.from_json(json)
+# print the JSON string representation of the object
+print User.to_json()
+
+# convert the object into a dict
+user_dict = user_instance.to_dict()
+# create an instance of User from a dict
+user_form_dict = user.from_dict(user_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/UserCredential.md b/docs/model/UserCredential.md
new file mode 100644
index 00000000..8dd7e316
--- /dev/null
+++ b/docs/model/UserCredential.md
@@ -0,0 +1,37 @@
+# UserCredential
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**created_date** | **int** |  | [optional] 
+**credential_data** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**priority** | **int** |  | [optional] 
+**secret_data** | **str** |  | [optional] 
+**temporary** | **bool** |  | [optional] 
+**type** | **str** |  | [optional] 
+**user_label** | **str** |  | [optional] 
+**value** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.user_credential import UserCredential
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of UserCredential from a JSON string
+user_credential_instance = UserCredential.from_json(json)
+# print the JSON string representation of the object
+print UserCredential.to_json()
+
+# convert the object into a dict
+user_credential_dict = user_credential_instance.to_dict()
+# create an instance of UserCredential from a dict
+user_credential_form_dict = user_credential.from_dict(user_credential_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/UserGroup.md b/docs/model/UserGroup.md
new file mode 100644
index 00000000..a8a2bf14
--- /dev/null
+++ b/docs/model/UserGroup.md
@@ -0,0 +1,36 @@
+# UserGroup
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**access** | **Dict[str, object]** |  | [optional] 
+**attributes** | **Dict[str, object]** |  | [optional] 
+**client_roles** | **Dict[str, object]** |  | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** |  | [optional] 
+**path** | **str** |  | [optional] 
+**realm_roles** | **List[str]** |  | [optional] 
+**sub_groups** | [**List[UserGroup]**](UserGroup.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.user_group import UserGroup
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of UserGroup from a JSON string
+user_group_instance = UserGroup.from_json(json)
+# print the JSON string representation of the object
+print UserGroup.to_json()
+
+# convert the object into a dict
+user_group_dict = user_group_instance.to_dict()
+# create an instance of UserGroup from a dict
+user_group_form_dict = user_group.from_dict(user_group_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/UserRole.md b/docs/model/UserRole.md
new file mode 100644
index 00000000..9e244bb1
--- /dev/null
+++ b/docs/model/UserRole.md
@@ -0,0 +1,35 @@
+# UserRole
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**attributes** | **Dict[str, object]** |  | [optional] 
+**client_role** | **bool** |  | [optional] 
+**composite** | **bool** |  | [optional] 
+**container_id** | **str** |  | [optional] 
+**description** | **str** |  | [optional] 
+**id** | **str** |  | [optional] 
+**name** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.user_role import UserRole
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of UserRole from a JSON string
+user_role_instance = UserRole.from_json(json)
+# print the JSON string representation of the object
+print UserRole.to_json()
+
+# convert the object into a dict
+user_role_dict = user_role_instance.to_dict()
+# create an instance of UserRole from a dict
+user_role_form_dict = user_role.from_dict(user_role_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index 978b0322..05a22b44 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -50,7 +50,7 @@ def generate_model(base_path=ROOT):
     command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python -o {tmp_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
     os.system(command)
     try:
-        source_dir = join(tmp_path, "docs/models")
+        source_dir = join(tmp_path, "docs")
         if not os.path.exists(source_dir):
             os.makedirs(source_dir)
 

From 68f1010e1bd346aa5d7bcf1d0828976e3f8348f8 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 11:42:47 +0200
Subject: [PATCH 103/210] CH-121 update templates

---
 .../base/test/e2e/landing.spec.ts             |    4 +-
 .../webapp/frontend/.babelrc                  |   20 -
 .../webapp/frontend/.dockerignore             |    1 -
 .../webapp/frontend/.eslintignore             |    2 -
 .../webapp/frontend/.eslintrc.yml             |   49 -
 .../webapp/frontend/.gitignore                |    4 -
 .../webapp/frontend/README.md                 |    1 -
 .../webapp/frontend/build.yaml                |    2 -
 .../webapp/frontend/index.html                |   16 +
 .../webapp/frontend/package.json              |   60 -
 .../webapp/frontend/public/favicon.png        |  Bin 0 -> 5899 bytes
 .../{src/assets/icon.png => public/logo.png}  |  Bin
 .../webapp/frontend/src/App.tsx               |   16 +-
 .../frontend/src/components/RestTest.tsx      |   12 +-
 .../frontend/src/components/Version.tsx       |   19 +
 .../webapp/frontend/src/index.css             |    5 +
 .../webapp/frontend/src/index.ejs             |   10 -
 .../webapp/frontend/src/index.tsx             |    6 -
 .../webapp/frontend/src/styles/style.less     |    4 -
 .../webapp/frontend/src/utils/history.js      |    2 -
 .../webapp/frontend/tsconfig.json             |   22 -
 .../webapp/frontend/vite.config.ts            |   42 +
 .../webapp/frontend/webpack.config.dev.js     |   48 -
 .../webapp/frontend/webpack.config.js         |  124 --
 applications/samples/backend/requirements.txt |   11 +-
 applications/samples/frontend/package.json    |    1 -
 .../frontend/src/components/RestTest.tsx      |    7 +-
 .../frontend/src/components/Version.tsx       |    2 +-
 .../samples/frontend/src/rest/.gitignore      |    4 -
 .../samples/frontend/src/rest/.npmignore      |    1 -
 applications/samples/frontend/src/rest/api.ts | 1060 -----------------
 .../samples/frontend/src/rest/apis/AuthApi.ts |   95 ++
 .../frontend/src/rest/apis/ResourceApi.ts     |  210 ++++
 .../samples/frontend/src/rest/apis/TestApi.ts |   85 ++
 .../frontend/src/rest/apis/WorkflowsApi.ts    |  137 +++
 .../samples/frontend/src/rest/apis/index.ts   |    6 +
 .../samples/frontend/src/rest/base.ts         |   86 --
 .../samples/frontend/src/rest/common.ts       |  150 ---
 .../frontend/src/rest/configuration.ts        |  110 --
 .../samples/frontend/src/rest/git_push.sh     |   57 -
 .../samples/frontend/src/rest/index.ts        |   19 +-
 .../src/rest/models/InlineResponse202.ts      |   72 ++
 .../src/rest/models/InlineResponse202Task.ts  |   73 ++
 .../src/rest/models/SampleResource.ts         |   82 ++
 .../samples/frontend/src/rest/models/index.ts |    5 +
 .../samples/frontend/src/rest/runtime.ts      |  431 +++++++
 applications/samples/frontend/vite.config.ts  |   12 +-
 libraries/client/cloudharness_cli/README.md   |  869 --------------
 .../client/cloudharness_cli/requirements.txt  |    6 -
 .../cloudharness_cli/test-requirements.txt    |    3 -
 .../ch_cli_tools/openapi.py                   |    2 +-
 .../deployment-cli-tools/harness-application  |   36 +-
 52 files changed, 1348 insertions(+), 2753 deletions(-)
 delete mode 100644 application-templates/webapp/frontend/.babelrc
 delete mode 100644 application-templates/webapp/frontend/.dockerignore
 delete mode 100644 application-templates/webapp/frontend/.eslintignore
 delete mode 100644 application-templates/webapp/frontend/.eslintrc.yml
 delete mode 100644 application-templates/webapp/frontend/.gitignore
 delete mode 100644 application-templates/webapp/frontend/README.md
 delete mode 100644 application-templates/webapp/frontend/build.yaml
 create mode 100644 application-templates/webapp/frontend/index.html
 delete mode 100644 application-templates/webapp/frontend/package.json
 create mode 100644 application-templates/webapp/frontend/public/favicon.png
 rename application-templates/webapp/frontend/{src/assets/icon.png => public/logo.png} (100%)
 create mode 100644 application-templates/webapp/frontend/src/components/Version.tsx
 create mode 100644 application-templates/webapp/frontend/src/index.css
 delete mode 100644 application-templates/webapp/frontend/src/index.ejs
 delete mode 100644 application-templates/webapp/frontend/src/index.tsx
 delete mode 100644 application-templates/webapp/frontend/src/styles/style.less
 delete mode 100644 application-templates/webapp/frontend/src/utils/history.js
 delete mode 100644 application-templates/webapp/frontend/tsconfig.json
 create mode 100644 application-templates/webapp/frontend/vite.config.ts
 delete mode 100644 application-templates/webapp/frontend/webpack.config.dev.js
 delete mode 100644 application-templates/webapp/frontend/webpack.config.js
 delete mode 100644 applications/samples/frontend/src/rest/.gitignore
 delete mode 100644 applications/samples/frontend/src/rest/.npmignore
 delete mode 100644 applications/samples/frontend/src/rest/api.ts
 create mode 100644 applications/samples/frontend/src/rest/apis/AuthApi.ts
 create mode 100644 applications/samples/frontend/src/rest/apis/ResourceApi.ts
 create mode 100644 applications/samples/frontend/src/rest/apis/TestApi.ts
 create mode 100644 applications/samples/frontend/src/rest/apis/WorkflowsApi.ts
 create mode 100644 applications/samples/frontend/src/rest/apis/index.ts
 delete mode 100644 applications/samples/frontend/src/rest/base.ts
 delete mode 100644 applications/samples/frontend/src/rest/common.ts
 delete mode 100644 applications/samples/frontend/src/rest/configuration.ts
 delete mode 100644 applications/samples/frontend/src/rest/git_push.sh
 create mode 100644 applications/samples/frontend/src/rest/models/InlineResponse202.ts
 create mode 100644 applications/samples/frontend/src/rest/models/InlineResponse202Task.ts
 create mode 100644 applications/samples/frontend/src/rest/models/SampleResource.ts
 create mode 100644 applications/samples/frontend/src/rest/models/index.ts
 create mode 100644 applications/samples/frontend/src/rest/runtime.ts
 delete mode 100644 libraries/client/cloudharness_cli/README.md
 delete mode 100644 libraries/client/cloudharness_cli/requirements.txt
 delete mode 100644 libraries/client/cloudharness_cli/test-requirements.txt

diff --git a/application-templates/base/test/e2e/landing.spec.ts b/application-templates/base/test/e2e/landing.spec.ts
index a00e53fe..610b9655 100644
--- a/application-templates/base/test/e2e/landing.spec.ts
+++ b/application-templates/base/test/e2e/landing.spec.ts
@@ -29,7 +29,7 @@ describe("End to end test", () => {
       return el.textContent;
     });
 
-    expect(await page.title()).toEqual("Samples");
-    expect(title).toEqual("Sample React application is working!");
+    expect(await page.title()).not.toBeNull();
+    expect(title).not.toBeNull();
   });
 });
diff --git a/application-templates/webapp/frontend/.babelrc b/application-templates/webapp/frontend/.babelrc
deleted file mode 100644
index 2b53150f..00000000
--- a/application-templates/webapp/frontend/.babelrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "presets": [
-      "@babel/preset-env",
-      "@babel/preset-react"
-    ],
-    "env": {
-        "production":{
-            "presets": ["minify"]
-        }
-    },
-    "plugins": [
-        "@babel/transform-regenerator",
-        "@babel/plugin-proposal-class-properties",
-        [
-            "module-resolver", {
-                "root": ["./src"]
-            }
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/.dockerignore b/application-templates/webapp/frontend/.dockerignore
deleted file mode 100644
index cf709889..00000000
--- a/application-templates/webapp/frontend/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-**/node_modules
diff --git a/application-templates/webapp/frontend/.eslintignore b/application-templates/webapp/frontend/.eslintignore
deleted file mode 100644
index 763301fc..00000000
--- a/application-templates/webapp/frontend/.eslintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-dist/
-node_modules/
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/.eslintrc.yml b/application-templates/webapp/frontend/.eslintrc.yml
deleted file mode 100644
index 68fb53e5..00000000
--- a/application-templates/webapp/frontend/.eslintrc.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-root: true
-extends:
-  - eslint:recommended
-  - plugin:react/recommended
-parser: 'babel-eslint'
-parserOptions:
-  ecmaFeatures:
-    jsx: true
-plugins:
-  - jest
-  - react
-  - react-hooks
-settings:
-  react:
-    version: detect
-env:
-  jest/globals: true
-  browser: true
-  es6: true
-rules:
-  no-console: 0
-  func-style: 2
-  consistent-return: 2
-  prefer-arrow-callback:
-    - 2
-    - allowNamedFunctions: false
-      allowUnboundThis: false
-  jest/no-disabled-tests: 2
-  jest/no-focused-tests: 2
-  react/prop-types: 0
-  react/forbid-prop-types: 0
-  react/no-unused-prop-types: 0
-  react-hooks/rules-of-hooks: 2
-  react-hooks/exhaustive-deps: 1
-  curly: 2
-  no-tabs: 2
-  arrow-spacing: 2
-  no-unneeded-ternary: 2
-  object-curly-spacing:
-    - 2
-    - always
-  indent: 
-    - 2
-    - 2
-    - SwitchCase: 1
-globals:
-  __dirname: writable
-  module: writable
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/.gitignore b/application-templates/webapp/frontend/.gitignore
deleted file mode 100644
index 149b5765..00000000
--- a/application-templates/webapp/frontend/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-wwwroot/*.js
-node_modules
-typings
-dist
diff --git a/application-templates/webapp/frontend/README.md b/application-templates/webapp/frontend/README.md
deleted file mode 100644
index f55bdc5b..00000000
--- a/application-templates/webapp/frontend/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# __APP_NAME__
diff --git a/application-templates/webapp/frontend/build.yaml b/application-templates/webapp/frontend/build.yaml
deleted file mode 100644
index cbed1458..00000000
--- a/application-templates/webapp/frontend/build.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-build_arguments:
-  - MY_ARG=${{MY_ARG}}
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/index.html b/application-templates/webapp/frontend/index.html
new file mode 100644
index 00000000..d0f66997
--- /dev/null
+++ b/application-templates/webapp/frontend/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.png" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>CloudHarness sample application</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/main.tsx"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/package.json b/application-templates/webapp/frontend/package.json
deleted file mode 100644
index 7f1a98b3..00000000
--- a/application-templates/webapp/frontend/package.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "__APP_NAME__",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prebuild": "eslint . --color",
-    "build": "webpack --config webpack.config.js",
-    "build-dev": "webpack --config webpack.config.js --env mode=development",
-    "prestart": "eslint . --color --fix",
-    "start": "webpack serve --progress  --env DOMAIN=http://localhost:5000 --config webpack.config.dev.js",
-    "start:dev": "webpack serve --progress  --env.DOMAIN=https://__APP_NAME__.cloudharness.metacell.us --config webpack.config.dev.js",
-    "start:local": "webpack serve --progress --env DOMAIN=http://__APP_NAME__.ch.local --config webpack.config.dev.js"
-  },
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "axios": "^0.21.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-router": "^5.0.0",
-    "react-router-dom": "^5.0.0",
-    "use-clipboard-copy": "^0.1.2"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.8.3",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "babel-preset-minify": "^0.5.1",
-    "clean-webpack-plugin": "^3.0.0",
-    "compression-webpack-plugin": "^7.1.2",
-    "copy-webpack-plugin": "^6.2.1",
-    "css-loader": "^5.2.4",
-    "dotenv": "^16.0.2",
-    "eslint": "5.16.0",
-    "eslint-plugin-jest": "^23.8.2",
-    "eslint-plugin-react": "^7.19.0",
-    "eslint-plugin-react-hooks": "^3.0.0",
-    "file-loader": "^5.0.2",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^5.5.0",
-    "image-webpack-loader": "^8.1.0",
-    "less": "^3.10.3",
-    "less-loader": "^6.1.2",
-    "less-vars-to-js": "^1.3.0",
-    "raw-loader": "^4.0.2",
-    "style-loader": "^1.1.3",
-    "ts-loader": "^9.0.0",
-    "typescript": "^4.8.3",
-    "webpack": "^5.61.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^4.5.0",
-    "webpack-merge": "^5.7.0"
-  }
-}
diff --git a/application-templates/webapp/frontend/public/favicon.png b/application-templates/webapp/frontend/public/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..93c13b76c7b9432da2e43fcc23c6094538c528c7
GIT binary patch
literal 5899
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

literal 0
HcmV?d00001

diff --git a/application-templates/webapp/frontend/src/assets/icon.png b/application-templates/webapp/frontend/public/logo.png
similarity index 100%
rename from application-templates/webapp/frontend/src/assets/icon.png
rename to application-templates/webapp/frontend/public/logo.png
diff --git a/application-templates/webapp/frontend/src/App.tsx b/application-templates/webapp/frontend/src/App.tsx
index 931ea6a6..5f2286b2 100644
--- a/application-templates/webapp/frontend/src/App.tsx
+++ b/application-templates/webapp/frontend/src/App.tsx
@@ -1,16 +1,16 @@
-import React from 'react';
-import './styles/style.less';
-
 import RestTest from './components/RestTest';
+import Version from './components/Version';
 
 
 const Main = () => (
     <>
-      <img src="/assets/icon.png" />
-      <h1>Sample React application is working!</h1>
+      <img src="/logo.png" width="800" />
+      <h1>__APP_NAME__ React application is working!</h1>
+      <Version />
       <RestTest />
-      <p>See api documentation <a href="/api/ui">here</a></p>
+      <p>See api documentation <a href="/api/ui/">here</a></p>
     </>
-);
+  )
+
 
-export default Main;
\ No newline at end of file
+export default Main;
diff --git a/application-templates/webapp/frontend/src/components/RestTest.tsx b/application-templates/webapp/frontend/src/components/RestTest.tsx
index 3fbaa933..c1dc7c00 100644
--- a/application-templates/webapp/frontend/src/components/RestTest.tsx
+++ b/application-templates/webapp/frontend/src/components/RestTest.tsx
@@ -1,17 +1,19 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 
-import { TestApi } from '../rest/api'
+import { TestApi } from '../rest/apis/TestApi'
 const test = new TestApi();
 
+
+
 const RestTest = () => {
-  const [result, setResult] = useState(null);
+  const [result, setResult] = useState<any>(null);
   useEffect(() => {
-    test.ping().then(r => setResult(r), () => setResult({ data: "API error"}));
+    test.ping().then((r) => setResult(r), () => setResult( "API error"));
   }, []);
     
 
-  return result ? <p>Backend answered: { result.data } </p> : <p>Backend did not answer</p>
+  return result ? <p>Backend answered: { result } </p> : <p>Backend did not answer</p>
 }
 
 export default RestTest;
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/src/components/Version.tsx b/application-templates/webapp/frontend/src/components/Version.tsx
new file mode 100644
index 00000000..0cddc79d
--- /dev/null
+++ b/application-templates/webapp/frontend/src/components/Version.tsx
@@ -0,0 +1,19 @@
+import { useState, useEffect } from 'react';
+
+
+
+const Version = () => {
+  const [result, setResult] = useState<any>(null);
+  useEffect(() => {
+    fetch("/proxy/common/api/version", {
+      headers: {
+        'Accept': 'application/json'
+      }
+    }).then(r => r.json().then(j => setResult(j)), () => setResult("API error"));
+  }, []);
+    
+
+  return result ? <p>Tag: { result?.tag } - Build: {result?.build} </p> : <p>Backend did not answer</p>
+}
+
+export default Version;
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/src/index.css b/application-templates/webapp/frontend/src/index.css
new file mode 100644
index 00000000..7466f905
--- /dev/null
+++ b/application-templates/webapp/frontend/src/index.css
@@ -0,0 +1,5 @@
+body {
+  text-align: center;
+  background-color: '#eeeeee';
+  font-family: Roboto, Helvetica, sans-serif;
+}
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/src/index.ejs b/application-templates/webapp/frontend/src/index.ejs
deleted file mode 100644
index 97d529ad..00000000
--- a/application-templates/webapp/frontend/src/index.ejs
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>__APP_NAME__</title>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/src/index.tsx b/application-templates/webapp/frontend/src/index.tsx
deleted file mode 100644
index ae31e413..00000000
--- a/application-templates/webapp/frontend/src/index.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import App from './App';
-
-ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/application-templates/webapp/frontend/src/styles/style.less b/application-templates/webapp/frontend/src/styles/style.less
deleted file mode 100644
index b1bece6a..00000000
--- a/application-templates/webapp/frontend/src/styles/style.less
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
-    text-align: center;
-    background-color: '#eeeeee';
-}
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/src/utils/history.js b/application-templates/webapp/frontend/src/utils/history.js
deleted file mode 100644
index 7bef5c97..00000000
--- a/application-templates/webapp/frontend/src/utils/history.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { createBrowserHistory } from "history";
-export default createBrowserHistory();
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/tsconfig.json b/application-templates/webapp/frontend/tsconfig.json
deleted file mode 100644
index 21ec6c41..00000000
--- a/application-templates/webapp/frontend/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "module": "commonjs",
-    "target": "es2017",
-    "stripInternal":true,
-    "skipLibCheck": true,
-    "alwaysStrict":false,
-    "forceConsistentCasingInFileNames": true,
-    "noImplicitReturns": false,
-    "strict": false,
-    "noUnusedLocals": false,
-    "jsx": "react",
-    "types": [],
-    "esModuleInterop": true
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/vite.config.ts b/application-templates/webapp/frontend/vite.config.ts
new file mode 100644
index 00000000..15155d73
--- /dev/null
+++ b/application-templates/webapp/frontend/vite.config.ts
@@ -0,0 +1,42 @@
+import { defineConfig, loadEnv } from 'vite'
+import react from '@vitejs/plugin-react'
+
+
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => {
+  // Load env file based on `mode` in the current working directory.
+  // Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
+  const env = loadEnv(mode, process.cwd(), '')
+
+  const theDomain = env && env.DOMAIN ? env.DOMAIN : 'localhost:5000';
+  
+  console.log('Dev server address: ', theDomain);
+
+  const proxyTarget = theDomain;
+  const replaceHost = (uri: string, appName: string) => {
+    const host = (uri.includes("samples.") && uri.replace("samples.", appName + '.')) || uri;
+    console.log('Proxy target: ', host);
+    return host;
+  }
+
+
+  return {
+  plugins: [react()],
+  server: {
+    port: 9000,
+    proxy: {
+      '/api/': {
+        target: replaceHost( proxyTarget, 'samples'),
+        secure: false,
+        changeOrigin: true,
+      },
+      '/proxy/common/api': {
+        target: replaceHost( proxyTarget, 'common'),
+        secure: false,
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
+      }
+  }
+}}}
+)
diff --git a/application-templates/webapp/frontend/webpack.config.dev.js b/application-templates/webapp/frontend/webpack.config.dev.js
deleted file mode 100644
index 3c6a33ce..00000000
--- a/application-templates/webapp/frontend/webpack.config.dev.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const { merge } = require('webpack-merge');
-const common = require('./webpack.config.js');
-
-var path = require('path');
-
-const PORT = 9000;
-
-
-module.exports = env => {
-
-  const theDomain = env && env.DOMAIN ? env.DOMAIN : 'localhost:5000';
-  
-  console.log('Dev server address: ', theDomain);
-
-  const proxyTarget = theDomain;
-  const replaceHost = (uri, appName) => (uri.includes("__APP_NAME__") && uri.replace("__APP_NAME__", appName + '.' + theDomain)) || uri;
-  if (!env.port) {
-    env.devPort = PORT;
-  }
-
-
-  const devServer = {
-    static: [{
-      directory: path.resolve(__dirname, 'dist'),
-      publicPath: '/',
-    }],
-    compress: true,
-    https: env.DOMAIN.includes("https"),
-    port: Number(env.devPort),
-    historyApiFallback: true,
-    proxy: {
-      '/api/': {
-        target: replaceHost( proxyTarget, '__APP_NAME__'),
-        secure: false,
-        changeOrigin: true,
-      }
-    },
-  };
-
-  return merge(
-    common(env),
-    {
-      mode: 'development',
-      devtool: 'source-map',
-      devServer,
-    } 
-  )
-};
diff --git a/application-templates/webapp/frontend/webpack.config.js b/application-templates/webapp/frontend/webpack.config.js
deleted file mode 100644
index ad5ee556..00000000
--- a/application-templates/webapp/frontend/webpack.config.js
+++ /dev/null
@@ -1,124 +0,0 @@
-const path = require("path");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const CompressionPlugin = require("compression-webpack-plugin");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-
-const copyPaths = [
-  { from: path.resolve(__dirname, "src/assets"), to: "assets" },
-];
-
-module.exports = function webpacking(envVariables) {
-  let env = envVariables;
-  if (!env) {
-    env = {};
-  }
-  if (!env.mode) {
-    env.mode = "production";
-  }
-
-  console.log("####################");
-  console.log("####################");
-  console.log("BUILD bundle with parameters:");
-  console.log(env);
-  console.log("####################");
-  console.log("####################");
-
-  const { mode } = env;
-  const devtool = "source-map";
-
-  const output = {
-    path: path.resolve(__dirname, "dist"),
-    filename: "[name].[contenthash].js",
-    publicPath: "/"
-  };
-
-  const module = {
-    rules: [
-      {
-        test: /\.(js|jsx)$/,
-        exclude: /node_modules/,
-        loader: "babel-loader",
-      },
-      {
-        test: /\.ts(x?)$/,
-        include: path.resolve(__dirname, 'src'),
-        use: [
-          {
-            loader: "ts-loader",
-            options: {
-              transpileOnly: true,
-            },
-          }
-        ]
-      },
-      {
-        test: /\.(css)$/,
-        use: [
-          {
-            loader: "style-loader",
-          },
-          {
-            loader: "css-loader",
-          },
-        ],
-      },
-      {
-        test: /\.less$/,
-        use: [
-          {
-            loader: "style-loader",
-          },
-          {
-            loader: "css-loader",
-          },
-          {
-            loader: "less-loader",
-            options: {
-              lessOptions: {
-                strictMath: true,
-              },
-            },
-          },
-        ],
-      },
-      {
-        test: /\.(png|jpg|gif|eot|woff|woff2|svg|ttf)$/,
-        use: [
-          "file-loader",
-          {
-            loader: "image-webpack-loader",
-            options: {
-              bypassOnDebug: true, // webpack@1.x
-              disable: true, // webpack@2.x and newer
-            },
-          },
-        ],
-      },
-    ],
-  };
-
-  const resolve = {
-    extensions: ["*", ".js", ".json", ".ts", ".tsx", ".jsx"],
-    symlinks: false,
-  };
-
-  const plugins = [
-    new CleanWebpackPlugin(),
-    new CopyWebpackPlugin({ patterns: copyPaths }),
-    new CompressionPlugin(),
-    new HtmlWebpackPlugin({
-      template: "src/index.ejs",
-      favicon: path.join(__dirname, "src/assets/icon.png"),
-    }),
-  ];
-
-  return {
-    mode,
-    devtool,
-    output,
-    module,
-    resolve,
-    plugins,
-  };
-};
diff --git a/applications/samples/backend/requirements.txt b/applications/samples/backend/requirements.txt
index a5ddff35..be4c8a3a 100644
--- a/applications/samples/backend/requirements.txt
+++ b/applications/samples/backend/requirements.txt
@@ -1,4 +1,11 @@
-connexion[swagger-ui]==2.14.2
+connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
+# 2.3 is the last version that supports python 3.4-3.5
+connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
+# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
+# we must peg werkzeug versions below to fix connexion
+# https://github.com/zalando/connexion/pull/1044
+werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
+swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0
-Flask<3.0.0
+Flask == 2.1.1
diff --git a/applications/samples/frontend/package.json b/applications/samples/frontend/package.json
index aa383ae3..fef056fa 100644
--- a/applications/samples/frontend/package.json
+++ b/applications/samples/frontend/package.json
@@ -13,7 +13,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "axios": "^1.7.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
diff --git a/applications/samples/frontend/src/components/RestTest.tsx b/applications/samples/frontend/src/components/RestTest.tsx
index 5732a17a..c1dc7c00 100644
--- a/applications/samples/frontend/src/components/RestTest.tsx
+++ b/applications/samples/frontend/src/components/RestTest.tsx
@@ -1,8 +1,7 @@
 import { useState, useEffect } from 'react';
 
 
-import { TestApi } from '../rest/api'
-import { AxiosResponse } from 'axios';
+import { TestApi } from '../rest/apis/TestApi'
 const test = new TestApi();
 
 
@@ -10,11 +9,11 @@ const test = new TestApi();
 const RestTest = () => {
   const [result, setResult] = useState<any>(null);
   useEffect(() => {
-    test.ping().then((r: AxiosResponse) => setResult(r), () => setResult({ data: "API error"}));
+    test.ping().then((r) => setResult(r), () => setResult( "API error"));
   }, []);
     
 
-  return result ? <p>Backend answered: { result.data } </p> : <p>Backend did not answer</p>
+  return result ? <p>Backend answered: { result } </p> : <p>Backend did not answer</p>
 }
 
 export default RestTest;
\ No newline at end of file
diff --git a/applications/samples/frontend/src/components/Version.tsx b/applications/samples/frontend/src/components/Version.tsx
index 279e0aca..0cddc79d 100644
--- a/applications/samples/frontend/src/components/Version.tsx
+++ b/applications/samples/frontend/src/components/Version.tsx
@@ -9,7 +9,7 @@ const Version = () => {
       headers: {
         'Accept': 'application/json'
       }
-    }).then(r => r.json().then(j => setResult(j)), () => setResult({ data: "API error" }));
+    }).then(r => r.json().then(j => setResult(j)), () => setResult("API error"));
   }, []);
     
 
diff --git a/applications/samples/frontend/src/rest/.gitignore b/applications/samples/frontend/src/rest/.gitignore
deleted file mode 100644
index 149b5765..00000000
--- a/applications/samples/frontend/src/rest/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-wwwroot/*.js
-node_modules
-typings
-dist
diff --git a/applications/samples/frontend/src/rest/.npmignore b/applications/samples/frontend/src/rest/.npmignore
deleted file mode 100644
index 999d88df..00000000
--- a/applications/samples/frontend/src/rest/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-# empty npmignore to ensure all required files (e.g., in the dist folder) are published by npm
\ No newline at end of file
diff --git a/applications/samples/frontend/src/rest/api.ts b/applications/samples/frontend/src/rest/api.ts
deleted file mode 100644
index ac223526..00000000
--- a/applications/samples/frontend/src/rest/api.ts
+++ /dev/null
@@ -1,1060 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * CloudHarness Sample API
- * CloudHarness Sample api
- *
- * The version of the OpenAPI document: 0.1.0
- * Contact: cloudharness@metacell.us
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-import type { Configuration } from './configuration';
-import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
-import globalAxios from 'axios';
-// Some imports not used depending on template conditions
-// @ts-ignore
-import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common';
-import type { RequestArgs } from './base';
-// @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from './base';
-
-/**
- * 
- * @export
- * @interface InlineResponse202
- */
-export interface InlineResponse202 {
-    /**
-     * 
-     * @type {InlineResponse202Task}
-     * @memberof InlineResponse202
-     */
-    'task'?: InlineResponse202Task;
-}
-/**
- * 
- * @export
- * @interface InlineResponse202Task
- */
-export interface InlineResponse202Task {
-    /**
-     * the url where to check the operation status
-     * @type {string}
-     * @memberof InlineResponse202Task
-     */
-    'href'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof InlineResponse202Task
-     */
-    'name'?: string;
-}
-/**
- * 
- * @export
- * @interface SampleResource
- */
-export interface SampleResource {
-    /**
-     * 
-     * @type {number}
-     * @memberof SampleResource
-     */
-    'a': number;
-    /**
-     * 
-     * @type {number}
-     * @memberof SampleResource
-     */
-    'b'?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof SampleResource
-     */
-    'id'?: number;
-}
-
-/**
- * AuthApi - axios parameter creator
- * @export
- */
-export const AuthApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * Check if the token is valid 
-         * @summary Check if the token is valid. Get a token by logging into the base url
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        validCookie: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/valid-cookie`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication cookieAuth required
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Check if the token is valid 
-         * @summary Check if the token is valid. Get a token by logging into the base url
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        validToken: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/valid`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication bearerAuth required
-            // http bearer authentication required
-            await setBearerAuthToObject(localVarHeaderParameter, configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * AuthApi - functional programming interface
- * @export
- */
-export const AuthApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = AuthApiAxiosParamCreator(configuration)
-    return {
-        /**
-         * Check if the token is valid 
-         * @summary Check if the token is valid. Get a token by logging into the base url
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async validCookie(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.validCookie(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['AuthApi.validCookie']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * Check if the token is valid 
-         * @summary Check if the token is valid. Get a token by logging into the base url
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async validToken(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.validToken(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['AuthApi.validToken']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-    }
-};
-
-/**
- * AuthApi - factory interface
- * @export
- */
-export const AuthApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = AuthApiFp(configuration)
-    return {
-        /**
-         * Check if the token is valid 
-         * @summary Check if the token is valid. Get a token by logging into the base url
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        validCookie(options?: any): AxiosPromise<string> {
-            return localVarFp.validCookie(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Check if the token is valid 
-         * @summary Check if the token is valid. Get a token by logging into the base url
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        validToken(options?: any): AxiosPromise<string> {
-            return localVarFp.validToken(options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * AuthApi - object-oriented interface
- * @export
- * @class AuthApi
- * @extends {BaseAPI}
- */
-export class AuthApi extends BaseAPI {
-    /**
-     * Check if the token is valid 
-     * @summary Check if the token is valid. Get a token by logging into the base url
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof AuthApi
-     */
-    public validCookie(options?: RawAxiosRequestConfig) {
-        return AuthApiFp(this.configuration).validCookie(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Check if the token is valid 
-     * @summary Check if the token is valid. Get a token by logging into the base url
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof AuthApi
-     */
-    public validToken(options?: RawAxiosRequestConfig) {
-        return AuthApiFp(this.configuration).validToken(options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
-
-/**
- * ResourceApi - axios parameter creator
- * @export
- */
-export const ResourceApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * Creates a new instance of a `SampleResource`.
-         * @summary Create a SampleResource
-         * @param {SampleResource} sampleResource A new &#x60;SampleResource&#x60; to be created.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createSampleResource: async (sampleResource: SampleResource, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'sampleResource' is not null or undefined
-            assertParamExists('createSampleResource', 'sampleResource', sampleResource)
-            const localVarPath = `/sampleresources`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(sampleResource, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Deletes an existing `SampleResource`.
-         * @summary Delete a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteSampleResource: async (sampleresourceId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'sampleresourceId' is not null or undefined
-            assertParamExists('deleteSampleResource', 'sampleresourceId', sampleresourceId)
-            const localVarPath = `/sampleresources/{sampleresourceId}`
-                .replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(sampleresourceId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Gets the details of a single instance of a `SampleResource`.
-         * @summary Get a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getSampleResource: async (sampleresourceId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'sampleresourceId' is not null or undefined
-            assertParamExists('getSampleResource', 'sampleresourceId', sampleresourceId)
-            const localVarPath = `/sampleresources/{sampleresourceId}`
-                .replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(sampleresourceId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Gets a list of all `SampleResource` entities.
-         * @summary List All SampleResources
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getSampleResources: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sampleresources`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Updates an existing `SampleResource`.
-         * @summary Update a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {SampleResource} sampleResource Updated &#x60;SampleResource&#x60; information.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateSampleResource: async (sampleresourceId: string, sampleResource: SampleResource, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'sampleresourceId' is not null or undefined
-            assertParamExists('updateSampleResource', 'sampleresourceId', sampleresourceId)
-            // verify required parameter 'sampleResource' is not null or undefined
-            assertParamExists('updateSampleResource', 'sampleResource', sampleResource)
-            const localVarPath = `/sampleresources/{sampleresourceId}`
-                .replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(sampleresourceId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(sampleResource, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * ResourceApi - functional programming interface
- * @export
- */
-export const ResourceApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = ResourceApiAxiosParamCreator(configuration)
-    return {
-        /**
-         * Creates a new instance of a `SampleResource`.
-         * @summary Create a SampleResource
-         * @param {SampleResource} sampleResource A new &#x60;SampleResource&#x60; to be created.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async createSampleResource(sampleResource: SampleResource, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.createSampleResource(sampleResource, options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['ResourceApi.createSampleResource']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * Deletes an existing `SampleResource`.
-         * @summary Delete a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async deleteSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.deleteSampleResource(sampleresourceId, options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['ResourceApi.deleteSampleResource']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * Gets the details of a single instance of a `SampleResource`.
-         * @summary Get a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async getSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SampleResource>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getSampleResource(sampleresourceId, options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['ResourceApi.getSampleResource']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * Gets a list of all `SampleResource` entities.
-         * @summary List All SampleResources
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async getSampleResources(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SampleResource>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getSampleResources(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['ResourceApi.getSampleResources']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * Updates an existing `SampleResource`.
-         * @summary Update a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {SampleResource} sampleResource Updated &#x60;SampleResource&#x60; information.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateSampleResource(sampleresourceId, sampleResource, options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['ResourceApi.updateSampleResource']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-    }
-};
-
-/**
- * ResourceApi - factory interface
- * @export
- */
-export const ResourceApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = ResourceApiFp(configuration)
-    return {
-        /**
-         * Creates a new instance of a `SampleResource`.
-         * @summary Create a SampleResource
-         * @param {SampleResource} sampleResource A new &#x60;SampleResource&#x60; to be created.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createSampleResource(sampleResource: SampleResource, options?: any): AxiosPromise<void> {
-            return localVarFp.createSampleResource(sampleResource, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Deletes an existing `SampleResource`.
-         * @summary Delete a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteSampleResource(sampleresourceId: string, options?: any): AxiosPromise<void> {
-            return localVarFp.deleteSampleResource(sampleresourceId, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Gets the details of a single instance of a `SampleResource`.
-         * @summary Get a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getSampleResource(sampleresourceId: string, options?: any): AxiosPromise<SampleResource> {
-            return localVarFp.getSampleResource(sampleresourceId, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Gets a list of all `SampleResource` entities.
-         * @summary List All SampleResources
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getSampleResources(options?: any): AxiosPromise<Array<SampleResource>> {
-            return localVarFp.getSampleResources(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Updates an existing `SampleResource`.
-         * @summary Update a SampleResource
-         * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-         * @param {SampleResource} sampleResource Updated &#x60;SampleResource&#x60; information.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: any): AxiosPromise<void> {
-            return localVarFp.updateSampleResource(sampleresourceId, sampleResource, options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * ResourceApi - object-oriented interface
- * @export
- * @class ResourceApi
- * @extends {BaseAPI}
- */
-export class ResourceApi extends BaseAPI {
-    /**
-     * Creates a new instance of a `SampleResource`.
-     * @summary Create a SampleResource
-     * @param {SampleResource} sampleResource A new &#x60;SampleResource&#x60; to be created.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ResourceApi
-     */
-    public createSampleResource(sampleResource: SampleResource, options?: RawAxiosRequestConfig) {
-        return ResourceApiFp(this.configuration).createSampleResource(sampleResource, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Deletes an existing `SampleResource`.
-     * @summary Delete a SampleResource
-     * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ResourceApi
-     */
-    public deleteSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig) {
-        return ResourceApiFp(this.configuration).deleteSampleResource(sampleresourceId, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Gets the details of a single instance of a `SampleResource`.
-     * @summary Get a SampleResource
-     * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ResourceApi
-     */
-    public getSampleResource(sampleresourceId: string, options?: RawAxiosRequestConfig) {
-        return ResourceApiFp(this.configuration).getSampleResource(sampleresourceId, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Gets a list of all `SampleResource` entities.
-     * @summary List All SampleResources
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ResourceApi
-     */
-    public getSampleResources(options?: RawAxiosRequestConfig) {
-        return ResourceApiFp(this.configuration).getSampleResources(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Updates an existing `SampleResource`.
-     * @summary Update a SampleResource
-     * @param {string} sampleresourceId A unique identifier for a &#x60;SampleResource&#x60;.
-     * @param {SampleResource} sampleResource Updated &#x60;SampleResource&#x60; information.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ResourceApi
-     */
-    public updateSampleResource(sampleresourceId: string, sampleResource: SampleResource, options?: RawAxiosRequestConfig) {
-        return ResourceApiFp(this.configuration).updateSampleResource(sampleresourceId, sampleResource, options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
-
-/**
- * TestApi - axios parameter creator
- * @export
- */
-export const TestApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary test sentry is working
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        error: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/error`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary test the application is up
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        ping: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/ping`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * TestApi - functional programming interface
- * @export
- */
-export const TestApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = TestApiAxiosParamCreator(configuration)
-    return {
-        /**
-         * 
-         * @summary test sentry is working
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        async error(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.error(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['TestApi.error']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * 
-         * @summary test the application is up
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async ping(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<number>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.ping(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['TestApi.ping']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-    }
-};
-
-/**
- * TestApi - factory interface
- * @export
- */
-export const TestApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = TestApiFp(configuration)
-    return {
-        /**
-         * 
-         * @summary test sentry is working
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        error(options?: any): AxiosPromise<string> {
-            return localVarFp.error(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary test the application is up
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        ping(options?: any): AxiosPromise<number> {
-            return localVarFp.ping(options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * TestApi - object-oriented interface
- * @export
- * @class TestApi
- * @extends {BaseAPI}
- */
-export class TestApi extends BaseAPI {
-    /**
-     * 
-     * @summary test sentry is working
-     * @param {*} [options] Override http request option.
-     * @deprecated
-     * @throws {RequiredError}
-     * @memberof TestApi
-     */
-    public error(options?: RawAxiosRequestConfig) {
-        return TestApiFp(this.configuration).error(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @summary test the application is up
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof TestApi
-     */
-    public ping(options?: RawAxiosRequestConfig) {
-        return TestApiFp(this.configuration).ping(options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
-
-/**
- * WorkflowsApi - axios parameter creator
- * @export
- */
-export const WorkflowsApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary Send an asynchronous operation
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        submitAsync: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/operation_async`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Send a synchronous operation
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        submitSync: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/operation_sync`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-         * @param {number} a first number to sum
-         * @param {number} b second number to sum
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        submitSyncWithResults: async (a: number, b: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'a' is not null or undefined
-            assertParamExists('submitSyncWithResults', 'a', a)
-            // verify required parameter 'b' is not null or undefined
-            assertParamExists('submitSyncWithResults', 'b', b)
-            const localVarPath = `/operation_sync_results`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            if (a !== undefined) {
-                localVarQueryParameter['a'] = a;
-            }
-
-            if (b !== undefined) {
-                localVarQueryParameter['b'] = b;
-            }
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * WorkflowsApi - functional programming interface
- * @export
- */
-export const WorkflowsApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = WorkflowsApiAxiosParamCreator(configuration)
-    return {
-        /**
-         * 
-         * @summary Send an asynchronous operation
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async submitAsync(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse202>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.submitAsync(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['WorkflowsApi.submitAsync']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * 
-         * @summary Send a synchronous operation
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        async submitSync(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<object>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.submitSync(options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['WorkflowsApi.submitSync']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-        /**
-         * 
-         * @summary Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-         * @param {number} a first number to sum
-         * @param {number} b second number to sum
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        async submitSyncWithResults(a: number, b: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.submitSyncWithResults(a, b, options);
-            const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['WorkflowsApi.submitSyncWithResults']?.[index]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
-        },
-    }
-};
-
-/**
- * WorkflowsApi - factory interface
- * @export
- */
-export const WorkflowsApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = WorkflowsApiFp(configuration)
-    return {
-        /**
-         * 
-         * @summary Send an asynchronous operation
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        submitAsync(options?: any): AxiosPromise<InlineResponse202> {
-            return localVarFp.submitAsync(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary Send a synchronous operation
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        submitSync(options?: any): AxiosPromise<object> {
-            return localVarFp.submitSync(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-         * @param {number} a first number to sum
-         * @param {number} b second number to sum
-         * @param {*} [options] Override http request option.
-         * @deprecated
-         * @throws {RequiredError}
-         */
-        submitSyncWithResults(a: number, b: number, options?: any): AxiosPromise<string> {
-            return localVarFp.submitSyncWithResults(a, b, options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * WorkflowsApi - object-oriented interface
- * @export
- * @class WorkflowsApi
- * @extends {BaseAPI}
- */
-export class WorkflowsApi extends BaseAPI {
-    /**
-     * 
-     * @summary Send an asynchronous operation
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof WorkflowsApi
-     */
-    public submitAsync(options?: RawAxiosRequestConfig) {
-        return WorkflowsApiFp(this.configuration).submitAsync(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @summary Send a synchronous operation
-     * @param {*} [options] Override http request option.
-     * @deprecated
-     * @throws {RequiredError}
-     * @memberof WorkflowsApi
-     */
-    public submitSync(options?: RawAxiosRequestConfig) {
-        return WorkflowsApiFp(this.configuration).submitSync(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @summary Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-     * @param {number} a first number to sum
-     * @param {number} b second number to sum
-     * @param {*} [options] Override http request option.
-     * @deprecated
-     * @throws {RequiredError}
-     * @memberof WorkflowsApi
-     */
-    public submitSyncWithResults(a: number, b: number, options?: RawAxiosRequestConfig) {
-        return WorkflowsApiFp(this.configuration).submitSyncWithResults(a, b, options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
-
diff --git a/applications/samples/frontend/src/rest/apis/AuthApi.ts b/applications/samples/frontend/src/rest/apis/AuthApi.ts
new file mode 100644
index 00000000..a00945e1
--- /dev/null
+++ b/applications/samples/frontend/src/rest/apis/AuthApi.ts
@@ -0,0 +1,95 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+
+/**
+ * 
+ */
+export class AuthApi extends runtime.BaseAPI {
+
+    /**
+     * Check if the token is valid 
+     * Check if the token is valid. Get a token by logging into the base url
+     */
+    async validCookieRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/valid-cookie`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<string>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
+    }
+
+    /**
+     * Check if the token is valid 
+     * Check if the token is valid. Get a token by logging into the base url
+     */
+    async validCookie(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<string> {
+        const response = await this.validCookieRaw(initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Check if the token is valid 
+     * Check if the token is valid. Get a token by logging into the base url
+     */
+    async validTokenRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            const token = this.configuration.accessToken;
+            const tokenString = await token("bearerAuth", []);
+
+            if (tokenString) {
+                headerParameters["Authorization"] = `Bearer ${tokenString}`;
+            }
+        }
+        const response = await this.request({
+            path: `/valid`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<string>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
+    }
+
+    /**
+     * Check if the token is valid 
+     * Check if the token is valid. Get a token by logging into the base url
+     */
+    async validToken(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<string> {
+        const response = await this.validTokenRaw(initOverrides);
+        return await response.value();
+    }
+
+}
diff --git a/applications/samples/frontend/src/rest/apis/ResourceApi.ts b/applications/samples/frontend/src/rest/apis/ResourceApi.ts
new file mode 100644
index 00000000..a0c70d83
--- /dev/null
+++ b/applications/samples/frontend/src/rest/apis/ResourceApi.ts
@@ -0,0 +1,210 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import type {
+  SampleResource,
+} from '../models/index';
+import {
+    SampleResourceFromJSON,
+    SampleResourceToJSON,
+} from '../models/index';
+
+export interface CreateSampleResourceRequest {
+    sampleResource: SampleResource;
+}
+
+export interface DeleteSampleResourceRequest {
+    sampleresourceId: string;
+}
+
+export interface GetSampleResourceRequest {
+    sampleresourceId: string;
+}
+
+export interface UpdateSampleResourceRequest {
+    sampleresourceId: string;
+    sampleResource: SampleResource;
+}
+
+/**
+ * 
+ */
+export class ResourceApi extends runtime.BaseAPI {
+
+    /**
+     * Creates a new instance of a `SampleResource`.
+     * Create a SampleResource
+     */
+    async createSampleResourceRaw(requestParameters: CreateSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.sampleResource === null || requestParameters.sampleResource === undefined) {
+            throw new runtime.RequiredError('sampleResource','Required parameter requestParameters.sampleResource was null or undefined when calling createSampleResource.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/sampleresources`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: SampleResourceToJSON(requestParameters.sampleResource),
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Creates a new instance of a `SampleResource`.
+     * Create a SampleResource
+     */
+    async createSampleResource(requestParameters: CreateSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.createSampleResourceRaw(requestParameters, initOverrides);
+    }
+
+    /**
+     * Deletes an existing `SampleResource`.
+     * Delete a SampleResource
+     */
+    async deleteSampleResourceRaw(requestParameters: DeleteSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.sampleresourceId === null || requestParameters.sampleresourceId === undefined) {
+            throw new runtime.RequiredError('sampleresourceId','Required parameter requestParameters.sampleresourceId was null or undefined when calling deleteSampleResource.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters.sampleresourceId))),
+            method: 'DELETE',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Deletes an existing `SampleResource`.
+     * Delete a SampleResource
+     */
+    async deleteSampleResource(requestParameters: DeleteSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.deleteSampleResourceRaw(requestParameters, initOverrides);
+    }
+
+    /**
+     * Gets the details of a single instance of a `SampleResource`.
+     * Get a SampleResource
+     */
+    async getSampleResourceRaw(requestParameters: GetSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SampleResource>> {
+        if (requestParameters.sampleresourceId === null || requestParameters.sampleresourceId === undefined) {
+            throw new runtime.RequiredError('sampleresourceId','Required parameter requestParameters.sampleresourceId was null or undefined when calling getSampleResource.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters.sampleresourceId))),
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => SampleResourceFromJSON(jsonValue));
+    }
+
+    /**
+     * Gets the details of a single instance of a `SampleResource`.
+     * Get a SampleResource
+     */
+    async getSampleResource(requestParameters: GetSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SampleResource> {
+        const response = await this.getSampleResourceRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Gets a list of all `SampleResource` entities.
+     * List All SampleResources
+     */
+    async getSampleResourcesRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<SampleResource>>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/sampleresources`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(SampleResourceFromJSON));
+    }
+
+    /**
+     * Gets a list of all `SampleResource` entities.
+     * List All SampleResources
+     */
+    async getSampleResources(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<SampleResource>> {
+        const response = await this.getSampleResourcesRaw(initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Updates an existing `SampleResource`.
+     * Update a SampleResource
+     */
+    async updateSampleResourceRaw(requestParameters: UpdateSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.sampleresourceId === null || requestParameters.sampleresourceId === undefined) {
+            throw new runtime.RequiredError('sampleresourceId','Required parameter requestParameters.sampleresourceId was null or undefined when calling updateSampleResource.');
+        }
+
+        if (requestParameters.sampleResource === null || requestParameters.sampleResource === undefined) {
+            throw new runtime.RequiredError('sampleResource','Required parameter requestParameters.sampleResource was null or undefined when calling updateSampleResource.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters.sampleresourceId))),
+            method: 'PUT',
+            headers: headerParameters,
+            query: queryParameters,
+            body: SampleResourceToJSON(requestParameters.sampleResource),
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Updates an existing `SampleResource`.
+     * Update a SampleResource
+     */
+    async updateSampleResource(requestParameters: UpdateSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.updateSampleResourceRaw(requestParameters, initOverrides);
+    }
+
+}
diff --git a/applications/samples/frontend/src/rest/apis/TestApi.ts b/applications/samples/frontend/src/rest/apis/TestApi.ts
new file mode 100644
index 00000000..38f6b820
--- /dev/null
+++ b/applications/samples/frontend/src/rest/apis/TestApi.ts
@@ -0,0 +1,85 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+
+/**
+ * 
+ */
+export class TestApi extends runtime.BaseAPI {
+
+    /**
+     * test sentry is working
+     * @deprecated
+     */
+    async errorRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/error`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<string>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
+    }
+
+    /**
+     * test sentry is working
+     * @deprecated
+     */
+    async error(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<string> {
+        const response = await this.errorRaw(initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * test the application is up
+     */
+    async pingRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<number>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/ping`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<number>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
+    }
+
+    /**
+     * test the application is up
+     */
+    async ping(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<number> {
+        const response = await this.pingRaw(initOverrides);
+        return await response.value();
+    }
+
+}
diff --git a/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts b/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts
new file mode 100644
index 00000000..5294d5cf
--- /dev/null
+++ b/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts
@@ -0,0 +1,137 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import type {
+  InlineResponse202,
+} from '../models/index';
+import {
+    InlineResponse202FromJSON,
+    InlineResponse202ToJSON,
+} from '../models/index';
+
+export interface SubmitSyncWithResultsRequest {
+    a: number;
+    b: number;
+}
+
+/**
+ * 
+ */
+export class WorkflowsApi extends runtime.BaseAPI {
+
+    /**
+     * Send an asynchronous operation
+     */
+    async submitAsyncRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<InlineResponse202>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/operation_async`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => InlineResponse202FromJSON(jsonValue));
+    }
+
+    /**
+     * Send an asynchronous operation
+     */
+    async submitAsync(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<InlineResponse202> {
+        const response = await this.submitAsyncRaw(initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Send a synchronous operation
+     * @deprecated
+     */
+    async submitSyncRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<object>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/operation_sync`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse<any>(response);
+    }
+
+    /**
+     * Send a synchronous operation
+     * @deprecated
+     */
+    async submitSync(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<object> {
+        const response = await this.submitSyncRaw(initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+     * @deprecated
+     */
+    async submitSyncWithResultsRaw(requestParameters: SubmitSyncWithResultsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
+        if (requestParameters.a === null || requestParameters.a === undefined) {
+            throw new runtime.RequiredError('a','Required parameter requestParameters.a was null or undefined when calling submitSyncWithResults.');
+        }
+
+        if (requestParameters.b === null || requestParameters.b === undefined) {
+            throw new runtime.RequiredError('b','Required parameter requestParameters.b was null or undefined when calling submitSyncWithResults.');
+        }
+
+        const queryParameters: any = {};
+
+        if (requestParameters.a !== undefined) {
+            queryParameters['a'] = requestParameters.a;
+        }
+
+        if (requestParameters.b !== undefined) {
+            queryParameters['b'] = requestParameters.b;
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/operation_sync_results`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        if (this.isJsonMime(response.headers.get('content-type'))) {
+            return new runtime.JSONApiResponse<string>(response);
+        } else {
+            return new runtime.TextApiResponse(response) as any;
+        }
+    }
+
+    /**
+     * Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+     * @deprecated
+     */
+    async submitSyncWithResults(requestParameters: SubmitSyncWithResultsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<string> {
+        const response = await this.submitSyncWithResultsRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+}
diff --git a/applications/samples/frontend/src/rest/apis/index.ts b/applications/samples/frontend/src/rest/apis/index.ts
new file mode 100644
index 00000000..c90e98f7
--- /dev/null
+++ b/applications/samples/frontend/src/rest/apis/index.ts
@@ -0,0 +1,6 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './AuthApi';
+export * from './ResourceApi';
+export * from './TestApi';
+export * from './WorkflowsApi';
diff --git a/applications/samples/frontend/src/rest/base.ts b/applications/samples/frontend/src/rest/base.ts
deleted file mode 100644
index 303664f3..00000000
--- a/applications/samples/frontend/src/rest/base.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * CloudHarness Sample API
- * CloudHarness Sample api
- *
- * The version of the OpenAPI document: 0.1.0
- * Contact: cloudharness@metacell.us
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-import type { Configuration } from './configuration';
-// Some imports not used depending on template conditions
-// @ts-ignore
-import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
-import globalAxios from 'axios';
-
-export const BASE_PATH = "/api".replace(/\/+$/, "");
-
-/**
- *
- * @export
- */
-export const COLLECTION_FORMATS = {
-    csv: ",",
-    ssv: " ",
-    tsv: "\t",
-    pipes: "|",
-};
-
-/**
- *
- * @export
- * @interface RequestArgs
- */
-export interface RequestArgs {
-    url: string;
-    options: RawAxiosRequestConfig;
-}
-
-/**
- *
- * @export
- * @class BaseAPI
- */
-export class BaseAPI {
-    protected configuration: Configuration | undefined;
-
-    constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
-        if (configuration) {
-            this.configuration = configuration;
-            this.basePath = configuration.basePath ?? basePath;
-        }
-    }
-};
-
-/**
- *
- * @export
- * @class RequiredError
- * @extends {Error}
- */
-export class RequiredError extends Error {
-    constructor(public field: string, msg?: string) {
-        super(msg);
-        this.name = "RequiredError"
-    }
-}
-
-interface ServerMap {
-    [key: string]: {
-        url: string,
-        description: string,
-    }[];
-}
-
-/**
- *
- * @export
- */
-export const operationServerMap: ServerMap = {
-}
diff --git a/applications/samples/frontend/src/rest/common.ts b/applications/samples/frontend/src/rest/common.ts
deleted file mode 100644
index 8fd2234c..00000000
--- a/applications/samples/frontend/src/rest/common.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * CloudHarness Sample API
- * CloudHarness Sample api
- *
- * The version of the OpenAPI document: 0.1.0
- * Contact: cloudharness@metacell.us
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-import type { Configuration } from "./configuration";
-import type { RequestArgs } from "./base";
-import type { AxiosInstance, AxiosResponse } from 'axios';
-import { RequiredError } from "./base";
-
-/**
- *
- * @export
- */
-export const DUMMY_BASE_URL = 'https://example.com'
-
-/**
- *
- * @throws {RequiredError}
- * @export
- */
-export const assertParamExists = function (functionName: string, paramName: string, paramValue: unknown) {
-    if (paramValue === null || paramValue === undefined) {
-        throw new RequiredError(paramName, `Required parameter ${paramName} was null or undefined when calling ${functionName}.`);
-    }
-}
-
-/**
- *
- * @export
- */
-export const setApiKeyToObject = async function (object: any, keyParamName: string, configuration?: Configuration) {
-    if (configuration && configuration.apiKey) {
-        const localVarApiKeyValue = typeof configuration.apiKey === 'function'
-            ? await configuration.apiKey(keyParamName)
-            : await configuration.apiKey;
-        object[keyParamName] = localVarApiKeyValue;
-    }
-}
-
-/**
- *
- * @export
- */
-export const setBasicAuthToObject = function (object: any, configuration?: Configuration) {
-    if (configuration && (configuration.username || configuration.password)) {
-        object["auth"] = { username: configuration.username, password: configuration.password };
-    }
-}
-
-/**
- *
- * @export
- */
-export const setBearerAuthToObject = async function (object: any, configuration?: Configuration) {
-    if (configuration && configuration.accessToken) {
-        const accessToken = typeof configuration.accessToken === 'function'
-            ? await configuration.accessToken()
-            : await configuration.accessToken;
-        object["Authorization"] = "Bearer " + accessToken;
-    }
-}
-
-/**
- *
- * @export
- */
-export const setOAuthToObject = async function (object: any, name: string, scopes: string[], configuration?: Configuration) {
-    if (configuration && configuration.accessToken) {
-        const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-            ? await configuration.accessToken(name, scopes)
-            : await configuration.accessToken;
-        object["Authorization"] = "Bearer " + localVarAccessTokenValue;
-    }
-}
-
-function setFlattenedQueryParams(urlSearchParams: URLSearchParams, parameter: any, key: string = ""): void {
-    if (parameter == null) return;
-    if (typeof parameter === "object") {
-        if (Array.isArray(parameter)) {
-            (parameter as any[]).forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
-        } 
-        else {
-            Object.keys(parameter).forEach(currentKey => 
-                setFlattenedQueryParams(urlSearchParams, parameter[currentKey], `${key}${key !== '' ? '.' : ''}${currentKey}`)
-            );
-        }
-    } 
-    else {
-        if (urlSearchParams.has(key)) {
-            urlSearchParams.append(key, parameter);
-        } 
-        else {
-            urlSearchParams.set(key, parameter);
-        }
-    }
-}
-
-/**
- *
- * @export
- */
-export const setSearchParams = function (url: URL, ...objects: any[]) {
-    const searchParams = new URLSearchParams(url.search);
-    setFlattenedQueryParams(searchParams, objects);
-    url.search = searchParams.toString();
-}
-
-/**
- *
- * @export
- */
-export const serializeDataIfNeeded = function (value: any, requestOptions: any, configuration?: Configuration) {
-    const nonString = typeof value !== 'string';
-    const needsSerialization = nonString && configuration && configuration.isJsonMime
-        ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
-        : nonString;
-    return needsSerialization
-        ? JSON.stringify(value !== undefined ? value : {})
-        : (value || "");
-}
-
-/**
- *
- * @export
- */
-export const toPathString = function (url: URL) {
-    return url.pathname + url.search + url.hash
-}
-
-/**
- *
- * @export
- */
-export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
-    return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-        const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
-        return axios.request<T, R>(axiosRequestArgs);
-    };
-}
diff --git a/applications/samples/frontend/src/rest/configuration.ts b/applications/samples/frontend/src/rest/configuration.ts
deleted file mode 100644
index 6f3aede4..00000000
--- a/applications/samples/frontend/src/rest/configuration.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * CloudHarness Sample API
- * CloudHarness Sample api
- *
- * The version of the OpenAPI document: 0.1.0
- * Contact: cloudharness@metacell.us
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-export interface ConfigurationParameters {
-    apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
-    username?: string;
-    password?: string;
-    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
-    basePath?: string;
-    serverIndex?: number;
-    baseOptions?: any;
-    formDataCtor?: new () => any;
-}
-
-export class Configuration {
-    /**
-     * parameter for apiKey security
-     * @param name security name
-     * @memberof Configuration
-     */
-    apiKey?: string | Promise<string> | ((name: string) => string) | ((name: string) => Promise<string>);
-    /**
-     * parameter for basic security
-     *
-     * @type {string}
-     * @memberof Configuration
-     */
-    username?: string;
-    /**
-     * parameter for basic security
-     *
-     * @type {string}
-     * @memberof Configuration
-     */
-    password?: string;
-    /**
-     * parameter for oauth2 security
-     * @param name security name
-     * @param scopes oauth2 scope
-     * @memberof Configuration
-     */
-    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
-    /**
-     * override base path
-     *
-     * @type {string}
-     * @memberof Configuration
-     */
-    basePath?: string;
-    /**
-     * override server index
-     *
-     * @type {number}
-     * @memberof Configuration
-     */
-    serverIndex?: number;
-    /**
-     * base options for axios calls
-     *
-     * @type {any}
-     * @memberof Configuration
-     */
-    baseOptions?: any;
-    /**
-     * The FormData constructor that will be used to create multipart form data
-     * requests. You can inject this here so that execution environments that
-     * do not support the FormData class can still run the generated client.
-     *
-     * @type {new () => FormData}
-     */
-    formDataCtor?: new () => any;
-
-    constructor(param: ConfigurationParameters = {}) {
-        this.apiKey = param.apiKey;
-        this.username = param.username;
-        this.password = param.password;
-        this.accessToken = param.accessToken;
-        this.basePath = param.basePath;
-        this.serverIndex = param.serverIndex;
-        this.baseOptions = param.baseOptions;
-        this.formDataCtor = param.formDataCtor;
-    }
-
-    /**
-     * Check if the given MIME is a JSON MIME.
-     * JSON MIME examples:
-     *   application/json
-     *   application/json; charset=UTF8
-     *   APPLICATION/JSON
-     *   application/vnd.company+json
-     * @param mime - MIME (Multipurpose Internet Mail Extensions)
-     * @return True if the given MIME is JSON, false otherwise.
-     */
-    public isJsonMime(mime: string): boolean {
-        const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
-        return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
-    }
-}
diff --git a/applications/samples/frontend/src/rest/git_push.sh b/applications/samples/frontend/src/rest/git_push.sh
deleted file mode 100644
index f53a75d4..00000000
--- a/applications/samples/frontend/src/rest/git_push.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
-#
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
-
-git_user_id=$1
-git_repo_id=$2
-release_note=$3
-git_host=$4
-
-if [ "$git_host" = "" ]; then
-    git_host="github.com"
-    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
-fi
-
-if [ "$git_user_id" = "" ]; then
-    git_user_id="GIT_USER_ID"
-    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
-fi
-
-if [ "$git_repo_id" = "" ]; then
-    git_repo_id="GIT_REPO_ID"
-    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
-fi
-
-if [ "$release_note" = "" ]; then
-    release_note="Minor update"
-    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
-fi
-
-# Initialize the local directory as a Git repository
-git init
-
-# Adds the files in the local repository and stages them for commit.
-git add .
-
-# Commits the tracked changes and prepares them to be pushed to a remote repository.
-git commit -m "$release_note"
-
-# Sets the new remote
-git_remote=$(git remote)
-if [ "$git_remote" = "" ]; then # git remote not defined
-
-    if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
-    else
-        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
-    fi
-
-fi
-
-git pull origin master
-
-# Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
-git push origin master 2>&1 | grep -v 'To https'
diff --git a/applications/samples/frontend/src/rest/index.ts b/applications/samples/frontend/src/rest/index.ts
index ecc565f6..bebe8bbb 100644
--- a/applications/samples/frontend/src/rest/index.ts
+++ b/applications/samples/frontend/src/rest/index.ts
@@ -1,18 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * CloudHarness Sample API
- * CloudHarness Sample api
- *
- * The version of the OpenAPI document: 0.1.0
- * Contact: cloudharness@metacell.us
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-export * from "./api";
-export * from "./configuration";
-
+export * from './runtime';
+export * from './apis/index';
+export * from './models/index';
diff --git a/applications/samples/frontend/src/rest/models/InlineResponse202.ts b/applications/samples/frontend/src/rest/models/InlineResponse202.ts
new file mode 100644
index 00000000..6703a8e7
--- /dev/null
+++ b/applications/samples/frontend/src/rest/models/InlineResponse202.ts
@@ -0,0 +1,72 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import type { InlineResponse202Task } from './InlineResponse202Task';
+import {
+    InlineResponse202TaskFromJSON,
+    InlineResponse202TaskFromJSONTyped,
+    InlineResponse202TaskToJSON,
+} from './InlineResponse202Task';
+
+/**
+ * 
+ * @export
+ * @interface InlineResponse202
+ */
+export interface InlineResponse202 {
+    /**
+     * 
+     * @type {InlineResponse202Task}
+     * @memberof InlineResponse202
+     */
+    task?: InlineResponse202Task;
+}
+
+/**
+ * Check if a given object implements the InlineResponse202 interface.
+ */
+export function instanceOfInlineResponse202(value: object): boolean {
+    let isInstance = true;
+
+    return isInstance;
+}
+
+export function InlineResponse202FromJSON(json: any): InlineResponse202 {
+    return InlineResponse202FromJSONTyped(json, false);
+}
+
+export function InlineResponse202FromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineResponse202 {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'task': !exists(json, 'task') ? undefined : InlineResponse202TaskFromJSON(json['task']),
+    };
+}
+
+export function InlineResponse202ToJSON(value?: InlineResponse202 | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'task': InlineResponse202TaskToJSON(value.task),
+    };
+}
+
diff --git a/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts b/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts
new file mode 100644
index 00000000..b35eab4d
--- /dev/null
+++ b/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts
@@ -0,0 +1,73 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface InlineResponse202Task
+ */
+export interface InlineResponse202Task {
+    /**
+     * the url where to check the operation status
+     * @type {string}
+     * @memberof InlineResponse202Task
+     */
+    href?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof InlineResponse202Task
+     */
+    name?: string;
+}
+
+/**
+ * Check if a given object implements the InlineResponse202Task interface.
+ */
+export function instanceOfInlineResponse202Task(value: object): boolean {
+    let isInstance = true;
+
+    return isInstance;
+}
+
+export function InlineResponse202TaskFromJSON(json: any): InlineResponse202Task {
+    return InlineResponse202TaskFromJSONTyped(json, false);
+}
+
+export function InlineResponse202TaskFromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineResponse202Task {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'href': !exists(json, 'href') ? undefined : json['href'],
+        'name': !exists(json, 'name') ? undefined : json['name'],
+    };
+}
+
+export function InlineResponse202TaskToJSON(value?: InlineResponse202Task | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'href': value.href,
+        'name': value.name,
+    };
+}
+
diff --git a/applications/samples/frontend/src/rest/models/SampleResource.ts b/applications/samples/frontend/src/rest/models/SampleResource.ts
new file mode 100644
index 00000000..b6da584d
--- /dev/null
+++ b/applications/samples/frontend/src/rest/models/SampleResource.ts
@@ -0,0 +1,82 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface SampleResource
+ */
+export interface SampleResource {
+    /**
+     * 
+     * @type {number}
+     * @memberof SampleResource
+     */
+    a: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof SampleResource
+     */
+    b?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof SampleResource
+     */
+    id?: number;
+}
+
+/**
+ * Check if a given object implements the SampleResource interface.
+ */
+export function instanceOfSampleResource(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "a" in value;
+
+    return isInstance;
+}
+
+export function SampleResourceFromJSON(json: any): SampleResource {
+    return SampleResourceFromJSONTyped(json, false);
+}
+
+export function SampleResourceFromJSONTyped(json: any, ignoreDiscriminator: boolean): SampleResource {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'a': json['a'],
+        'b': !exists(json, 'b') ? undefined : json['b'],
+        'id': !exists(json, 'id') ? undefined : json['id'],
+    };
+}
+
+export function SampleResourceToJSON(value?: SampleResource | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'a': value.a,
+        'b': value.b,
+        'id': value.id,
+    };
+}
+
diff --git a/applications/samples/frontend/src/rest/models/index.ts b/applications/samples/frontend/src/rest/models/index.ts
new file mode 100644
index 00000000..63b4e5e4
--- /dev/null
+++ b/applications/samples/frontend/src/rest/models/index.ts
@@ -0,0 +1,5 @@
+/* tslint:disable */
+/* eslint-disable */
+export * from './InlineResponse202';
+export * from './InlineResponse202Task';
+export * from './SampleResource';
diff --git a/applications/samples/frontend/src/rest/runtime.ts b/applications/samples/frontend/src/rest/runtime.ts
new file mode 100644
index 00000000..8544aaca
--- /dev/null
+++ b/applications/samples/frontend/src/rest/runtime.ts
@@ -0,0 +1,431 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * CloudHarness Sample API
+ * CloudHarness Sample api
+ *
+ * The version of the OpenAPI document: 0.1.0
+ * Contact: cloudharness@metacell.us
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export const BASE_PATH = "/api".replace(/\/+$/, "");
+
+export interface ConfigurationParameters {
+    basePath?: string; // override base path
+    fetchApi?: FetchAPI; // override for fetch implementation
+    middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
+    username?: string; // parameter for basic security
+    password?: string; // parameter for basic security
+    apiKey?: string | ((name: string) => string); // parameter for apiKey security
+    accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security
+    headers?: HTTPHeaders; //header params we want to use on every request
+    credentials?: RequestCredentials; //value for the credentials param we want to use on each request
+}
+
+export class Configuration {
+    constructor(private configuration: ConfigurationParameters = {}) {}
+
+    set config(configuration: Configuration) {
+        this.configuration = configuration;
+    }
+
+    get basePath(): string {
+        return this.configuration.basePath != null ? this.configuration.basePath : BASE_PATH;
+    }
+
+    get fetchApi(): FetchAPI | undefined {
+        return this.configuration.fetchApi;
+    }
+
+    get middleware(): Middleware[] {
+        return this.configuration.middleware || [];
+    }
+
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
+    get username(): string | undefined {
+        return this.configuration.username;
+    }
+
+    get password(): string | undefined {
+        return this.configuration.password;
+    }
+
+    get apiKey(): ((name: string) => string) | undefined {
+        const apiKey = this.configuration.apiKey;
+        if (apiKey) {
+            return typeof apiKey === 'function' ? apiKey : () => apiKey;
+        }
+        return undefined;
+    }
+
+    get accessToken(): ((name?: string, scopes?: string[]) => string | Promise<string>) | undefined {
+        const accessToken = this.configuration.accessToken;
+        if (accessToken) {
+            return typeof accessToken === 'function' ? accessToken : async () => accessToken;
+        }
+        return undefined;
+    }
+
+    get headers(): HTTPHeaders | undefined {
+        return this.configuration.headers;
+    }
+
+    get credentials(): RequestCredentials | undefined {
+        return this.configuration.credentials;
+    }
+}
+
+export const DefaultConfig = new Configuration();
+
+/**
+ * This is the base class for all generated API classes.
+ */
+export class BaseAPI {
+
+    private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i');
+    private middleware: Middleware[];
+
+    constructor(protected configuration = DefaultConfig) {
+        this.middleware = configuration.middleware;
+    }
+
+    withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
+        const next = this.clone<T>();
+        next.middleware = next.middleware.concat(...middlewares);
+        return next;
+    }
+
+    withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) {
+        const middlewares = preMiddlewares.map((pre) => ({ pre }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) {
+        const middlewares = postMiddlewares.map((post) => ({ post }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    /**
+     * Check if the given MIME is a JSON MIME.
+     * JSON MIME examples:
+     *   application/json
+     *   application/json; charset=UTF8
+     *   APPLICATION/JSON
+     *   application/vnd.company+json
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
+     */
+    protected isJsonMime(mime: string | null | undefined): boolean {
+        if (!mime) {
+            return false;
+        }
+        return BaseAPI.jsonRegex.test(mime);
+    }
+
+    protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
+        const { url, init } = await this.createFetchParams(context, initOverrides);
+        const response = await this.fetchApi(url, init);
+        if (response && (response.status >= 200 && response.status < 300)) {
+            return response;
+        }
+        throw new ResponseError(response, 'Response returned an error code');
+    }
+
+    private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
+        let url = this.configuration.basePath + context.path;
+        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+            // only add the querystring to the URL if there are query parameters.
+            // this is done to avoid urls ending with a "?" character which buggy webservers
+            // do not handle correctly sometimes.
+            url += '?' + this.configuration.queryParamsStringify(context.query);
+        }
+
+        const headers = Object.assign({}, this.configuration.headers, context.headers);
+        Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {});
+
+        const initOverrideFn =
+            typeof initOverrides === "function"
+                ? initOverrides
+                : async () => initOverrides;
+
+        const initParams = {
+            method: context.method,
+            headers,
+            body: context.body,
+            credentials: this.configuration.credentials,
+        };
+
+        const overriddenInit: RequestInit = {
+            ...initParams,
+            ...(await initOverrideFn({
+                init: initParams,
+                context,
+            }))
+        };
+
+        let body: any;
+        if (isFormData(overriddenInit.body)
+            || (overriddenInit.body instanceof URLSearchParams)
+            || isBlob(overriddenInit.body)) {
+          body = overriddenInit.body;
+        } else if (this.isJsonMime(headers['Content-Type'])) {
+          body = JSON.stringify(overriddenInit.body);
+        } else {
+          body = overriddenInit.body;
+        }
+
+        const init: RequestInit = {
+            ...overriddenInit,
+            body
+        };
+
+        return { url, init };
+    }
+
+    private fetchApi = async (url: string, init: RequestInit) => {
+        let fetchParams = { url, init };
+        for (const middleware of this.middleware) {
+            if (middleware.pre) {
+                fetchParams = await middleware.pre({
+                    fetch: this.fetchApi,
+                    ...fetchParams,
+                }) || fetchParams;
+            }
+        }
+        let response: Response | undefined = undefined;
+        try {
+            response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
+        } catch (e) {
+            for (const middleware of this.middleware) {
+                if (middleware.onError) {
+                    response = await middleware.onError({
+                        fetch: this.fetchApi,
+                        url: fetchParams.url,
+                        init: fetchParams.init,
+                        error: e,
+                        response: response ? response.clone() : undefined,
+                    }) || response;
+                }
+            }
+            if (response === undefined) {
+              if (e instanceof Error) {
+                throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
+              } else {
+                throw e;
+              }
+            }
+        }
+        for (const middleware of this.middleware) {
+            if (middleware.post) {
+                response = await middleware.post({
+                    fetch: this.fetchApi,
+                    url: fetchParams.url,
+                    init: fetchParams.init,
+                    response: response.clone(),
+                }) || response;
+            }
+        }
+        return response;
+    }
+
+    /**
+     * Create a shallow clone of `this` by constructing a new instance
+     * and then shallow cloning data members.
+     */
+    private clone<T extends BaseAPI>(this: T): T {
+        const constructor = this.constructor as any;
+        const next = new constructor(this.configuration);
+        next.middleware = this.middleware.slice();
+        return next;
+    }
+};
+
+function isBlob(value: any): value is Blob {
+    return typeof Blob !== 'undefined' && value instanceof Blob;
+}
+
+function isFormData(value: any): value is FormData {
+    return typeof FormData !== "undefined" && value instanceof FormData;
+}
+
+export class ResponseError extends Error {
+    override name: "ResponseError" = "ResponseError";
+    constructor(public response: Response, msg?: string) {
+        super(msg);
+    }
+}
+
+export class FetchError extends Error {
+    override name: "FetchError" = "FetchError";
+    constructor(public cause: Error, msg?: string) {
+        super(msg);
+    }
+}
+
+export class RequiredError extends Error {
+    override name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
+
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+export type FetchAPI = WindowOrWorkerGlobalScope['fetch'];
+
+export type Json = any;
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
+export type HTTPHeaders = { [key: string]: string };
+export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery };
+export type HTTPBody = Json | FormData | URLSearchParams;
+export type HTTPRequestInit = { headers?: HTTPHeaders; method: HTTPMethod; credentials?: RequestCredentials; body?: HTTPBody };
+export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
+
+export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
+
+export interface FetchParams {
+    url: string;
+    init: RequestInit;
+}
+
+export interface RequestOpts {
+    path: string;
+    method: HTTPMethod;
+    headers: HTTPHeaders;
+    query?: HTTPQuery;
+    body?: HTTPBody;
+}
+
+export function exists(json: any, key: string) {
+    const value = json[key];
+    return value !== null && value !== undefined;
+}
+
+export function querystring(params: HTTPQuery, prefix: string = ''): string {
+    return Object.keys(params)
+        .map(key => querystringSingleKey(key, params[key], prefix))
+        .filter(part => part.length > 0)
+        .join('&');
+}
+
+function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
+    const fullKey = keyPrefix + (keyPrefix.length ? `[${key}]` : key);
+    if (value instanceof Array) {
+        const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
+            .join(`&${encodeURIComponent(fullKey)}=`);
+        return `${encodeURIComponent(fullKey)}=${multiValue}`;
+    }
+    if (value instanceof Set) {
+        const valueAsArray = Array.from(value);
+        return querystringSingleKey(key, valueAsArray, keyPrefix);
+    }
+    if (value instanceof Date) {
+        return `${encodeURIComponent(fullKey)}=${encodeURIComponent(value.toISOString())}`;
+    }
+    if (value instanceof Object) {
+        return querystring(value as HTTPQuery, fullKey);
+    }
+    return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`;
+}
+
+export function mapValues(data: any, fn: (item: any) => any) {
+  return Object.keys(data).reduce(
+    (acc, key) => ({ ...acc, [key]: fn(data[key]) }),
+    {}
+  );
+}
+
+export function canConsumeForm(consumes: Consume[]): boolean {
+    for (const consume of consumes) {
+        if ('multipart/form-data' === consume.contentType) {
+            return true;
+        }
+    }
+    return false;
+}
+
+export interface Consume {
+    contentType: string;
+}
+
+export interface RequestContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+}
+
+export interface ResponseContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    response: Response;
+}
+
+export interface ErrorContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    error: unknown;
+    response?: Response;
+}
+
+export interface Middleware {
+    pre?(context: RequestContext): Promise<FetchParams | void>;
+    post?(context: ResponseContext): Promise<Response | void>;
+    onError?(context: ErrorContext): Promise<Response | void>;
+}
+
+export interface ApiResponse<T> {
+    raw: Response;
+    value(): Promise<T>;
+}
+
+export interface ResponseTransformer<T> {
+    (json: any): T;
+}
+
+export class JSONApiResponse<T> {
+    constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) {}
+
+    async value(): Promise<T> {
+        return this.transformer(await this.raw.json());
+    }
+}
+
+export class VoidApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<void> {
+        return undefined;
+    }
+}
+
+export class BlobApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<Blob> {
+        return await this.raw.blob();
+    };
+}
+
+export class TextApiResponse {
+    constructor(public raw: Response) {}
+
+    async value(): Promise<string> {
+        return await this.raw.text();
+    };
+}
diff --git a/applications/samples/frontend/vite.config.ts b/applications/samples/frontend/vite.config.ts
index 71663236..15155d73 100644
--- a/applications/samples/frontend/vite.config.ts
+++ b/applications/samples/frontend/vite.config.ts
@@ -14,7 +14,11 @@ export default defineConfig(({ mode }) => {
   console.log('Dev server address: ', theDomain);
 
   const proxyTarget = theDomain;
-  const replaceHost = (uri: string, appName: string) => (uri.includes("samples") && uri.replace("samples", appName + '.' + theDomain)) || uri;
+  const replaceHost = (uri: string, appName: string) => {
+    const host = (uri.includes("samples.") && uri.replace("samples.", appName + '.')) || uri;
+    console.log('Proxy target: ', host);
+    return host;
+  }
 
 
   return {
@@ -26,6 +30,12 @@ export default defineConfig(({ mode }) => {
         target: replaceHost( proxyTarget, 'samples'),
         secure: false,
         changeOrigin: true,
+      },
+      '/proxy/common/api': {
+        target: replaceHost( proxyTarget, 'common'),
+        secure: false,
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
       }
   }
 }}}
diff --git a/libraries/client/cloudharness_cli/README.md b/libraries/client/cloudharness_cli/README.md
deleted file mode 100644
index 8683f69b..00000000
--- a/libraries/client/cloudharness_cli/README.md
+++ /dev/null
@@ -1,869 +0,0 @@
-# cloudharness-cli.common
-Cloud Harness Platform - Reference CH service API
-
-This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 0.1.0
-- Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonClientCodegen
-
-## Requirements.
-
-Python &gt;&#x3D;3.7
-
-## Migration from other generators like python and python-legacy
-
-### Changes
-1. This generator uses spec case for all (object) property names and parameter names.
-    - So if the spec has a property name like camelCase, it will use camelCase rather than camel_case
-    - So you will need to update how you input and read properties to use spec case
-2. Endpoint parameters are stored in dictionaries to prevent collisions (explanation below)
-    - So you will need to update how you pass data in to endpoints
-3. Endpoint responses now include the original response, the deserialized response body, and (todo)the deserialized headers
-    - So you will need to update your code to use response.body to access deserialized data
-4. All validated data is instantiated in an instance that subclasses all validated Schema classes and Decimal/str/list/tuple/frozendict/NoneClass/BoolClass/bytes/io.FileIO
-    - This means that you can use isinstance to check if a payload validated against a schema class
-    - This means that no data will be of type None/True/False
-        - ingested None will subclass NoneClass
-        - ingested True will subclass BoolClass
-        - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
-5. All validated class instances are immutable except for ones based on io.File
-    - This is because if properties were changed after validation, that validation would no longer apply
-    - So no changing values or property values after a class has been instantiated
-6. String + Number types with formats
-    - String type data is stored as a string and if you need to access types based on its format like date,
-    date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
-    - this was done because openapi/json-schema defines constraints. string data may be type string with no format
-    keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. Property access on AnyType(type unset) or object(dict) schemas
-    - Only required keys with valid python names are properties like .someProp and have type hints
-    - All optional keys may not exist, so properties are not defined for them
-    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
-        - All required and optional keys have type hints for this method, and @typing.overload is used
-        - A type hint is also generated for additionalProperties accessed using this method
-    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
-    and additionalProperty values
-8. The location of the api classes has changed
-    - Api classes are located in your_package.apis.tags.some_api
-    - This change was made to eliminate redundant code generation
-    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
-    - This generator defines an endpoint in one class, then inherits that class to generate
-      apis by tags and by paths
-    - This change reduces code and allows quicker run time if you use the path apis
-        - path apis are at your_package.apis.paths.some_path
-    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
-    - So you will need to update your import paths to the api classes
-
-### Why are Oapg and _oapg used in class and method names?
-Classes can have arbitrarily named properties set on them
-Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
-on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
-
-### Object property spec case
-This was done because when payloads are ingested, they can be validated against N number of schemas.
-If the input signature used a different property name then that has mutated the payload.
-So SchemaA and SchemaB must both see the camelCase spec named variable.
-Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
-
-### Parameter spec case
-Parameters can be included in different locations including:
-- query
-- path
-- header
-- cookie
-
-Any of those parameters could use the same parameter names, so if every parameter
-was included as an endpoint parameter in a function signature, they would collide.
-For that reason, each of those inputs have been separated out into separate typed dictionaries:
-- query_params
-- path_params
-- header_params
-- cookie_params
-
-So when updating your code, you will need to pass endpoint parameters in using those
-dictionaries.
-
-### Endpoint responses
-Endpoint responses have been enriched to now include more information.
-Any response reom an endpoint will now include the following properties:
-response: urllib3.HTTPResponse
-body: typing.Union[Unset, Schema]
-headers: typing.Union[Unset, TODO]
-Note: response header deserialization has not yet been added
-
-
-## Installation & Usage
-### pip install
-
-If the python package is hosted on a repository, you can install directly using:
-
-```sh
-pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
-```
-(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
-
-Then import the package:
-```python
-import cloudharness_cli.common
-```
-
-### Setuptools
-
-Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
-
-```sh
-python setup.py install --user
-```
-(or `sudo python setup.py install` to install the package for all users)
-
-Then import the package:
-```python
-import cloudharness_cli.common
-```
-
-## Getting Started
-
-Please follow the [installation procedure](#installation--usage) and then run the following:
-
-```python
-
-import time
-import cloudharness_cli.common
-from pprint import pprint
-from cloudharness_cli.common.apis.tags import accounts_api
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.common.Configuration(
-    host = "/api"
-)
-
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.common.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = accounts_api.AccountsApi(api_client)
-    
-    try:
-        # Gets the config for logging in into accounts
-        api_response = api_instance.get_config()
-        pprint(api_response)
-    except cloudharness_cli.common.ApiException as e:
-        print("Exception when calling AccountsApi->get_config: %s\n" % e)
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to */api*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AccountsApi* | [**get_config**](docs/common/apis/tags/AccountsApi.md#get_config) | **get** /accounts/config | Gets the config for logging in into accounts
-*SentryApi* | [**getdsn**](docs/common/apis/tags/SentryApi.md#getdsn) | **get** /sentry/getdsn/{appname} | Gets the Sentry DSN for a given application
-
-## Documentation For Models
-
-
-## Documentation For Authorization
-
- All endpoints do not require authorization.
-
-## Author
-
-
-
-
-## Notes for Large OpenAPI documents
-If the OpenAPI document is large, imports in cloudharness_cli.common.apis and cloudharness_cli.common.models may fail with a
-RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
-
-Solution 1:
-Use specific imports for apis and models like:
-- `from cloudharness_cli.common.apis.default_api import DefaultApi`
-- `from cloudharness_cli.common.model.pet import Pet`
-
-Solution 1:
-Before importing the package, adjust the maximum recursion limit as shown below:
-```
-import sys
-sys.setrecursionlimit(1500)
-import cloudharness_cli.common
-from cloudharness_cli.common.apis import *
-from cloudharness_cli.common.models import *
-```
-# cloudharness-cli.volumemanager
-CloudHarness Volumes manager API
-
-This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 0.1.0
-- Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonClientCodegen
-
-## Requirements.
-
-Python &gt;&#x3D;3.7
-
-## Migration from other generators like python and python-legacy
-
-### Changes
-1. This generator uses spec case for all (object) property names and parameter names.
-    - So if the spec has a property name like camelCase, it will use camelCase rather than camel_case
-    - So you will need to update how you input and read properties to use spec case
-2. Endpoint parameters are stored in dictionaries to prevent collisions (explanation below)
-    - So you will need to update how you pass data in to endpoints
-3. Endpoint responses now include the original response, the deserialized response body, and (todo)the deserialized headers
-    - So you will need to update your code to use response.body to access deserialized data
-4. All validated data is instantiated in an instance that subclasses all validated Schema classes and Decimal/str/list/tuple/frozendict/NoneClass/BoolClass/bytes/io.FileIO
-    - This means that you can use isinstance to check if a payload validated against a schema class
-    - This means that no data will be of type None/True/False
-        - ingested None will subclass NoneClass
-        - ingested True will subclass BoolClass
-        - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
-5. All validated class instances are immutable except for ones based on io.File
-    - This is because if properties were changed after validation, that validation would no longer apply
-    - So no changing values or property values after a class has been instantiated
-6. String + Number types with formats
-    - String type data is stored as a string and if you need to access types based on its format like date,
-    date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
-    - this was done because openapi/json-schema defines constraints. string data may be type string with no format
-    keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. Property access on AnyType(type unset) or object(dict) schemas
-    - Only required keys with valid python names are properties like .someProp and have type hints
-    - All optional keys may not exist, so properties are not defined for them
-    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
-        - All required and optional keys have type hints for this method, and @typing.overload is used
-        - A type hint is also generated for additionalProperties accessed using this method
-    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
-    and additionalProperty values
-8. The location of the api classes has changed
-    - Api classes are located in your_package.apis.tags.some_api
-    - This change was made to eliminate redundant code generation
-    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
-    - This generator defines an endpoint in one class, then inherits that class to generate
-      apis by tags and by paths
-    - This change reduces code and allows quicker run time if you use the path apis
-        - path apis are at your_package.apis.paths.some_path
-    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
-    - So you will need to update your import paths to the api classes
-
-### Why are Oapg and _oapg used in class and method names?
-Classes can have arbitrarily named properties set on them
-Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
-on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
-
-### Object property spec case
-This was done because when payloads are ingested, they can be validated against N number of schemas.
-If the input signature used a different property name then that has mutated the payload.
-So SchemaA and SchemaB must both see the camelCase spec named variable.
-Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
-
-### Parameter spec case
-Parameters can be included in different locations including:
-- query
-- path
-- header
-- cookie
-
-Any of those parameters could use the same parameter names, so if every parameter
-was included as an endpoint parameter in a function signature, they would collide.
-For that reason, each of those inputs have been separated out into separate typed dictionaries:
-- query_params
-- path_params
-- header_params
-- cookie_params
-
-So when updating your code, you will need to pass endpoint parameters in using those
-dictionaries.
-
-### Endpoint responses
-Endpoint responses have been enriched to now include more information.
-Any response reom an endpoint will now include the following properties:
-response: urllib3.HTTPResponse
-body: typing.Union[Unset, Schema]
-headers: typing.Union[Unset, TODO]
-Note: response header deserialization has not yet been added
-
-
-## Installation & Usage
-### pip install
-
-If the python package is hosted on a repository, you can install directly using:
-
-```sh
-pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
-```
-(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
-
-Then import the package:
-```python
-import cloudharness_cli.volumemanager
-```
-
-### Setuptools
-
-Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
-
-```sh
-python setup.py install --user
-```
-(or `sudo python setup.py install` to install the package for all users)
-
-Then import the package:
-```python
-import cloudharness_cli.volumemanager
-```
-
-## Getting Started
-
-Please follow the [installation procedure](#installation--usage) and then run the following:
-
-```python
-
-import time
-import cloudharness_cli.volumemanager
-from pprint import pprint
-from cloudharness_cli.volumemanager.apis.tags import rest_api
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from cloudharness_cli/volumemanager.model.persistent_volume_claim_create import PersistentVolumeClaimCreate
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.volumemanager.Configuration(
-    host = "/api"
-)
-
-# The client must configure the authentication and authorization parameters
-# in accordance with the API server security policy.
-# Examples for each auth method are provided below, use the example that
-# satisfies your auth use case.
-
-# Configure Bearer authorization (JWT): bearerAuth
-configuration = cloudharness_cli.volumemanager.Configuration(
-    access_token = 'YOUR_BEARER_TOKEN'
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.volumemanager.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = rest_api.RestApi(api_client)
-    name = "name_example" # str | The name of the Persistent Volume Claim to be retrieved
-
-    try:
-        # Retrieve a Persistent Volume Claim from the Kubernetes repository.
-        api_response = api_instance.pvc_name_get(name)
-        pprint(api_response)
-    except cloudharness_cli.volumemanager.ApiException as e:
-        print("Exception when calling RestApi->pvc_name_get: %s\n" % e)
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to */api*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*RestApi* | [**pvc_name_get**](docs/volumemanager/apis/tags/RestApi.md#pvc_name_get) | **get** /pvc/{name} | Retrieve a Persistent Volume Claim from the Kubernetes repository.
-*RestApi* | [**pvc_post**](docs/volumemanager/apis/tags/RestApi.md#pvc_post) | **post** /pvc | Create a Persistent Volume Claim in Kubernetes
-
-## Documentation For Models
-
- - [PersistentVolumeClaim](docs/volumemanager/models/PersistentVolumeClaim.md)
- - [PersistentVolumeClaimCreate](docs/volumemanager/models/PersistentVolumeClaimCreate.md)
-
-## Documentation For Authorization
-
- Authentication schemes defined for the API:
-## bearerAuth
-
-- **Type**: Bearer authentication (JWT)
-
-
-## Author
-
-
-
-## Notes for Large OpenAPI documents
-If the OpenAPI document is large, imports in cloudharness_cli.volumemanager.apis and cloudharness_cli.volumemanager.models may fail with a
-RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
-
-Solution 1:
-Use specific imports for apis and models like:
-- `from cloudharness_cli.volumemanager.apis.default_api import DefaultApi`
-- `from cloudharness_cli.volumemanager.model.pet import Pet`
-
-Solution 1:
-Before importing the package, adjust the maximum recursion limit as shown below:
-```
-import sys
-sys.setrecursionlimit(1500)
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.apis import *
-from cloudharness_cli.volumemanager.models import *
-```
-# cloudharness-cli.workflows
-Workflows API
-
-This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 0.1.0
-- Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonClientCodegen
-
-## Requirements.
-
-Python &gt;&#x3D;3.7
-
-## Migration from other generators like python and python-legacy
-
-### Changes
-1. This generator uses spec case for all (object) property names and parameter names.
-    - So if the spec has a property name like camelCase, it will use camelCase rather than camel_case
-    - So you will need to update how you input and read properties to use spec case
-2. Endpoint parameters are stored in dictionaries to prevent collisions (explanation below)
-    - So you will need to update how you pass data in to endpoints
-3. Endpoint responses now include the original response, the deserialized response body, and (todo)the deserialized headers
-    - So you will need to update your code to use response.body to access deserialized data
-4. All validated data is instantiated in an instance that subclasses all validated Schema classes and Decimal/str/list/tuple/frozendict/NoneClass/BoolClass/bytes/io.FileIO
-    - This means that you can use isinstance to check if a payload validated against a schema class
-    - This means that no data will be of type None/True/False
-        - ingested None will subclass NoneClass
-        - ingested True will subclass BoolClass
-        - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
-5. All validated class instances are immutable except for ones based on io.File
-    - This is because if properties were changed after validation, that validation would no longer apply
-    - So no changing values or property values after a class has been instantiated
-6. String + Number types with formats
-    - String type data is stored as a string and if you need to access types based on its format like date,
-    date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
-    - this was done because openapi/json-schema defines constraints. string data may be type string with no format
-    keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. Property access on AnyType(type unset) or object(dict) schemas
-    - Only required keys with valid python names are properties like .someProp and have type hints
-    - All optional keys may not exist, so properties are not defined for them
-    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
-        - All required and optional keys have type hints for this method, and @typing.overload is used
-        - A type hint is also generated for additionalProperties accessed using this method
-    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
-    and additionalProperty values
-8. The location of the api classes has changed
-    - Api classes are located in your_package.apis.tags.some_api
-    - This change was made to eliminate redundant code generation
-    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
-    - This generator defines an endpoint in one class, then inherits that class to generate
-      apis by tags and by paths
-    - This change reduces code and allows quicker run time if you use the path apis
-        - path apis are at your_package.apis.paths.some_path
-    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
-    - So you will need to update your import paths to the api classes
-
-### Why are Oapg and _oapg used in class and method names?
-Classes can have arbitrarily named properties set on them
-Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
-on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
-
-### Object property spec case
-This was done because when payloads are ingested, they can be validated against N number of schemas.
-If the input signature used a different property name then that has mutated the payload.
-So SchemaA and SchemaB must both see the camelCase spec named variable.
-Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
-
-### Parameter spec case
-Parameters can be included in different locations including:
-- query
-- path
-- header
-- cookie
-
-Any of those parameters could use the same parameter names, so if every parameter
-was included as an endpoint parameter in a function signature, they would collide.
-For that reason, each of those inputs have been separated out into separate typed dictionaries:
-- query_params
-- path_params
-- header_params
-- cookie_params
-
-So when updating your code, you will need to pass endpoint parameters in using those
-dictionaries.
-
-### Endpoint responses
-Endpoint responses have been enriched to now include more information.
-Any response reom an endpoint will now include the following properties:
-response: urllib3.HTTPResponse
-body: typing.Union[Unset, Schema]
-headers: typing.Union[Unset, TODO]
-Note: response header deserialization has not yet been added
-
-
-## Installation & Usage
-### pip install
-
-If the python package is hosted on a repository, you can install directly using:
-
-```sh
-pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
-```
-(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
-
-Then import the package:
-```python
-import cloudharness_cli.workflows
-```
-
-### Setuptools
-
-Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
-
-```sh
-python setup.py install --user
-```
-(or `sudo python setup.py install` to install the package for all users)
-
-Then import the package:
-```python
-import cloudharness_cli.workflows
-```
-
-## Getting Started
-
-Please follow the [installation procedure](#installation--usage) and then run the following:
-
-```python
-
-import time
-import cloudharness_cli.workflows
-from pprint import pprint
-from cloudharness_cli.workflows.apis.tags import create_and_access_api
-from cloudharness_cli/workflows.model.operation import Operation
-from cloudharness_cli/workflows.model.operation_search_result import OperationSearchResult
-from cloudharness_cli/workflows.model.operation_status import OperationStatus
-# Defining the host is optional and defaults to https://workflows.cloudharness.metacell.us/api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.workflows.Configuration(
-    host = "https://workflows.cloudharness.metacell.us/api"
-)
-
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = create_and_access_api.CreateAndAccessApi(api_client)
-    name = "name_example" # str | 
-
-    try:
-        # deletes operation by name
-        api_instance.delete_operation(name)
-    except cloudharness_cli.workflows.ApiException as e:
-        print("Exception when calling CreateAndAccessApi->delete_operation: %s\n" % e)
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to *https://workflows.cloudharness.metacell.us/api*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*CreateAndAccessApi* | [**delete_operation**](docs/workflows/apis/tags/CreateAndAccessApi.md#delete_operation) | **delete** /operations/{name} | deletes operation by name
-*CreateAndAccessApi* | [**get_operation**](docs/workflows/apis/tags/CreateAndAccessApi.md#get_operation) | **get** /operations/{name} | get operation by name
-*CreateAndAccessApi* | [**list_operations**](docs/workflows/apis/tags/CreateAndAccessApi.md#list_operations) | **get** /operations | lists operations
-*CreateAndAccessApi* | [**log_operation**](docs/workflows/apis/tags/CreateAndAccessApi.md#log_operation) | **get** /operations/{name}/logs | get operation by name
-
-## Documentation For Models
-
- - [Operation](docs/workflows/models/Operation.md)
- - [OperationSearchResult](docs/workflows/models/OperationSearchResult.md)
- - [OperationStatus](docs/workflows/models/OperationStatus.md)
- - [SearchResultData](docs/workflows/models/SearchResultData.md)
-
-## Documentation For Authorization
-
- All endpoints do not require authorization.
-
-## Author
-
-cloudharness@metacell.us
-
-## Notes for Large OpenAPI documents
-If the OpenAPI document is large, imports in cloudharness_cli.workflows.apis and cloudharness_cli.workflows.models may fail with a
-RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
-
-Solution 1:
-Use specific imports for apis and models like:
-- `from cloudharness_cli.workflows.apis.default_api import DefaultApi`
-- `from cloudharness_cli.workflows.model.pet import Pet`
-
-Solution 1:
-Before importing the package, adjust the maximum recursion limit as shown below:
-```
-import sys
-sys.setrecursionlimit(1500)
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.apis import *
-from cloudharness_cli.workflows.models import *
-```
-# cloudharness-cli.samples
-CloudHarness Sample api
-
-This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
-
-- API version: 0.1.0
-- Package version: 1.0.0
-- Build package: org.openapitools.codegen.languages.PythonClientCodegen
-
-## Requirements.
-
-Python &gt;&#x3D;3.7
-
-## Migration from other generators like python and python-legacy
-
-### Changes
-1. This generator uses spec case for all (object) property names and parameter names.
-    - So if the spec has a property name like camelCase, it will use camelCase rather than camel_case
-    - So you will need to update how you input and read properties to use spec case
-2. Endpoint parameters are stored in dictionaries to prevent collisions (explanation below)
-    - So you will need to update how you pass data in to endpoints
-3. Endpoint responses now include the original response, the deserialized response body, and (todo)the deserialized headers
-    - So you will need to update your code to use response.body to access deserialized data
-4. All validated data is instantiated in an instance that subclasses all validated Schema classes and Decimal/str/list/tuple/frozendict/NoneClass/BoolClass/bytes/io.FileIO
-    - This means that you can use isinstance to check if a payload validated against a schema class
-    - This means that no data will be of type None/True/False
-        - ingested None will subclass NoneClass
-        - ingested True will subclass BoolClass
-        - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
-5. All validated class instances are immutable except for ones based on io.File
-    - This is because if properties were changed after validation, that validation would no longer apply
-    - So no changing values or property values after a class has been instantiated
-6. String + Number types with formats
-    - String type data is stored as a string and if you need to access types based on its format like date,
-    date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
-    - this was done because openapi/json-schema defines constraints. string data may be type string with no format
-    keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. Property access on AnyType(type unset) or object(dict) schemas
-    - Only required keys with valid python names are properties like .someProp and have type hints
-    - All optional keys may not exist, so properties are not defined for them
-    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
-        - All required and optional keys have type hints for this method, and @typing.overload is used
-        - A type hint is also generated for additionalProperties accessed using this method
-    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
-    and additionalProperty values
-8. The location of the api classes has changed
-    - Api classes are located in your_package.apis.tags.some_api
-    - This change was made to eliminate redundant code generation
-    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
-    - This generator defines an endpoint in one class, then inherits that class to generate
-      apis by tags and by paths
-    - This change reduces code and allows quicker run time if you use the path apis
-        - path apis are at your_package.apis.paths.some_path
-    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
-    - So you will need to update your import paths to the api classes
-
-### Why are Oapg and _oapg used in class and method names?
-Classes can have arbitrarily named properties set on them
-Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
-on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
-
-### Object property spec case
-This was done because when payloads are ingested, they can be validated against N number of schemas.
-If the input signature used a different property name then that has mutated the payload.
-So SchemaA and SchemaB must both see the camelCase spec named variable.
-Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
-
-### Parameter spec case
-Parameters can be included in different locations including:
-- query
-- path
-- header
-- cookie
-
-Any of those parameters could use the same parameter names, so if every parameter
-was included as an endpoint parameter in a function signature, they would collide.
-For that reason, each of those inputs have been separated out into separate typed dictionaries:
-- query_params
-- path_params
-- header_params
-- cookie_params
-
-So when updating your code, you will need to pass endpoint parameters in using those
-dictionaries.
-
-### Endpoint responses
-Endpoint responses have been enriched to now include more information.
-Any response reom an endpoint will now include the following properties:
-response: urllib3.HTTPResponse
-body: typing.Union[Unset, Schema]
-headers: typing.Union[Unset, TODO]
-Note: response header deserialization has not yet been added
-
-
-## Installation & Usage
-### pip install
-
-If the python package is hosted on a repository, you can install directly using:
-
-```sh
-pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
-```
-(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
-
-Then import the package:
-```python
-import cloudharness_cli.samples
-```
-
-### Setuptools
-
-Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
-
-```sh
-python setup.py install --user
-```
-(or `sudo python setup.py install` to install the package for all users)
-
-Then import the package:
-```python
-import cloudharness_cli.samples
-```
-
-## Getting Started
-
-Please follow the [installation procedure](#installation--usage) and then run the following:
-
-```python
-
-import time
-import cloudharness_cli.samples
-from pprint import pprint
-from cloudharness_cli.samples.apis.tags import auth_api
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# The client must configure the authentication and authorization parameters
-# in accordance with the API server security policy.
-# Examples for each auth method are provided below, use the example that
-# satisfies your auth use case.
-
-# Configure API key authorization: cookieAuth
-configuration.api_key['cookieAuth'] = 'YOUR_API_KEY'
-
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['cookieAuth'] = 'Bearer'
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = auth_api.AuthApi(api_client)
-    
-    try:
-        # Check if the token is valid. Get a token by logging into the base url
-        api_response = api_instance.valid_cookie()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling AuthApi->valid_cookie: %s\n" % e)
-```
-
-## Documentation for API Endpoints
-
-All URIs are relative to */api*
-
-Class | Method | HTTP request | Description
------------- | ------------- | ------------- | -------------
-*AuthApi* | [**valid_cookie**](docs/samples/apis/tags/AuthApi.md#valid_cookie) | **get** /valid-cookie | Check if the token is valid. Get a token by logging into the base url
-*AuthApi* | [**valid_token**](docs/samples/apis/tags/AuthApi.md#valid_token) | **get** /valid | Check if the token is valid. Get a token by logging into the base url
-*ResourceApi* | [**create_sample_resource**](docs/samples/apis/tags/ResourceApi.md#create_sample_resource) | **post** /sampleresources | Create a SampleResource
-*ResourceApi* | [**delete_sample_resource**](docs/samples/apis/tags/ResourceApi.md#delete_sample_resource) | **delete** /sampleresources/{sampleresourceId} | Delete a SampleResource
-*ResourceApi* | [**get_sample_resource**](docs/samples/apis/tags/ResourceApi.md#get_sample_resource) | **get** /sampleresources/{sampleresourceId} | Get a SampleResource
-*ResourceApi* | [**get_sample_resources**](docs/samples/apis/tags/ResourceApi.md#get_sample_resources) | **get** /sampleresources | List All SampleResources
-*ResourceApi* | [**update_sample_resource**](docs/samples/apis/tags/ResourceApi.md#update_sample_resource) | **put** /sampleresources/{sampleresourceId} | Update a SampleResource
-*TestApi* | [**error**](docs/samples/apis/tags/TestApi.md#error) | **get** /error | test sentry is working
-*TestApi* | [**ping**](docs/samples/apis/tags/TestApi.md#ping) | **get** /ping | test the application is up
-*WorkflowsApi* | [**submit_async**](docs/samples/apis/tags/WorkflowsApi.md#submit_async) | **get** /operation_async | Send an asynchronous operation
-*WorkflowsApi* | [**submit_sync**](docs/samples/apis/tags/WorkflowsApi.md#submit_sync) | **get** /operation_sync | Send a synchronous operation
-*WorkflowsApi* | [**submit_sync_with_results**](docs/samples/apis/tags/WorkflowsApi.md#submit_sync_with_results) | **get** /operation_sync_results | Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-
-## Documentation For Models
-
- - [InlineResponse202](docs/samples/models/InlineResponse202.md)
- - [InlineResponse202Task](docs/samples/models/InlineResponse202Task.md)
- - [SampleResource](docs/samples/models/SampleResource.md)
-
-## Documentation For Authorization
-
-
-## bearerAuth
-
-- **Type**: Bearer authentication (JWT)
-
- Authentication schemes defined for the API:
-## cookieAuth
-
-- **Type**: API key
-- **API key parameter name**: kc-access
-- **Location**: 
-
-
-## Author
-
-cloudharness@metacell.us
-cloudharness@metacell.us
-cloudharness@metacell.us
-cloudharness@metacell.us
-
-## Notes for Large OpenAPI documents
-If the OpenAPI document is large, imports in cloudharness_cli.samples.apis and cloudharness_cli.samples.models may fail with a
-RecursionError indicating the maximum recursion limit has been exceeded. In that case, there are a couple of solutions:
-
-Solution 1:
-Use specific imports for apis and models like:
-- `from cloudharness_cli.samples.apis.default_api import DefaultApi`
-- `from cloudharness_cli.samples.model.pet import Pet`
-
-Solution 1:
-Before importing the package, adjust the maximum recursion limit as shown below:
-```
-import sys
-sys.setrecursionlimit(1500)
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis import *
-from cloudharness_cli.samples.models import *
-```
diff --git a/libraries/client/cloudharness_cli/requirements.txt b/libraries/client/cloudharness_cli/requirements.txt
deleted file mode 100644
index 971ed37a..00000000
--- a/libraries/client/cloudharness_cli/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-certifi
-frozendict
-python-dateutil
-setuptools
-typing_extensions
-urllib3
diff --git a/libraries/client/cloudharness_cli/test-requirements.txt b/libraries/client/cloudharness_cli/test-requirements.txt
deleted file mode 100644
index 2d88b034..00000000
--- a/libraries/client/cloudharness_cli/test-requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-pytest~=4.6.7 # needed for python 3.4
-pytest-cov>=2.8.1
-pytest-randomly==1.2.3 # needed for python 3.4
diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index 0dd00f8b..d5bdaa38 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -87,7 +87,7 @@ def generate_ts_client(openapi_file):
         os.path.dirname(openapi_file))}/frontend/src/rest"
     command = f"java -jar {CODEGEN} generate " \
         f"-i {openapi_file} " \
-        f"-g typescript-axios " \
+        f"-g typescript-fetch " \
         f"-o {out_dir}"
     os.system(command)
 
diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index a584c05d..cc626eea 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -5,6 +5,8 @@ import os
 import shutil
 import re
 import tempfile
+import subprocess
+import logging
 
 from ch_cli_tools import CH_ROOT
 from cloudharness_utils.constants import APPLICATION_TEMPLATE_PATH
@@ -29,11 +31,11 @@ if __name__ == "__main__":
                         
                         Available templates:
                         - flask-server (backend flask server based on openapi)
-                        - webapp (webapp including backend and frontend)
+                        - webapp (React webapp including backend and frontend)
                         - db-postgres
                         - db-neo4j
                         - db-mongo
-                        - djangp-app (fastapi django backend based on openapi)
+                        - django-app (fastapi django backend based on openapi)
                         """)
     args, unknown = parser.parse_known_args(sys.argv[1:])
 
@@ -54,24 +56,37 @@ if __name__ == "__main__":
         exit(1)
 
     app_path = os.path.join(APPLICATIONS_SRC_PATH, args.name)
+    os.makedirs(app_path, exist_ok=True)
     templates = args.templates
+
     if "django-app" in args.templates and "webapp" not in templates:
         templates = ["base", "webapp"] + templates
+
+    if 'webapp' in templates:
+        if os.path.exists(os.path.join(app_path, 'frontend')):
+            shutil.rmtree(os.path.join(app_path, 'frontend'))
+        cmd = ["yarn", "create", "vite", args.name,  "--template", "react-ts"]
+        logging.info(f"Running command: {' '.join(cmd)}")
+        subprocess.run(cmd, cwd=app_path)
+        shutil.move(os.path.join(app_path, args.name), os.path.join(app_path, 'frontend'))
+        generate_ts_client(openapi_file=os.path.join(app_path, 'api/openapi.yaml'))
+
+    if 'server' in templates:
+        with tempfile.TemporaryDirectory() as tmp_dirname:
+            copymergedir(os.path.join(CH_ROOT, APPLICATION_TEMPLATE_PATH, template_name), tmp_dirname)
+            merge_configuration_directories(app_path, tmp_dirname)
+            generate_server(app_path, tmp_dirname)
+
     for template_name in templates:
-        if template_name == 'server':
-            with tempfile.TemporaryDirectory() as tmp_dirname:
-                copymergedir(os.path.join(CH_ROOT, APPLICATION_TEMPLATE_PATH, template_name), tmp_dirname)
-                merge_configuration_directories(app_path, tmp_dirname)
-                generate_server(app_path, tmp_dirname)
         for base_path in (CH_ROOT, os.getcwd()):
             template_path = os.path.join(base_path, APPLICATION_TEMPLATE_PATH, template_name)
             if os.path.exists(template_path):
                 merge_configuration_directories(template_path, app_path)
 
-        if "flask-server" in templates:
-            generate_server(app_path)
+    if "flask-server" in templates:
+        generate_server(app_path)
 
-        replace_in_file(os.path.join(app_path, 'api/config.json'), PLACEHOLDER, to_python_module(args.name))
+    replace_in_file(os.path.join(app_path, 'api/config.json'), PLACEHOLDER, to_python_module(args.name))
 
     if "django-app" in templates:
         replace_in_file(os.path.join(app_path, 'api/templates/main.jinja2'), PLACEHOLDER, to_python_module(args.name))
@@ -95,4 +110,3 @@ if __name__ == "__main__":
         except FileNotFoundError:
             # backend dockerfile not found, continue
             pass
-        generate_ts_client(openapi_file=os.path.join(app_path, 'api/openapi.yaml'))

From e97d0e7a15bb389f33fbdef0a4ced1bd82bc1817 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 12:11:50 +0200
Subject: [PATCH 104/210] Fix tests

---
 .../client/cloudharness_cli/test-requirements.txt |  3 +++
 libraries/cloudharness-common/tox.ini             |  2 +-
 .../cloudharness_utils/testing/util.py            |  1 -
 libraries/cloudharness-utils/tox.ini              |  2 +-
 tools/cloudharness-test/tox.ini                   | 15 ---------------
 .../deployment-cli-tools/tests/test_codefresh.py  |  2 +-
 tools/deployment-cli-tools/tests/test_skaffold.py |  2 +-
 tools/deployment-cli-tools/tox.ini                |  2 +-
 8 files changed, 8 insertions(+), 21 deletions(-)
 create mode 100644 libraries/client/cloudharness_cli/test-requirements.txt
 delete mode 100644 tools/cloudharness-test/tox.ini

diff --git a/libraries/client/cloudharness_cli/test-requirements.txt b/libraries/client/cloudharness_cli/test-requirements.txt
new file mode 100644
index 00000000..a52b63cb
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test-requirements.txt
@@ -0,0 +1,3 @@
+pytest
+pytest-cov
+pytest-randomly
\ No newline at end of file
diff --git a/libraries/cloudharness-common/tox.ini b/libraries/cloudharness-common/tox.ini
index ae892bde..6c0c94f4 100644
--- a/libraries/cloudharness-common/tox.ini
+++ b/libraries/cloudharness-common/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{9,}
+envlist = py3{9,12}
 
 [testenv]
 deps=-r{toxinidir}/test-requirements.txt
diff --git a/libraries/cloudharness-utils/cloudharness_utils/testing/util.py b/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
index b0e98624..da758d87 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
@@ -1,5 +1,4 @@
 
-from cgi import test
 import os
 from os.path import dirname as dn
 
diff --git a/libraries/cloudharness-utils/tox.ini b/libraries/cloudharness-utils/tox.ini
index 29288fe5..925ab7e5 100644
--- a/libraries/cloudharness-utils/tox.ini
+++ b/libraries/cloudharness-utils/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{9,}
+envlist = py3{9,12}
 
 [pytest]
 addopts = --ignore-glob=**/application-templates/**
diff --git a/tools/cloudharness-test/tox.ini b/tools/cloudharness-test/tox.ini
deleted file mode 100644
index 29288fe5..00000000
--- a/tools/cloudharness-test/tox.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[tox]
-envlist = py3{9,}
-
-[pytest]
-addopts = --ignore-glob=**/application-templates/**
-
-[testenv]
-deps=-r{toxinidir}/test-requirements.txt
-
-
-commands=
-    coverage run --source cloudharness_utilities -m pytest -v
-    coverage report -m
-
-
diff --git a/tools/deployment-cli-tools/tests/test_codefresh.py b/tools/deployment-cli-tools/tests/test_codefresh.py
index 7e3abd4d..8d118d40 100644
--- a/tools/deployment-cli-tools/tests/test_codefresh.py
+++ b/tools/deployment-cli-tools/tests/test_codefresh.py
@@ -86,7 +86,7 @@ def test_create_codefresh_configuration():
             RESOURCES, STATIC_IMAGES_PATH, "my-common"))
 
         steps = l1_steps["build_application_images"]["steps"]
-        assert len(steps) == 14
+        assert len(steps) == 13
         assert "myapp" in steps
         assert "samples" in steps
         assert "accounts" in steps
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
index 04cf4420..981aefa5 100644
--- a/tools/deployment-cli-tools/tests/test_skaffold.py
+++ b/tools/deployment-cli-tools/tests/test_skaffold.py
@@ -38,7 +38,7 @@ def test_create_skaffold_configuration():
         output_path=OUT
     )
     assert os.path.exists(os.path.join(OUT, 'skaffold.yaml'))
-    exp_apps = ('accounts', 'samples', 'workflows', 'myapp', 'common', 'nfsserver')
+    exp_apps = ('accounts', 'samples', 'workflows', 'myapp', 'common')
     assert len(sk['build']['artifacts']) == len(
         exp_apps) + len(values[KEY_TASK_IMAGES])
     assert 'reg' in sk['build']['artifacts'][0]['image']
diff --git a/tools/deployment-cli-tools/tox.ini b/tools/deployment-cli-tools/tox.ini
index cf5407d3..191920c2 100644
--- a/tools/deployment-cli-tools/tox.ini
+++ b/tools/deployment-cli-tools/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3.9
+envlist = py3{9,12}
 
 [pytest]
 addopts = --ignore-glob=**/application-templates/**

From c4698fdb818f869322c56ccd19368cb549f8ce36 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 12:13:08 +0200
Subject: [PATCH 105/210] Reintroduce deleted file

---
 libraries/client/cloudharness_cli/requirements.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 libraries/client/cloudharness_cli/requirements.txt

diff --git a/libraries/client/cloudharness_cli/requirements.txt b/libraries/client/cloudharness_cli/requirements.txt
new file mode 100644
index 00000000..8695929d
--- /dev/null
+++ b/libraries/client/cloudharness_cli/requirements.txt
@@ -0,0 +1,5 @@
+certifi
+frozendict
+python-dateutil
+typing_extensions
+urllib3
\ No newline at end of file

From c4dde9d9a5802b9eb35711ab6b579812bd643ffd Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 12:19:52 +0200
Subject: [PATCH 106/210] Fix Python file format

---
 tools/deployment-cli-tools/ch_cli_tools/openapi.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index d5bdaa38..b893f551 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -42,14 +42,14 @@ def generate_model(base_path=ROOT):
     lib_path = f"{base_path}/libraries/models"
 
     # Generate model stuff: use python-flask generator
-    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python-flask -o {
-        lib_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
+    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python-flask -o \
+          {lib_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
     os.system(command)
 
     # Generate docs: use python generator
     tmp_path = f"{lib_path}/tmp"
-    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python -o {
-        tmp_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
+    command = f"java -jar {CODEGEN} generate -i {base_path}/libraries/models/api/openapi.yaml -g python -o \
+        {tmp_path}  --skip-validate-spec -c {base_path}/libraries/models/api/config.json"
     os.system(command)
     try:
         source_dir = join(tmp_path, "docs/models")

From cc8f107e54abd51abcf70cd36b804bd3ee798f1e Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 30 Jul 2024 10:43:52 +0100
Subject: [PATCH 107/210] CH-91 updated base model imports to custom base model

---
 .../models/api_tests_config.py                |  2 +-
 .../models/application_accounts_config.py     |  2 +-
 .../models/application_config.py              |  2 +-
 .../models/application_dependencies_config.py |  2 +-
 .../models/application_harness_config.py      |  2 +-
 .../models/application_probe.py               |  2 +-
 .../models/application_test_config.py         |  2 +-
 .../models/application_user.py                |  2 +-
 .../models/auto_artifact_spec.py              |  2 +-
 .../models/backup_config.py                   |  2 +-
 .../cloudharness_model/models/base_model.py   | 68 -------------------
 .../cloudharness_model/models/cdc_event.py    |  2 +-
 .../models/cdc_event_meta.py                  |  2 +-
 .../models/cpu_memory_config.py               |  2 +-
 .../models/database_deployment_config.py      |  2 +-
 .../models/deployment_auto_artifact_config.py |  2 +-
 .../models/deployment_resources_conf.py       |  2 +-
 .../models/deployment_volume_spec.py          |  2 +-
 .../models/e2_e_tests_config.py               |  2 +-
 .../models/file_resources_config.py           |  2 +-
 .../models/git_dependency_config.py           |  2 +-
 .../models/harness_main_config.py             |  2 +-
 .../models/ingress_config.py                  |  2 +-
 .../ingress_config_all_of_letsencrypt.py      |  2 +-
 .../models/jupyter_hub_config.py              |  2 +-
 .../cloudharness_model/models/name_value.py   |  2 +-
 .../models/registry_config.py                 |  2 +-
 .../models/service_auto_artifact_config.py    |  2 +-
 .../models/unit_tests_config.py               |  2 +-
 .../models/uri_role_mapping_config.py         |  2 +-
 .../models/cloudharness_model/models/user.py  |  2 +-
 .../models/user_credential.py                 |  2 +-
 .../cloudharness_model/models/user_group.py   |  6 +-
 .../cloudharness_model/models/user_role.py    |  2 +-
 34 files changed, 35 insertions(+), 103 deletions(-)
 delete mode 100644 libraries/models/cloudharness_model/models/base_model.py

diff --git a/libraries/models/cloudharness_model/models/api_tests_config.py b/libraries/models/cloudharness_model/models/api_tests_config.py
index a4476c08..a7965a55 100644
--- a/libraries/models/cloudharness_model/models/api_tests_config.py
+++ b/libraries/models/cloudharness_model/models/api_tests_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/application_accounts_config.py b/libraries/models/cloudharness_model/models/application_accounts_config.py
index 9a97db85..9dc8b124 100644
--- a/libraries/models/cloudharness_model/models/application_accounts_config.py
+++ b/libraries/models/cloudharness_model/models/application_accounts_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.application_user import ApplicationUser
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/application_config.py b/libraries/models/cloudharness_model/models/application_config.py
index f423ee3b..26a6c813 100644
--- a/libraries/models/cloudharness_model/models/application_config.py
+++ b/libraries/models/cloudharness_model/models/application_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.application_harness_config import ApplicationHarnessConfig
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/application_dependencies_config.py b/libraries/models/cloudharness_model/models/application_dependencies_config.py
index a09df86f..1bfd211e 100644
--- a/libraries/models/cloudharness_model/models/application_dependencies_config.py
+++ b/libraries/models/cloudharness_model/models/application_dependencies_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.git_dependency_config import GitDependencyConfig
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/application_harness_config.py b/libraries/models/cloudharness_model/models/application_harness_config.py
index ad85a40b..1921de7b 100644
--- a/libraries/models/cloudharness_model/models/application_harness_config.py
+++ b/libraries/models/cloudharness_model/models/application_harness_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.application_accounts_config import ApplicationAccountsConfig
 from cloudharness_model.models.application_dependencies_config import ApplicationDependenciesConfig
 from cloudharness_model.models.application_probe import ApplicationProbe
diff --git a/libraries/models/cloudharness_model/models/application_probe.py b/libraries/models/cloudharness_model/models/application_probe.py
index 75864acc..0b590781 100644
--- a/libraries/models/cloudharness_model/models/application_probe.py
+++ b/libraries/models/cloudharness_model/models/application_probe.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/application_test_config.py b/libraries/models/cloudharness_model/models/application_test_config.py
index 3ad31523..73b76e53 100644
--- a/libraries/models/cloudharness_model/models/application_test_config.py
+++ b/libraries/models/cloudharness_model/models/application_test_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.api_tests_config import ApiTestsConfig
 from cloudharness_model.models.e2_e_tests_config import E2ETestsConfig
 from cloudharness_model.models.unit_tests_config import UnitTestsConfig
diff --git a/libraries/models/cloudharness_model/models/application_user.py b/libraries/models/cloudharness_model/models/application_user.py
index 991d8ea3..78c3479c 100644
--- a/libraries/models/cloudharness_model/models/application_user.py
+++ b/libraries/models/cloudharness_model/models/application_user.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/auto_artifact_spec.py b/libraries/models/cloudharness_model/models/auto_artifact_spec.py
index c0c89ac3..1280a055 100644
--- a/libraries/models/cloudharness_model/models/auto_artifact_spec.py
+++ b/libraries/models/cloudharness_model/models/auto_artifact_spec.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/backup_config.py b/libraries/models/cloudharness_model/models/backup_config.py
index 0613c70d..b4198553 100644
--- a/libraries/models/cloudharness_model/models/backup_config.py
+++ b/libraries/models/cloudharness_model/models/backup_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 import re
 from cloudharness_model import util
diff --git a/libraries/models/cloudharness_model/models/base_model.py b/libraries/models/cloudharness_model/models/base_model.py
deleted file mode 100644
index 0938bbc9..00000000
--- a/libraries/models/cloudharness_model/models/base_model.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import pprint
-
-import typing
-
-from cloudharness_model import util
-
-T = typing.TypeVar('T')
-
-
-class Model:
-    # openapiTypes: The key is attribute name and the
-    # value is attribute type.
-    openapi_types: typing.Dict[str, type] = {}
-
-    # attributeMap: The key is attribute name and the
-    # value is json key in definition.
-    attribute_map: typing.Dict[str, str] = {}
-
-    @classmethod
-    def from_dict(cls: typing.Type[T], dikt) -> T:
-        """Returns the dict as a model"""
-        return util.deserialize_model(dikt, cls)
-
-    def to_dict(self):
-        """Returns the model properties as a dict
-
-        :rtype: dict
-        """
-        result = {}
-
-        for attr in self.openapi_types:
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model
-
-        :rtype: str
-        """
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/libraries/models/cloudharness_model/models/cdc_event.py b/libraries/models/cloudharness_model/models/cdc_event.py
index b8861ad1..b1db28fe 100644
--- a/libraries/models/cloudharness_model/models/cdc_event.py
+++ b/libraries/models/cloudharness_model/models/cdc_event.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.cdc_event_meta import CDCEventMeta
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/cdc_event_meta.py b/libraries/models/cloudharness_model/models/cdc_event_meta.py
index 78db4e05..30591287 100644
--- a/libraries/models/cloudharness_model/models/cdc_event_meta.py
+++ b/libraries/models/cloudharness_model/models/cdc_event_meta.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.user import User
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/cpu_memory_config.py b/libraries/models/cloudharness_model/models/cpu_memory_config.py
index 8f4f1e70..63fcee6a 100644
--- a/libraries/models/cloudharness_model/models/cpu_memory_config.py
+++ b/libraries/models/cloudharness_model/models/cpu_memory_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/database_deployment_config.py b/libraries/models/cloudharness_model/models/database_deployment_config.py
index 1be424a2..b9b7faa5 100644
--- a/libraries/models/cloudharness_model/models/database_deployment_config.py
+++ b/libraries/models/cloudharness_model/models/database_deployment_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 import re
 from cloudharness_model import util
diff --git a/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py b/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py
index ab31de80..56ef4b69 100644
--- a/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py
+++ b/libraries/models/cloudharness_model/models/deployment_auto_artifact_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 from cloudharness_model.models.deployment_volume_spec import DeploymentVolumeSpec
 import re
diff --git a/libraries/models/cloudharness_model/models/deployment_resources_conf.py b/libraries/models/cloudharness_model/models/deployment_resources_conf.py
index 27c09148..2d122230 100644
--- a/libraries/models/cloudharness_model/models/deployment_resources_conf.py
+++ b/libraries/models/cloudharness_model/models/deployment_resources_conf.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.cpu_memory_config import CpuMemoryConfig
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/deployment_volume_spec.py b/libraries/models/cloudharness_model/models/deployment_volume_spec.py
index 7fc64914..7843eae9 100644
--- a/libraries/models/cloudharness_model/models/deployment_volume_spec.py
+++ b/libraries/models/cloudharness_model/models/deployment_volume_spec.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/e2_e_tests_config.py b/libraries/models/cloudharness_model/models/e2_e_tests_config.py
index 6ae48d93..baba68df 100644
--- a/libraries/models/cloudharness_model/models/e2_e_tests_config.py
+++ b/libraries/models/cloudharness_model/models/e2_e_tests_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/file_resources_config.py b/libraries/models/cloudharness_model/models/file_resources_config.py
index fff73422..2c73b702 100644
--- a/libraries/models/cloudharness_model/models/file_resources_config.py
+++ b/libraries/models/cloudharness_model/models/file_resources_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 import re
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/git_dependency_config.py b/libraries/models/cloudharness_model/models/git_dependency_config.py
index 8e3acf61..8b380815 100644
--- a/libraries/models/cloudharness_model/models/git_dependency_config.py
+++ b/libraries/models/cloudharness_model/models/git_dependency_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/harness_main_config.py b/libraries/models/cloudharness_model/models/harness_main_config.py
index 6691ed07..ea8b7478 100644
--- a/libraries/models/cloudharness_model/models/harness_main_config.py
+++ b/libraries/models/cloudharness_model/models/harness_main_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.application_config import ApplicationConfig
 from cloudharness_model.models.backup_config import BackupConfig
 from cloudharness_model.models.name_value import NameValue
diff --git a/libraries/models/cloudharness_model/models/ingress_config.py b/libraries/models/cloudharness_model/models/ingress_config.py
index e0da288f..d0b5352d 100644
--- a/libraries/models/cloudharness_model/models/ingress_config.py
+++ b/libraries/models/cloudharness_model/models/ingress_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.ingress_config_all_of_letsencrypt import IngressConfigAllOfLetsencrypt
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py b/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py
index 467e18a2..a9286c07 100644
--- a/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py
+++ b/libraries/models/cloudharness_model/models/ingress_config_all_of_letsencrypt.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/jupyter_hub_config.py b/libraries/models/cloudharness_model/models/jupyter_hub_config.py
index 5aaa9850..35095ce4 100644
--- a/libraries/models/cloudharness_model/models/jupyter_hub_config.py
+++ b/libraries/models/cloudharness_model/models/jupyter_hub_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/name_value.py b/libraries/models/cloudharness_model/models/name_value.py
index abf07fe6..22c0f511 100644
--- a/libraries/models/cloudharness_model/models/name_value.py
+++ b/libraries/models/cloudharness_model/models/name_value.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/registry_config.py b/libraries/models/cloudharness_model/models/registry_config.py
index 7ce48e9c..8e2830c6 100644
--- a/libraries/models/cloudharness_model/models/registry_config.py
+++ b/libraries/models/cloudharness_model/models/registry_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/service_auto_artifact_config.py b/libraries/models/cloudharness_model/models/service_auto_artifact_config.py
index 77bded86..4225711b 100644
--- a/libraries/models/cloudharness_model/models/service_auto_artifact_config.py
+++ b/libraries/models/cloudharness_model/models/service_auto_artifact_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/unit_tests_config.py b/libraries/models/cloudharness_model/models/unit_tests_config.py
index 680d984a..6983c7fb 100644
--- a/libraries/models/cloudharness_model/models/unit_tests_config.py
+++ b/libraries/models/cloudharness_model/models/unit_tests_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/uri_role_mapping_config.py b/libraries/models/cloudharness_model/models/uri_role_mapping_config.py
index 649ae22e..4a86884c 100644
--- a/libraries/models/cloudharness_model/models/uri_role_mapping_config.py
+++ b/libraries/models/cloudharness_model/models/uri_role_mapping_config.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 import re
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/user.py b/libraries/models/cloudharness_model/models/user.py
index 0676fbae..698ad2ce 100644
--- a/libraries/models/cloudharness_model/models/user.py
+++ b/libraries/models/cloudharness_model/models/user.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model.models.user_credential import UserCredential
 from cloudharness_model import util
 
diff --git a/libraries/models/cloudharness_model/models/user_credential.py b/libraries/models/cloudharness_model/models/user_credential.py
index 1b692f8f..48f77e4f 100644
--- a/libraries/models/cloudharness_model/models/user_credential.py
+++ b/libraries/models/cloudharness_model/models/user_credential.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
diff --git a/libraries/models/cloudharness_model/models/user_group.py b/libraries/models/cloudharness_model/models/user_group.py
index 0cf48e99..153f84fa 100644
--- a/libraries/models/cloudharness_model/models/user_group.py
+++ b/libraries/models/cloudharness_model/models/user_group.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 
@@ -224,7 +224,7 @@ def realm_roles(self, realm_roles: List[str]):
         self._realm_roles = realm_roles
 
     @property
-    def sub_groups(self) -> List[UserGroup]:
+    def sub_groups(self) -> List['UserGroup']:
         """Gets the sub_groups of this UserGroup.
 
 
@@ -234,7 +234,7 @@ def sub_groups(self) -> List[UserGroup]:
         return self._sub_groups
 
     @sub_groups.setter
-    def sub_groups(self, sub_groups: List[UserGroup]):
+    def sub_groups(self, sub_groups: List['UserGroup']):
         """Sets the sub_groups of this UserGroup.
 
 
diff --git a/libraries/models/cloudharness_model/models/user_role.py b/libraries/models/cloudharness_model/models/user_role.py
index 8cbc7d00..96be6a92 100644
--- a/libraries/models/cloudharness_model/models/user_role.py
+++ b/libraries/models/cloudharness_model/models/user_role.py
@@ -2,7 +2,7 @@
 
 from typing import List, Dict  # noqa: F401
 
-from cloudharness_model.models.base_model import Model
+from cloudharness_model.models.base_model_ import Model
 from cloudharness_model import util
 
 

From 016e0fffdba0256b7f443c3e0132671d1e1acf28 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 30 Jul 2024 11:22:09 +0100
Subject: [PATCH 108/210] CH-91 updated samples minimal values to remove
 implicit dependency on common

---
 applications/samples/deploy/values-minimal.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/samples/deploy/values-minimal.yaml b/applications/samples/deploy/values-minimal.yaml
index 23f80267..ee31280d 100644
--- a/applications/samples/deploy/values-minimal.yaml
+++ b/applications/samples/deploy/values-minimal.yaml
@@ -3,4 +3,5 @@ harness:
   dependencies:
     soft: []
     hard: []
+  use_services: []
 

From 965cd15978135da4e74461d601cb4e2481735594 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 12:44:14 +0200
Subject: [PATCH 109/210] Small API fix for testing

---
 .../workflows/server/workflows_api/openapi/openapi.yaml   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/applications/workflows/server/workflows_api/openapi/openapi.yaml b/applications/workflows/server/workflows_api/openapi/openapi.yaml
index 781e815a..638b9f9a 100644
--- a/applications/workflows/server/workflows_api/openapi/openapi.yaml
+++ b/applications/workflows/server/workflows_api/openapi/openapi.yaml
@@ -70,8 +70,7 @@ paths:
         delete operation by its name
       operationId: delete_operation
       parameters:
-      - example: my-workflow
-        explode: false
+      - explode: false
         in: path
         name: name
         required: true
@@ -92,10 +91,7 @@ paths:
         retrieves an operation by its name
       operationId: get_operation
       parameters:
-      - examples:
-          my-operation:
-            value: my-operation
-        explode: false
+      - explode: false
         in: path
         name: name
         required: true

From 5708c4001f84ee1ff5b94b9b554328dc6ccb6374 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 12:52:27 +0200
Subject: [PATCH 110/210] Fix linting on samples app

---
 .../webapp/frontend/.eslintrc.cjs             | 19 +++++++++++++++++++
 applications/samples/frontend/.eslintrc.cjs   |  4 ++--
 applications/samples/frontend/package.json    |  3 ++-
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 application-templates/webapp/frontend/.eslintrc.cjs

diff --git a/application-templates/webapp/frontend/.eslintrc.cjs b/application-templates/webapp/frontend/.eslintrc.cjs
new file mode 100644
index 00000000..c73cf24e
--- /dev/null
+++ b/application-templates/webapp/frontend/.eslintrc.cjs
@@ -0,0 +1,19 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs', 'src/rest/*'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+    '@typescript-eslint/no-explicit-any': 'off',
+  }
+}
diff --git a/applications/samples/frontend/.eslintrc.cjs b/applications/samples/frontend/.eslintrc.cjs
index ba9dc0ed..c73cf24e 100644
--- a/applications/samples/frontend/.eslintrc.cjs
+++ b/applications/samples/frontend/.eslintrc.cjs
@@ -6,7 +6,7 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:react-hooks/recommended',
   ],
-  ignorePatterns: ['dist', '.eslintrc.cjs', 'rest'],
+  ignorePatterns: ['dist', '.eslintrc.cjs', 'src/rest/*'],
   parser: '@typescript-eslint/parser',
   plugins: ['react-refresh'],
   rules: {
@@ -14,6 +14,6 @@ module.exports = {
       'warn',
       { allowConstantExport: true },
     ],
-    ''
+    '@typescript-eslint/no-explicit-any': 'off',
   }
 }
diff --git a/applications/samples/frontend/package.json b/applications/samples/frontend/package.json
index fef056fa..a104f3af 100644
--- a/applications/samples/frontend/package.json
+++ b/applications/samples/frontend/package.json
@@ -8,7 +8,8 @@
     "start": "DOMAIN=http://localhost:5000 vite",
     "start:dev": "DOMAIN=https://test.ch.metacell.us vite",
     "start:local": "DOMAIN=http://samples.ch vite",
-    "build": "tsc -b && vite build",
+    "prebuild": "eslint .",
+    "build": "vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },

From 993b04af575dfddc8ec6ebb8c0e785b5383cf54d Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 12:53:50 +0200
Subject: [PATCH 111/210] Fix Python file format

---
 tools/deployment-cli-tools/ch_cli_tools/openapi.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index b893f551..4647bb11 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -83,8 +83,7 @@ def generate_python_client(module, openapi_file, client_src_path, lib_name=LIB_N
 
 def generate_ts_client(openapi_file):
     get_dependencies()
-    out_dir = f"{os.path.dirname(
-        os.path.dirname(openapi_file))}/frontend/src/rest"
+    out_dir = f"{os.path.dirname(os.path.dirname(openapi_file))}/frontend/src/rest"
     command = f"java -jar {CODEGEN} generate " \
         f"-i {openapi_file} " \
         f"-g typescript-fetch " \

From b8afcea21369a3da33c3a928fc4c0f816e858006 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 30 Jul 2024 13:47:36 +0100
Subject: [PATCH 112/210] CH-91 Added an extra test to ensure env and envmap
 work together in values definition

---
 .../samples/backend/samples/controllers/test_controller.py      | 1 +
 applications/samples/deploy/values-minimal.yaml                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/samples/backend/samples/controllers/test_controller.py b/applications/samples/backend/samples/controllers/test_controller.py
index 3fb922f2..ff108973 100644
--- a/applications/samples/backend/samples/controllers/test_controller.py
+++ b/applications/samples/backend/samples/controllers/test_controller.py
@@ -26,6 +26,7 @@ def ping():  # noqa: E501
     import os
     
     expected_environment_variables = {
+        'WORKERS': '3',
         'ENVIRONMENT_TEST_A': 'value',
         'ENVIRONMENT_TEST_B': '123',
     }
diff --git a/applications/samples/deploy/values-minimal.yaml b/applications/samples/deploy/values-minimal.yaml
index ee31280d..1312b943 100644
--- a/applications/samples/deploy/values-minimal.yaml
+++ b/applications/samples/deploy/values-minimal.yaml
@@ -1,5 +1,5 @@
 harness:
-  secured: true
+  secured: false
   dependencies:
     soft: []
     hard: []

From 419910db974e281be04c69b7fab1f65f8e58e06c Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 14:58:49 +0200
Subject: [PATCH 113/210] CH-141 merge json files

---
 .../webapp/frontend/package.json              | 11 +++++++
 .../deployment-cli-tools/ch_cli_tools/helm.py |  2 +-
 .../ch_cli_tools/utils.py                     | 32 +++++++++++++++++++
 .../deployment-cli-tools/harness-application  |  1 +
 .../tests/resources/conf-source1/a.json       |  7 ++++
 .../tests/resources/conf-source1/b.json       |  7 ++++
 .../tests/resources/conf-source2/a.json       |  7 ++++
 .../tests/resources/conf-source2/c.json       |  7 ++++
 .../deployment-cli-tools/tests/test_utils.py  | 11 +++++++
 9 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 application-templates/webapp/frontend/package.json
 create mode 100644 tools/deployment-cli-tools/tests/resources/conf-source1/a.json
 create mode 100644 tools/deployment-cli-tools/tests/resources/conf-source1/b.json
 create mode 100644 tools/deployment-cli-tools/tests/resources/conf-source2/a.json
 create mode 100644 tools/deployment-cli-tools/tests/resources/conf-source2/c.json

diff --git a/application-templates/webapp/frontend/package.json b/application-templates/webapp/frontend/package.json
new file mode 100644
index 00000000..b8d45278
--- /dev/null
+++ b/application-templates/webapp/frontend/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "__APP_NAME__",
+  "scripts": {
+    "dev": "vite",
+    "start": "DOMAIN=http://localhost:5000 vite",
+    "start:dev": "DOMAIN=https://test.ch.metacell.us vite",
+    "start:local": "DOMAIN=http://samples.ch vite",
+    "prebuild": "eslint .",
+    "build": "vite build"
+  }
+}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index dc4a6cba..2552dcbe 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -410,7 +410,7 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()):
             ignore = set(DEFAULT_IGNORE)
             if os.path.exists(ignore_path):
                 with open(ignore_path) as f:
-                    ignore = ignore.union({line.strip() for line in f})
+                    ignore = ignore.union({line.strip() for line in f if line.strip() and not line.startswith('#')})
             logging.info(f"Ignoring {ignore}")
             tag = generate_tag_from_content(build_context_path, ignore)
             logging.info(f"Content hash: {tag}")
diff --git a/tools/deployment-cli-tools/ch_cli_tools/utils.py b/tools/deployment-cli-tools/ch_cli_tools/utils.py
index 9e2cbf9e..3ec8e6f3 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/utils.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/utils.py
@@ -145,6 +145,8 @@ def get_template(yaml_path, base_default=False):
 def file_is_yaml(fname):
     return fname[-4:] == 'yaml' or fname[-3:] == 'yml'
 
+def file_is_json(fname):
+    return fname[-4:] == 'json'
 
 def replaceindir(root_src_dir, source, replace):
     """
@@ -270,6 +272,14 @@ def merge_configuration_directories(source, dest):
                 except Exception as e:
                     logging.warning(f"Overwriting file {fdest} with {fpath}")
                     shutil.copy2(fpath, fdest)
+            elif file_is_json(fpath):
+                try:
+                    merge_json_files(fpath, fdest)
+                    logging.info(
+                        f"Merged/overridden file content of {fdest} with {fpath}")
+                except Exception as e:
+                    logging.warning(f"Overwriting file {fdest} with {fpath}")
+                    shutil.copy2(fpath, fdest)
             else:
                 logging.warning(f"Overwriting file {fdest} with {fpath}")
                 shutil.copy2(fpath, fdest)
@@ -280,6 +290,28 @@ def merge_yaml_files(fname, fdest):
         content_src = yaml.load(f)
     merge_to_yaml_file(content_src, fdest)
 
+def merge_json_files(fname, fdest):
+    with open(fname) as f:
+        content_src = json.load(f)
+    merge_to_json_file(content_src, fdest)
+
+def merge_to_json_file(content_src, fdest):
+    if not content_src:
+        return
+    if not exists(fdest):
+        merged = content_src
+    else:
+        with open(fdest) as f:
+            content_dest = json.load(f)
+
+        merged = dict_merge(
+            content_dest, content_src) if content_dest else content_src
+
+    if not exists(dirname(fdest)):
+        os.makedirs(dirname(fdest))
+    with open(fdest, "w") as f:
+        json.dump(merged, f, indent=2)
+    return merged
 
 def merge_to_yaml_file(content_src, fdest):
     if not content_src:
diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index cc626eea..37bec808 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -71,6 +71,7 @@ if __name__ == "__main__":
         shutil.move(os.path.join(app_path, args.name), os.path.join(app_path, 'frontend'))
         generate_ts_client(openapi_file=os.path.join(app_path, 'api/openapi.yaml'))
 
+
     if 'server' in templates:
         with tempfile.TemporaryDirectory() as tmp_dirname:
             copymergedir(os.path.join(CH_ROOT, APPLICATION_TEMPLATE_PATH, template_name), tmp_dirname)
diff --git a/tools/deployment-cli-tools/tests/resources/conf-source1/a.json b/tools/deployment-cli-tools/tests/resources/conf-source1/a.json
new file mode 100644
index 00000000..acc95bb9
--- /dev/null
+++ b/tools/deployment-cli-tools/tests/resources/conf-source1/a.json
@@ -0,0 +1,7 @@
+{
+    "a": "a",
+    "b": {
+        "ba": "ba",
+        "bc": "bc"
+    }
+}
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/tests/resources/conf-source1/b.json b/tools/deployment-cli-tools/tests/resources/conf-source1/b.json
new file mode 100644
index 00000000..424af7c0
--- /dev/null
+++ b/tools/deployment-cli-tools/tests/resources/conf-source1/b.json
@@ -0,0 +1,7 @@
+{
+    "a": "a",
+    "b": {
+        "ba": "ba",
+        "bb": "bb"
+    }
+}
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/tests/resources/conf-source2/a.json b/tools/deployment-cli-tools/tests/resources/conf-source2/a.json
new file mode 100644
index 00000000..c7f21ebc
--- /dev/null
+++ b/tools/deployment-cli-tools/tests/resources/conf-source2/a.json
@@ -0,0 +1,7 @@
+{
+    "a": "a1",
+    "b": {
+        "ba": "ba1",
+        "bb": "bb"
+    }
+}
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/tests/resources/conf-source2/c.json b/tools/deployment-cli-tools/tests/resources/conf-source2/c.json
new file mode 100644
index 00000000..424af7c0
--- /dev/null
+++ b/tools/deployment-cli-tools/tests/resources/conf-source2/c.json
@@ -0,0 +1,7 @@
+{
+    "a": "a",
+    "b": {
+        "ba": "ba",
+        "bb": "bb"
+    }
+}
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/tests/test_utils.py b/tools/deployment-cli-tools/tests/test_utils.py
index cbd813c1..cade7770 100644
--- a/tools/deployment-cli-tools/tests/test_utils.py
+++ b/tools/deployment-cli-tools/tests/test_utils.py
@@ -47,6 +47,17 @@ def test_merge_configuration_directories():
         assert a['b']['ba'] == 'ba1'
         assert a['b']['bb'] == 'bb'
         assert a['b']['bc'] == 'bc'
+
+        assert os.path.exists(os.path.join(res_path, "a.json"))
+        assert os.path.exists(os.path.join(res_path, "b.json"))
+        assert os.path.exists(os.path.join(res_path, "c.json"))
+
+        with open(os.path.join(res_path, "a.json")) as f:
+            a = json.load(f)
+        assert a['a'] == 'a1'
+        assert a['b']['ba'] == 'ba1'
+        assert a['b']['bb'] == 'bb'
+        assert a['b']['bc'] == 'bc'
     finally:
         if os.path.exists(res_path):
             shutil.rmtree(res_path)

From 1d7c4602d431aec41f5d84e52636b01dc8d4f6c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:33:37 +0000
Subject: [PATCH 114/210] Bump braces from 3.0.2 to 3.0.3 in /test/test-e2e

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/test-e2e/package-lock.json | 28 ++++++++++++++--------------
 test/test-e2e/yarn.lock         | 16 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/test/test-e2e/package-lock.json b/test/test-e2e/package-lock.json
index bc48f0f2..a7a49cc2 100644
--- a/test/test-e2e/package-lock.json
+++ b/test/test-e2e/package-lock.json
@@ -1281,11 +1281,11 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1861,9 +1861,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -5732,11 +5732,11 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browserslist": {
@@ -6141,9 +6141,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "requires": {
         "to-regex-range": "^5.0.1"
       }
diff --git a/test/test-e2e/yarn.lock b/test/test-e2e/yarn.lock
index fc69b2de..2eb25706 100644
--- a/test/test-e2e/yarn.lock
+++ b/test/test-e2e/yarn.lock
@@ -848,11 +848,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.21.3:
   version "4.21.4"
@@ -1260,10 +1260,10 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 

From fcd21c5e969adad51f6bfe80995ffe15ee2262ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:33:52 +0000
Subject: [PATCH 115/210] Bump ws and puppeteer in /test/test-e2e

Bumps [ws](https://github.com/websockets/ws) to 8.18.0 and updates ancestor dependency [puppeteer](https://github.com/puppeteer/puppeteer). These dependencies need to be updated together.


Updates `ws` from 8.6.0 to 8.18.0
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.6.0...8.18.0)

Updates `puppeteer` from 14.0.0 to 22.14.0
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/release-please-config.json)
- [Commits](https://github.com/puppeteer/puppeteer/compare/v14.0.0...puppeteer-v22.14.0)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
- dependency-name: puppeteer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/test-e2e/package-lock.json | 1233 +++++++++++++++++++++++--------
 test/test-e2e/package.json      |    2 +-
 test/test-e2e/yarn.lock         |  549 ++++++++++----
 3 files changed, 1331 insertions(+), 453 deletions(-)

diff --git a/test/test-e2e/package-lock.json b/test/test-e2e/package-lock.json
index bc48f0f2..8650295c 100644
--- a/test/test-e2e/package-lock.json
+++ b/test/test-e2e/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "jest": "^28.1.0",
-        "puppeteer": "14.0.0",
+        "puppeteer": "22.14.0",
         "ts-jest": "^28.0.2",
         "typescript": "^4.6.4"
       },
@@ -904,6 +904,38 @@
         "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
+    "node_modules/@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
+      "dependencies": {
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@puppeteer/browsers/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.24.51",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
@@ -925,6 +957,11 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
+    },
     "node_modules/@types/babel__core": {
       "version": "7.1.20",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz",
@@ -1045,23 +1082,23 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
     },
     "node_modules/@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "optional": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "dependencies": {
-        "debug": "4"
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 14"
       }
     },
     "node_modules/aggregate-error": {
@@ -1142,6 +1179,17 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -1151,6 +1199,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
+    },
     "node_modules/babel-jest": {
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz",
@@ -1242,6 +1295,47 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "optional": true,
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
+      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "optional": true
+    },
+    "node_modules/bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "node_modules/bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "optional": true,
+      "dependencies": {
+        "streamx": "^2.18.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -1261,14 +1355,12 @@
         }
       ]
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
     "node_modules/brace-expansion": {
@@ -1436,10 +1528,18 @@
         "node": ">=10"
       }
     },
-    "node_modules/chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    "node_modules/chromium-bidi": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz",
+      "integrity": "sha512-4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==",
+      "dependencies": {
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
     },
     "node_modules/ci-info": {
       "version": "3.7.0",
@@ -1575,14 +1675,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-      "dependencies": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -1596,10 +1688,18 @@
         "node": ">= 8"
       }
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1625,6 +1725,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -1634,9 +1747,9 @@
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.982423",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz",
-      "integrity": "sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA=="
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA=="
     },
     "node_modules/diff": {
       "version": "4.0.2",
@@ -1697,6 +1810,14 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -1721,6 +1842,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
     "node_modules/eslint-plugin-prettier": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz",
@@ -1755,6 +1896,22 @@
         "node": ">=4"
       }
     },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -1839,6 +1996,11 @@
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -1883,10 +2045,18 @@
         "node": ">=8"
       }
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    "node_modules/fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
@@ -1952,6 +2122,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -2008,16 +2192,28 @@
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
     },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dependencies": {
-        "agent-base": "6",
+        "agent-base": "^7.0.2",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/human-signals": {
@@ -2063,7 +2259,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -2079,7 +2274,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -2133,6 +2327,23 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -3132,6 +3343,11 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3159,6 +3375,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -3447,6 +3674,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+    },
     "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -3459,11 +3691,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3474,23 +3701,12 @@
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">= 0.4.0"
       }
     },
     "node_modules/node-int64": {
@@ -3606,11 +3822,40 @@
         "node": ">=6"
       }
     },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.5",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -3797,6 +4042,32 @@
         "node": ">= 6"
       }
     },
+    "node_modules/proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -3812,48 +4083,104 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.0.0.tgz",
-      "integrity": "sha512-Aj/cySGBMWpUYEWV0YOcwyhq5lOxuuiGScgdj/OvslAm/ydoywiI8OzAIXT4HzKmNTmzm/fKKHHtcsQa/fFgdw==",
-      "deprecated": "< 19.4.0 is no longer supported",
+      "version": "22.14.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz",
+      "integrity": "sha512-MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==",
       "hasInstallScript": true,
       "dependencies": {
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.982423",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.6.0"
+        "@puppeteer/browsers": "2.3.0",
+        "cosmiconfig": "^9.0.0",
+        "devtools-protocol": "0.0.1312386",
+        "puppeteer-core": "22.14.0"
+      },
+      "bin": {
+        "puppeteer": "lib/esm/puppeteer/node/cli.js"
       },
       "engines": {
-        "node": ">=14.1.0"
+        "node": ">=18"
       }
     },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
+    "node_modules/puppeteer-core": {
+      "version": "22.14.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz",
+      "integrity": "sha512-rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==",
+      "dependencies": {
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.2",
+        "debug": "^4.3.5",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+    "node_modules/puppeteer/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/puppeteer/node_modules/cosmiconfig": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/puppeteer/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/puppeteer/node_modules/typescript": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
       }
     },
+    "node_modules/queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -3947,25 +4274,6 @@
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -4031,6 +4339,41 @@
         "node": ">=8"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "dependencies": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4064,12 +4407,17 @@
         "node": ">=10"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "node_modules/streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
       "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
+      },
+      "optionalDependencies": {
+        "bare-events": "^2.2.0"
       }
     },
     "node_modules/string-argv": {
@@ -4193,29 +4541,26 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "dependencies": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
+      },
+      "optionalDependencies": {
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0"
       }
     },
     "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "engines": {
-        "node": ">=6"
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "node_modules/terminal-link": {
@@ -4246,6 +4591,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/text-decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
+      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -4275,11 +4628,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "node_modules/ts-jest": {
       "version": "28.0.8",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz",
@@ -4339,8 +4687,7 @@
     "node_modules/tslib": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
-      "dev": true
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "node_modules/tslint": {
       "version": "6.1.3",
@@ -4559,6 +4906,14 @@
         "through": "^2.3.8"
       }
     },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
@@ -4584,10 +4939,10 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    "node_modules/urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
     },
     "node_modules/v8-to-istanbul": {
       "version": "9.0.1",
@@ -4610,20 +4965,6 @@
         "makeerror": "1.0.12"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4672,15 +5013,15 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -4714,9 +5055,9 @@
       }
     },
     "node_modules/yargs": {
-      "version": "17.6.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
-      "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -4757,6 +5098,14 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   },
   "dependencies": {
@@ -5420,6 +5769,28 @@
         "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
+    "@puppeteer/browsers": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
+      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
+      "requires": {
+        "debug": "^4.3.5",
+        "extract-zip": "^2.0.1",
+        "progress": "^2.0.3",
+        "proxy-agent": "^6.4.0",
+        "semver": "^7.6.3",
+        "tar-fs": "^3.0.6",
+        "unbzip2-stream": "^1.4.3",
+        "yargs": "^17.7.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
+        }
+      }
+    },
     "@sinclair/typebox": {
       "version": "0.24.51",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
@@ -5441,6 +5812,11 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
+    },
     "@types/babel__core": {
       "version": "7.1.20",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz",
@@ -5561,20 +5937,20 @@
       "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
     },
     "@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "optional": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
       "requires": {
-        "debug": "4"
+        "debug": "^4.3.4"
       }
     },
     "aggregate-error": {
@@ -5631,12 +6007,25 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "requires": {
+        "tslib": "^2.0.1"
+      }
+    },
     "astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
+    "b4a": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
+      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
+    },
     "babel-jest": {
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz",
@@ -5707,20 +6096,56 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "optional": true
+    },
+    "bare-fs": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
+      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "optional": true,
+      "requires": {
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
+      }
+    },
+    "bare-os": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
+      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "optional": true
+    },
+    "bare-path": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
+      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "optional": true,
+      "requires": {
+        "bare-os": "^2.1.0"
+      }
+    },
+    "bare-stream": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
+      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "optional": true,
+      "requires": {
+        "streamx": "^2.18.0"
+      }
+    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
+    "basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg=="
     },
     "brace-expansion": {
       "version": "1.1.11",
@@ -5820,10 +6245,15 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
     },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    "chromium-bidi": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz",
+      "integrity": "sha512-4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==",
+      "requires": {
+        "mitt": "3.0.1",
+        "urlpattern-polyfill": "10.0.0",
+        "zod": "3.23.8"
+      }
     },
     "ci-info": {
       "version": "3.7.0",
@@ -5928,14 +6358,6 @@
         "yaml": "^1.10.0"
       }
     },
-    "cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
-      "requires": {
-        "node-fetch": "2.6.7"
-      }
-    },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -5946,10 +6368,15 @@
         "which": "^2.0.1"
       }
     },
+    "data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw=="
+    },
     "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -5964,15 +6391,25 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
     },
+    "degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "requires": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      }
+    },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
     },
     "devtools-protocol": {
-      "version": "0.0.982423",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz",
-      "integrity": "sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA=="
+      "version": "0.0.1312386",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA=="
     },
     "diff": {
       "version": "4.0.2",
@@ -6018,6 +6455,11 @@
         "ansi-colors": "^4.1.1"
       }
     },
+    "env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -6036,6 +6478,17 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
     },
+    "escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "source-map": "~0.6.1"
+      }
+    },
     "eslint-plugin-prettier": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz",
@@ -6059,6 +6512,16 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
     "execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -6119,6 +6582,11 @@
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
+    "fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -6157,10 +6625,15 @@
         "path-exists": "^4.0.0"
       }
     },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    "fs-extra": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
     },
     "fs.realpath": {
       "version": "1.0.0",
@@ -6204,6 +6677,17 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
     },
+    "get-uri": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
+      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
+      "requires": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^11.2.0"
+      }
+    },
     "glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -6245,12 +6729,21 @@
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
     },
+    "http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "requires": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      }
+    },
     "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "requires": {
-        "agent-base": "6",
+        "agent-base": "^7.0.2",
         "debug": "4"
       }
     },
@@ -6274,7 +6767,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -6283,8 +6775,7 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
@@ -6322,6 +6813,22 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+    "ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "requires": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+          "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+        }
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -7067,6 +7574,11 @@
         "esprima": "^4.0.0"
       }
     },
+    "jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -7082,6 +7594,15 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
       "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
     },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
     "kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -7291,6 +7812,11 @@
       "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
       "dev": true
     },
+    "mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+    },
     "mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -7300,11 +7826,6 @@
         "minimist": "^1.2.6"
       }
     },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -7315,13 +7836,10 @@
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
+    "netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
     },
     "node-int64": {
       "version": "0.4.0",
@@ -7402,11 +7920,34 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
+    "pac-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
+      "requires": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.5",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.4"
+      }
+    },
+    "pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "requires": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      }
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "requires": {
         "callsites": "^3.0.0"
       }
@@ -7541,6 +8082,28 @@
         "sisteransi": "^1.0.5"
       }
     },
+    "proxy-agent": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
+      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
+      "requires": {
+        "agent-base": "^7.0.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.3",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.0.1",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.2"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
+        }
+      }
+    },
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -7556,40 +8119,72 @@
       }
     },
     "puppeteer": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-14.0.0.tgz",
-      "integrity": "sha512-Aj/cySGBMWpUYEWV0YOcwyhq5lOxuuiGScgdj/OvslAm/ydoywiI8OzAIXT4HzKmNTmzm/fKKHHtcsQa/fFgdw==",
-      "requires": {
-        "cross-fetch": "3.1.5",
-        "debug": "4.3.4",
-        "devtools-protocol": "0.0.982423",
-        "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.1",
-        "pkg-dir": "4.2.0",
-        "progress": "2.0.3",
-        "proxy-from-env": "1.1.0",
-        "rimraf": "3.0.2",
-        "tar-fs": "2.1.1",
-        "unbzip2-stream": "1.4.3",
-        "ws": "8.6.0"
+      "version": "22.14.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz",
+      "integrity": "sha512-MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==",
+      "requires": {
+        "@puppeteer/browsers": "2.3.0",
+        "cosmiconfig": "^9.0.0",
+        "devtools-protocol": "0.0.1312386",
+        "puppeteer-core": "22.14.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        },
+        "cosmiconfig": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
+          "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+          "requires": {
+            "env-paths": "^2.2.1",
+            "import-fresh": "^3.3.0",
+            "js-yaml": "^4.1.0",
+            "parse-json": "^5.2.0"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "typescript": {
+          "version": "5.5.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+          "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+          "optional": true,
+          "peer": true
+        }
       }
     },
+    "puppeteer-core": {
+      "version": "22.14.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz",
+      "integrity": "sha512-rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==",
+      "requires": {
+        "@puppeteer/browsers": "2.3.0",
+        "chromium-bidi": "0.6.2",
+        "debug": "^4.3.5",
+        "devtools-protocol": "0.0.1312386",
+        "ws": "^8.18.0"
+      }
+    },
+    "queue-tick": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+    },
     "react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -7656,11 +8251,6 @@
         "tslib": "^2.1.0"
       }
     },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -7711,6 +8301,30 @@
         "is-fullwidth-code-point": "^3.0.0"
       }
     },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
+    },
+    "socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "requires": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
+      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "requires": {
+        "agent-base": "^7.1.1",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      }
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7738,12 +8352,15 @@
         "escape-string-regexp": "^2.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+    "streamx": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
+      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
       "requires": {
-        "safe-buffer": "~5.2.0"
+        "bare-events": "^2.2.0",
+        "fast-fifo": "^1.3.2",
+        "queue-tick": "^1.0.1",
+        "text-decoder": "^1.1.0"
       }
     },
     "string-argv": {
@@ -7828,26 +8445,24 @@
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
     },
     "tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
+      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
       "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
+        "bare-fs": "^2.1.1",
+        "bare-path": "^2.1.0",
         "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
+        "tar-stream": "^3.1.5"
       }
     },
     "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "requires": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
       }
     },
     "terminal-link": {
@@ -7869,6 +8484,14 @@
         "minimatch": "^3.0.4"
       }
     },
+    "text-decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
+      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
+      "requires": {
+        "b4a": "^1.6.4"
+      }
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -7892,11 +8515,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "ts-jest": {
       "version": "28.0.8",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz",
@@ -7925,8 +8543,7 @@
     "tslib": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
-      "dev": true
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
     },
     "tslint": {
       "version": "6.1.3",
@@ -8091,6 +8708,11 @@
         "through": "^2.3.8"
       }
     },
+    "universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="
+    },
     "update-browserslist-db": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
@@ -8100,10 +8722,10 @@
         "picocolors": "^1.0.0"
       }
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    "urlpattern-polyfill": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
+      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
     },
     "v8-to-istanbul": {
       "version": "9.0.1",
@@ -8123,20 +8745,6 @@
         "makeerror": "1.0.12"
       }
     },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -8170,9 +8778,9 @@
       }
     },
     "ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "requires": {}
     },
     "y18n": {
@@ -8192,9 +8800,9 @@
       "dev": true
     },
     "yargs": {
-      "version": "17.6.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
-      "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "requires": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -8223,6 +8831,11 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
+    },
+    "zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g=="
     }
   }
 }
diff --git a/test/test-e2e/package.json b/test/test-e2e/package.json
index ff5f8a22..3760a824 100644
--- a/test/test-e2e/package.json
+++ b/test/test-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Filippo Ledda <filippo@metacell.us>",
   "dependencies": {
     "jest": "^28.1.0",
-    "puppeteer": "14.0.0",
+    "puppeteer": "22.14.0",
     "ts-jest": "^28.0.2",
     "typescript": "^4.6.4"
   },
diff --git a/test/test-e2e/yarn.lock b/test/test-e2e/yarn.lock
index fc69b2de..f3873bfd 100644
--- a/test/test-e2e/yarn.lock
+++ b/test/test-e2e/yarn.lock
@@ -550,6 +550,20 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@puppeteer/browsers@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.3.0.tgz#791ea7d80450fea24eb19fb1d70c367ad4e08cae"
+  integrity sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==
+  dependencies:
+    debug "^4.3.5"
+    extract-zip "^2.0.1"
+    progress "^2.0.3"
+    proxy-agent "^6.4.0"
+    semver "^7.6.3"
+    tar-fs "^3.0.6"
+    unbzip2-stream "^1.4.3"
+    yargs "^17.7.2"
+
 "@sinclair/typebox@^0.24.1":
   version "0.24.51"
   resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz"
@@ -569,6 +583,11 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@tootallnate/quickjs-emscripten@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz#db4ecfd499a9765ab24002c3b696d02e6d32a12c"
+  integrity sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==
+
 "@types/babel__core@^7.1.14":
   version "7.1.20"
   resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz"
@@ -689,12 +708,12 @@
   dependencies:
     "@types/node" "*"
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
-    debug "4"
+    debug "^4.3.4"
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -755,11 +774,28 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+ast-types@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
+  integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==
+  dependencies:
+    tslib "^2.0.1"
+
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+b4a@^1.6.4:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba"
+  integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==
+
 babel-jest@^28.1.3:
   version "28.1.3"
   resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz"
@@ -825,19 +861,48 @@ balanced-match@^1.0.0:
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+bare-events@^2.0.0, bare-events@^2.2.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.4.2.tgz#3140cca7a0e11d49b3edc5041ab560659fd8e1f8"
+  integrity sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==
+
+bare-fs@^2.1.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.3.1.tgz#cdbd63dac7a552dfb2b87d18c822298d1efd213d"
+  integrity sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==
+  dependencies:
+    bare-events "^2.0.0"
+    bare-path "^2.0.0"
+    bare-stream "^2.0.0"
+
+bare-os@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.4.0.tgz#5de5e3ba7704f459c9656629edca7cc736e06608"
+  integrity sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==
+
+bare-path@^2.0.0, bare-path@^2.1.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.3.tgz#594104c829ef660e43b5589ec8daef7df6cedb3e"
+  integrity sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==
+  dependencies:
+    bare-os "^2.1.0"
+
+bare-stream@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.1.3.tgz#070b69919963a437cc9e20554ede079ce0a129b2"
+  integrity sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==
+  dependencies:
+    streamx "^2.18.0"
+
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-bl@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
+basic-ftp@^5.0.2:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.5.tgz#14a474f5fffecca1f4f406f1c26b18f800225ac0"
+  integrity sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -888,7 +953,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.2.1, buffer@^5.5.0:
+buffer@^5.2.1:
   version "5.7.1"
   resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -943,10 +1008,14 @@ char-regex@^1.0.2:
   resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+chromium-bidi@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.6.2.tgz#91f9daa20984833b52221084480fbe0465b29c67"
+  integrity sha512-4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==
+  dependencies:
+    mitt "3.0.1"
+    urlpattern-polyfill "10.0.0"
+    zod "3.23.8"
 
 ci-info@^3.2.0:
   version "3.7.0"
@@ -1057,12 +1126,15 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cross-fetch@3.1.5:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+cosmiconfig@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
+  integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
   dependencies:
-    node-fetch "2.6.7"
+    env-paths "^2.2.1"
+    import-fresh "^3.3.0"
+    js-yaml "^4.1.0"
+    parse-json "^5.2.0"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
@@ -1073,13 +1145,25 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
+data-uri-to-buffer@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz#8a58bb67384b261a38ef18bea1810cb01badd28b"
+  integrity sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==
+
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.4, debug@^4.3.5:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+  dependencies:
+    ms "2.1.2"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"
@@ -1090,15 +1174,24 @@ deepmerge@^4.2.2:
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+degenerator@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-5.0.1.tgz#9403bf297c6dad9a1ece409b37db27954f91f2f5"
+  integrity sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==
+  dependencies:
+    ast-types "^0.13.4"
+    escodegen "^2.1.0"
+    esprima "^4.0.1"
+
 detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-devtools-protocol@0.0.982423:
-  version "0.0.982423"
-  resolved "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.982423.tgz"
-  integrity sha512-FnVW2nDbjGNw1uD/JRC+9U5768W7e1TfUwqbDTcSsAu1jXFjITSX8w3rkW5FEpHRMPPGpvNSmO1pOpqByiWscA==
+devtools-protocol@0.0.1312386:
+  version "0.0.1312386"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz#5ab824d6f1669ec6c6eb0fba047e73601d969052"
+  integrity sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==
 
 diff-sequences@^26.6.2:
   version "26.6.2"
@@ -1130,7 +1223,7 @@ emoji-regex@^8.0.0:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -1144,6 +1237,11 @@ enquirer@^2.3.6:
   dependencies:
     ansi-colors "^4.1.1"
 
+env-paths@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
@@ -1166,6 +1264,17 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escodegen@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^5.2.0"
+    esutils "^2.0.2"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-plugin-prettier@^2.2.0:
   version "2.7.0"
   resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz"
@@ -1174,11 +1283,21 @@ eslint-plugin-prettier@^2.2.0:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
 execa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"
@@ -1225,9 +1344,9 @@ expect@^28.1.3:
     jest-message-util "^28.1.3"
     jest-util "^28.1.3"
 
-extract-zip@2.0.1:
+extract-zip@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
     debug "^4.1.1"
@@ -1241,6 +1360,11 @@ fast-diff@^1.1.1:
   resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
+fast-fifo@^1.2.0, fast-fifo@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
@@ -1275,10 +1399,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+fs-extra@^11.2.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -1327,6 +1455,16 @@ get-stream@^6.0.0:
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-uri@^6.0.1:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.3.tgz#0d26697bc13cf91092e519aa63aa60ee5b6f385a"
+  integrity sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==
+  dependencies:
+    basic-ftp "^5.0.2"
+    data-uri-to-buffer "^6.0.2"
+    debug "^4.3.4"
+    fs-extra "^11.2.0"
+
 glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
@@ -1344,6 +1482,11 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
@@ -1371,12 +1514,20 @@ html-escaper@^2.0.0:
   resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-https-proxy-agent@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+https-proxy-agent@^7.0.3, https-proxy-agent@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
   dependencies:
-    agent-base "6"
+    agent-base "^7.0.2"
     debug "4"
 
 human-signals@^1.1.1:
@@ -1399,7 +1550,7 @@ ieee754@^1.1.13:
   resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-import-fresh@^3.2.1:
+import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -1433,11 +1584,19 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@^2.0.4:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ip-address@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
+  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
+  dependencies:
+    jsbn "1.1.0"
+    sprintf-js "^1.1.3"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
@@ -1923,6 +2082,18 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+jsbn@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
@@ -1938,6 +2109,15 @@ json5@^2.2.1:
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
@@ -2025,6 +2205,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.14.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
 make-dir@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
@@ -2074,10 +2259,10 @@ minimist@^1.2.6:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-mkdirp-classic@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+mitt@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
+  integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
 
 mkdirp@^0.5.3:
   version "0.5.6"
@@ -2096,12 +2281,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
+netmask@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
+  integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -2172,6 +2355,28 @@ p-try@^2.0.0:
   resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+pac-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz#0fb02496bd9fb8ae7eb11cfd98386daaac442f58"
+  integrity sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==
+  dependencies:
+    "@tootallnate/quickjs-emscripten" "^0.23.0"
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    get-uri "^6.0.1"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.5"
+    pac-resolver "^7.0.1"
+    socks-proxy-agent "^8.0.4"
+
+pac-resolver@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-7.0.1.tgz#54675558ea368b64d210fd9c92a640b5f3b8abb6"
+  integrity sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==
+  dependencies:
+    degenerator "^5.0.0"
+    netmask "^2.0.2"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
@@ -2234,7 +2439,7 @@ pirates@^4.0.4:
   resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"
   integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
 
-pkg-dir@4.2.0, pkg-dir@^4.2.0:
+pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -2273,9 +2478,9 @@ pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-progress@2.0.3:
+progress@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 prompts@^2.0.1:
@@ -2286,9 +2491,23 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-proxy-from-env@1.1.0:
+proxy-agent@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.4.0.tgz#b4e2dd51dee2b377748aef8d45604c2d7608652d"
+  integrity sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    http-proxy-agent "^7.0.1"
+    https-proxy-agent "^7.0.3"
+    lru-cache "^7.14.1"
+    pac-proxy-agent "^7.0.1"
+    proxy-from-env "^1.1.0"
+    socks-proxy-agent "^8.0.2"
+
+proxy-from-env@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 pump@^3.0.0:
@@ -2299,23 +2518,31 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-puppeteer@14.0.0:
-  version "14.0.0"
-  resolved "https://registry.npmjs.org/puppeteer/-/puppeteer-14.0.0.tgz"
-  integrity sha512-Aj/cySGBMWpUYEWV0YOcwyhq5lOxuuiGScgdj/OvslAm/ydoywiI8OzAIXT4HzKmNTmzm/fKKHHtcsQa/fFgdw==
-  dependencies:
-    cross-fetch "3.1.5"
-    debug "4.3.4"
-    devtools-protocol "0.0.982423"
-    extract-zip "2.0.1"
-    https-proxy-agent "5.0.1"
-    pkg-dir "4.2.0"
-    progress "2.0.3"
-    proxy-from-env "1.1.0"
-    rimraf "3.0.2"
-    tar-fs "2.1.1"
-    unbzip2-stream "1.4.3"
-    ws "8.6.0"
+puppeteer-core@22.14.0:
+  version "22.14.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-22.14.0.tgz#5bb466adba725c966b0a86f0337a476d4c68ebec"
+  integrity sha512-rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==
+  dependencies:
+    "@puppeteer/browsers" "2.3.0"
+    chromium-bidi "0.6.2"
+    debug "^4.3.5"
+    devtools-protocol "0.0.1312386"
+    ws "^8.18.0"
+
+puppeteer@22.14.0:
+  version "22.14.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-22.14.0.tgz#11697c929f5d9d7eac5a3438a0ff12dc65aedcbe"
+  integrity sha512-MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==
+  dependencies:
+    "@puppeteer/browsers" "2.3.0"
+    cosmiconfig "^9.0.0"
+    devtools-protocol "0.0.1312386"
+    puppeteer-core "22.14.0"
+
+queue-tick@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
+  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
 
 react-is@^17.0.1:
   version "17.0.2"
@@ -2327,15 +2554,6 @@ react-is@^18.0.0:
   resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
@@ -2385,7 +2603,7 @@ rfdc@^1.3.0:
   resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@3.0.2, rimraf@^3.0.0:
+rimraf@^3.0.0:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -2399,11 +2617,6 @@ rxjs@^7.5.1:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 semver-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"
@@ -2426,6 +2639,11 @@ semver@^6.0.0, semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.6.3:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
@@ -2471,6 +2689,28 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+smart-buffer@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
+socks-proxy-agent@^8.0.2, socks-proxy-agent@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz#9071dca17af95f483300316f4b063578fa0db08c"
+  integrity sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==
+  dependencies:
+    agent-base "^7.1.1"
+    debug "^4.3.4"
+    socks "^2.8.3"
+
+socks@^2.8.3:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
+  dependencies:
+    ip-address "^9.0.5"
+    smart-buffer "^4.2.0"
+
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"
@@ -2479,11 +2719,16 @@ source-map-support@0.5.13:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+sprintf-js@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
@@ -2496,6 +2741,17 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
+streamx@^2.15.0, streamx@^2.18.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.18.0.tgz#5bc1a51eb412a667ebfdcd4e6cf6a6fc65721ac7"
+  integrity sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==
+  dependencies:
+    fast-fifo "^1.3.2"
+    queue-tick "^1.0.1"
+    text-decoder "^1.1.0"
+  optionalDependencies:
+    bare-events "^2.2.0"
+
 string-argv@0.3.1:
   version "0.3.1"
   resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"
@@ -2518,13 +2774,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 stringify-object@^3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
@@ -2590,26 +2839,25 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-tar-fs@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+tar-fs@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.6.tgz#eaccd3a67d5672f09ca8e8f9c3d2b89fa173f217"
+  integrity sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==
   dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
     pump "^3.0.0"
-    tar-stream "^2.1.4"
+    tar-stream "^3.1.5"
+  optionalDependencies:
+    bare-fs "^2.1.1"
+    bare-path "^2.1.0"
 
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+tar-stream@^3.1.5:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b"
+  integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==
   dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
+    b4a "^1.6.4"
+    fast-fifo "^1.2.0"
+    streamx "^2.15.0"
 
 terminal-link@^2.0.0:
   version "2.1.1"
@@ -2628,6 +2876,13 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
+text-decoder@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.1.1.tgz#5df9c224cebac4a7977720b9f083f9efa1aefde8"
+  integrity sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==
+  dependencies:
+    b4a "^1.6.4"
+
 through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
@@ -2650,11 +2905,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 ts-jest@^28.0.2:
   version "28.0.8"
   resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz"
@@ -2674,6 +2924,11 @@ tslib@^1.13.0, tslib@^1.7.1, tslib@^1.8.1:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+
 tslib@^2.1.0:
   version "2.4.1"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"
@@ -2734,14 +2989,19 @@ typescript@^4.6.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"
   integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
 
-unbzip2-stream@1.4.3:
+unbzip2-stream@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
   integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
   dependencies:
     buffer "^5.2.1"
     through "^2.3.8"
 
+universalify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
+
 update-browserslist-db@^1.0.9:
   version "1.0.10"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
@@ -2750,10 +3010,10 @@ update-browserslist-db@^1.0.9:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-util-deprecate@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+urlpattern-polyfill@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec"
+  integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==
 
 v8-to-istanbul@^9.0.1:
   version "9.0.1"
@@ -2771,19 +3031,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
@@ -2822,10 +3069,10 @@ write-file-atomic@^4.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-ws@8.6.0:
-  version "8.6.0"
-  resolved "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
+ws@^8.18.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
 
 y18n@^5.0.5:
   version "5.0.8"
@@ -2860,6 +3107,19 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
@@ -2872,3 +3132,8 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zod@3.23.8:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==

From 7692d9b63391a418a75c210b610a3492cc31cd1a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 30 Jul 2024 16:37:18 +0200
Subject: [PATCH 116/210] update test requirement

---
 applications/common/server/test-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/common/server/test-requirements.txt b/applications/common/server/test-requirements.txt
index f8f951d7..051bf840 100644
--- a/applications/common/server/test-requirements.txt
+++ b/applications/common/server/test-requirements.txt
@@ -5,4 +5,4 @@ Flask-Testing==0.8.0
 psycopg2-binary==2.8.5
 Flask-SQLAlchemy==2.4.3
 SQLAlchemy==1.3.17
-requests==2.21.0
+requests>=2.21.0

From 305fd30501fe132fbd2afdc12755fcabeb013c2f Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 12 Aug 2024 12:13:19 +0100
Subject: [PATCH 117/210] CH-142 Added harness configuration for dockerfile
 build args

---
 docs/model/DockerfileConfig.md                | 30 +++++++++
 docs/model/HarnessMainConfig.md               |  1 +
 libraries/models/api/openapi.yaml             |  9 +++
 .../cloudharness_model/models/__init__.py     |  1 +
 .../models/dockerfile_config.py               | 63 +++++++++++++++++++
 .../models/harness_main_config.py             | 34 +++++++++-
 6 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 docs/model/DockerfileConfig.md
 create mode 100644 libraries/models/cloudharness_model/models/dockerfile_config.py

diff --git a/docs/model/DockerfileConfig.md b/docs/model/DockerfileConfig.md
new file mode 100644
index 00000000..5b192526
--- /dev/null
+++ b/docs/model/DockerfileConfig.md
@@ -0,0 +1,30 @@
+# DockerfileConfig
+
+Configuration for a dockerfile
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**build_args** | **Dict[str, object]** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_model.models.dockerfile_config import DockerfileConfig
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of DockerfileConfig from a JSON string
+dockerfile_config_instance = DockerfileConfig.from_json(json)
+# print the JSON string representation of the object
+print DockerfileConfig.to_json()
+
+# convert the object into a dict
+dockerfile_config_dict = dockerfile_config_instance.to_dict()
+# create an instance of DockerfileConfig from a dict
+dockerfile_config_form_dict = dockerfile_config.from_dict(dockerfile_config_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/docs/model/HarnessMainConfig.md b/docs/model/HarnessMainConfig.md
index 5cecf052..076c6faf 100644
--- a/docs/model/HarnessMainConfig.md
+++ b/docs/model/HarnessMainConfig.md
@@ -21,6 +21,7 @@ Name | Type | Description | Notes
 **task_images** | **Dict[str, object]** |  | [optional] 
 **build_hash** | **str** |  | [optional] 
 **envmap** | **Dict[str, object]** |  | [optional] 
+**dockerfile** | **object** | Configuration for the dockerfile used to build the app | [optional] 
 
 ## Example
 
diff --git a/libraries/models/api/openapi.yaml b/libraries/models/api/openapi.yaml
index 3b115091..0da196b0 100644
--- a/libraries/models/api/openapi.yaml
+++ b/libraries/models/api/openapi.yaml
@@ -802,6 +802,8 @@ components:
                 envmap:
                     $ref: '#/components/schemas/SimpleMap'
                     description: Environmental variables added to all pods
+                dockerfile:
+                    description: Configuration for the dockerfile used to build the app
             additionalProperties: true
         SimpleMap:
             description: ''
@@ -877,3 +879,10 @@ components:
                 -
                     $ref: '#/components/schemas/AutoArtifactSpec'
             additionalAttributes: true
+        DockerfileConfig:
+            description: Configuration for a dockerfile
+            type: object
+            properties:
+                buildArgs:
+                    $ref: '#/components/schemas/SimpleMap'
+                    description: Map of build arguments to provide to the dockerfile at build time
diff --git a/libraries/models/cloudharness_model/models/__init__.py b/libraries/models/cloudharness_model/models/__init__.py
index 488c3e6f..13238dc7 100644
--- a/libraries/models/cloudharness_model/models/__init__.py
+++ b/libraries/models/cloudharness_model/models/__init__.py
@@ -17,6 +17,7 @@
 from cloudharness_model.models.deployment_auto_artifact_config import DeploymentAutoArtifactConfig
 from cloudharness_model.models.deployment_resources_conf import DeploymentResourcesConf
 from cloudharness_model.models.deployment_volume_spec import DeploymentVolumeSpec
+from cloudharness_model.models.dockerfile_config import DockerfileConfig
 from cloudharness_model.models.e2_e_tests_config import E2ETestsConfig
 from cloudharness_model.models.file_resources_config import FileResourcesConfig
 from cloudharness_model.models.git_dependency_config import GitDependencyConfig
diff --git a/libraries/models/cloudharness_model/models/dockerfile_config.py b/libraries/models/cloudharness_model/models/dockerfile_config.py
new file mode 100644
index 00000000..4dde44cb
--- /dev/null
+++ b/libraries/models/cloudharness_model/models/dockerfile_config.py
@@ -0,0 +1,63 @@
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from cloudharness_model.models.base_model_ import Model
+from cloudharness_model import util
+
+
+class DockerfileConfig(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, build_args=None):  # noqa: E501
+        """DockerfileConfig - a model defined in OpenAPI
+
+        :param build_args: The build_args of this DockerfileConfig.  # noqa: E501
+        :type build_args: Dict[str, object]
+        """
+        self.openapi_types = {
+            'build_args': Dict[str, object]
+        }
+
+        self.attribute_map = {
+            'build_args': 'buildArgs'
+        }
+
+        self._build_args = build_args
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DockerfileConfig':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DockerfileConfig of this DockerfileConfig.  # noqa: E501
+        :rtype: DockerfileConfig
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def build_args(self) -> Dict[str, object]:
+        """Gets the build_args of this DockerfileConfig.
+
+          # noqa: E501
+
+        :return: The build_args of this DockerfileConfig.
+        :rtype: Dict[str, object]
+        """
+        return self._build_args
+
+    @build_args.setter
+    def build_args(self, build_args: Dict[str, object]):
+        """Sets the build_args of this DockerfileConfig.
+
+          # noqa: E501
+
+        :param build_args: The build_args of this DockerfileConfig.
+        :type build_args: Dict[str, object]
+        """
+
+        self._build_args = build_args
diff --git a/libraries/models/cloudharness_model/models/harness_main_config.py b/libraries/models/cloudharness_model/models/harness_main_config.py
index ea8b7478..5019fe54 100644
--- a/libraries/models/cloudharness_model/models/harness_main_config.py
+++ b/libraries/models/cloudharness_model/models/harness_main_config.py
@@ -20,7 +20,7 @@ class HarnessMainConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=None, mainapp=None, registry=None, tag=None, apps=None, env=None, privenv=None, backup=None, name=None, task_images=None, build_hash=None, envmap=None):  # noqa: E501
+    def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=None, mainapp=None, registry=None, tag=None, apps=None, env=None, privenv=None, backup=None, name=None, task_images=None, build_hash=None, envmap=None, dockerfile=None):  # noqa: E501
         """HarnessMainConfig - a model defined in OpenAPI
 
         :param local: The local of this HarnessMainConfig.  # noqa: E501
@@ -53,6 +53,8 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
         :type build_hash: str
         :param envmap: The envmap of this HarnessMainConfig.  # noqa: E501
         :type envmap: Dict[str, object]
+        :param dockerfile: The dockerfile of this HarnessMainConfig.  # noqa: E501
+        :type dockerfile: object
         """
         self.openapi_types = {
             'local': bool,
@@ -69,7 +71,8 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
             'name': str,
             'task_images': Dict[str, object],
             'build_hash': str,
-            'envmap': Dict[str, object]
+            'envmap': Dict[str, object],
+            'dockerfile': object
         }
 
         self.attribute_map = {
@@ -87,7 +90,8 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
             'name': 'name',
             'task_images': 'task-images',
             'build_hash': 'build_hash',
-            'envmap': 'envmap'
+            'envmap': 'envmap',
+            'dockerfile': 'dockerfile'
         }
 
         self._local = local
@@ -105,6 +109,7 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
         self._task_images = task_images
         self._build_hash = build_hash
         self._envmap = envmap
+        self._dockerfile = dockerfile
 
     @classmethod
     def from_dict(cls, dikt) -> 'HarnessMainConfig':
@@ -467,3 +472,26 @@ def envmap(self, envmap: Dict[str, object]):
         """
 
         self._envmap = envmap
+
+    @property
+    def dockerfile(self) -> object:
+        """Gets the dockerfile of this HarnessMainConfig.
+
+        Configuration for the dockerfile used to build the app  # noqa: E501
+
+        :return: The dockerfile of this HarnessMainConfig.
+        :rtype: object
+        """
+        return self._dockerfile
+
+    @dockerfile.setter
+    def dockerfile(self, dockerfile: object):
+        """Sets the dockerfile of this HarnessMainConfig.
+
+        Configuration for the dockerfile used to build the app  # noqa: E501
+
+        :param dockerfile: The dockerfile of this HarnessMainConfig.
+        :type dockerfile: object
+        """
+
+        self._dockerfile = dockerfile

From 09b194944118816881019ffad14d3c969e951e90 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 12 Aug 2024 14:39:43 +0100
Subject: [PATCH 118/210] CH-142 Updated cloud harness model to accurately
 match the way values are defined

---
 docs/model/ApplicationHarnessConfig.md        |   3 +
 docs/model/HarnessMainConfig.md               |   4 +-
 libraries/models/api/openapi.yaml             | 346 +++++++++---------
 .../models/application_harness_config.py      |  92 ++++-
 .../models/harness_main_config.py             |  66 +---
 5 files changed, 274 insertions(+), 237 deletions(-)

diff --git a/docs/model/ApplicationHarnessConfig.md b/docs/model/ApplicationHarnessConfig.md
index 0d6fc57a..ed250e7e 100644
--- a/docs/model/ApplicationHarnessConfig.md
+++ b/docs/model/ApplicationHarnessConfig.md
@@ -27,6 +27,9 @@ Name | Type | Description | Notes
 **accounts** | [**ApplicationAccountsConfig**](ApplicationAccountsConfig.md) |  | [optional] 
 **test** | [**ApplicationTestConfig**](ApplicationTestConfig.md) |  | [optional] 
 **quotas** | **Dict[str, object]** |  | [optional] 
+**env** | [**List[NameValue]**](NameValue.md) | Environmental variables added to all containers (deprecated, please use envmap) | [optional] 
+**envmap** | **Dict[str, object]** |  | [optional] 
+**dockerfile** | [**DockerfileConfig**](DockerfileConfig.md) |  | [optional] 
 
 ## Example
 
diff --git a/docs/model/HarnessMainConfig.md b/docs/model/HarnessMainConfig.md
index 076c6faf..2034bcc0 100644
--- a/docs/model/HarnessMainConfig.md
+++ b/docs/model/HarnessMainConfig.md
@@ -14,14 +14,12 @@ Name | Type | Description | Notes
 **registry** | [**RegistryConfig**](RegistryConfig.md) |  | [optional] 
 **tag** | **str** | Docker tag used to push/pull the built images. | [optional] 
 **apps** | [**Dict[str, ApplicationConfig]**](ApplicationConfig.md) |  | 
-**env** | [**List[NameValue]**](NameValue.md) | Environmental variables added to all pods (deprecated, please use envmap) | [optional] 
+**env** | [**List[NameValue]**](NameValue.md) | Environmental variables added to all pods | [optional] 
 **privenv** | [**NameValue**](NameValue.md) |  | [optional] 
 **backup** | [**BackupConfig**](BackupConfig.md) |  | [optional] 
 **name** | **str** | Base name | [optional] 
 **task_images** | **Dict[str, object]** |  | [optional] 
 **build_hash** | **str** |  | [optional] 
-**envmap** | **Dict[str, object]** |  | [optional] 
-**dockerfile** | **object** | Configuration for the dockerfile used to build the app | [optional] 
 
 ## Example
 
diff --git a/libraries/models/api/openapi.yaml b/libraries/models/api/openapi.yaml
index 0da196b0..f7e74a42 100644
--- a/libraries/models/api/openapi.yaml
+++ b/libraries/models/api/openapi.yaml
@@ -399,112 +399,6 @@ components:
                 description:
                     description: General description -- for human consumption
                     type: string
-        ApplicationHarnessConfig:
-            description: |-
-                Define helm variables that allow CloudHarness to enable and configure your 
-                application's deployment
-            required: []
-            type: object
-            properties:
-                deployment:
-                    $ref: '#/components/schemas/DeploymentAutoArtifactConfig'
-                    description: Defines reference deployment parameters. Values maps to k8s spec
-                service:
-                    $ref: '#/components/schemas/ServiceAutoArtifactConfig'
-                    description: Defines automatic service parameters.
-                subdomain:
-                    description: 'If specified, an ingress will be created at [subdomain].[.Values.domain]'
-                    type: string
-                aliases:
-                    description: 'If specified, an ingress will be created at [alias].[.Values.domain] for each alias'
-                    type: array
-                    items:
-                        type: string
-                domain:
-                    description: 'If specified, an ingress will be created at [domain]'
-                    type: string
-                dependencies:
-                    $ref: '#/components/schemas/ApplicationDependenciesConfig'
-                    description: >-
-                        Application dependencies are used to define what is required in the deployment when
-                        --include (-i) is used. Specify application names in the list.
-                secured:
-                    description: 'When true, the application is shielded with a getekeeper'
-                    type: boolean
-                uri_role_mapping:
-                    description: 'Map uri/roles to secure with the Gatekeeper (if `secured: true`)'
-                    type: array
-                    items:
-                        $ref: '#/components/schemas/UriRoleMappingConfig'
-                secrets:
-                    $ref: '#/components/schemas/SimpleMap'
-                    description: |-
-                        Define secrets will be mounted in the deployment
-
-                        Define as
-
-                        ```yaml
-                        secrets:
-                            secret_name: 'value'
-
-                        ```
-
-                        Values if left empty are randomly generated
-                use_services:
-                    description: >-
-                        Specify which services this application uses in the frontend to create proxy
-                        ingresses. e.g. 
-
-                        ```
-
-                        - name: samples
-
-                        ```
-                    type: array
-                    items:
-                        type: string
-                database:
-                    $ref: '#/components/schemas/DatabaseDeploymentConfig'
-                    description: ''
-                resources:
-                    description: |-
-                        Application file resources. Maps from deploy/resources folder and mounts as
-                        configmaps
-                    type: array
-                    items:
-                        $ref: '#/components/schemas/FileResourcesConfig'
-                readinessProbe:
-                    $ref: '#/components/schemas/ApplicationProbe'
-                    description: Kubernetes readiness probe configuration
-                startupProbe:
-                    $ref: '#/components/schemas/ApplicationProbe'
-                    description: ''
-                livenessProbe:
-                    $ref: '#/components/schemas/ApplicationProbe'
-                    description: Kubernetes liveness probe configuration
-                sourceRoot:
-                    $ref: '#/components/schemas/Filename'
-                    description: ''
-                name:
-                    description: |-
-                        Application's name. Do not edit, the value is automatically set from the
-                        application directory's name
-                    type: string
-                jupyterhub:
-                    $ref: '#/components/schemas/JupyterHubConfig'
-                    description: |
-                        Configurations specific to jupyterhub. Edit only if your application is
-                        configured as a jupyterhub deployment
-                accounts:
-                    $ref: '#/components/schemas/ApplicationAccountsConfig'
-                    description: Define specific test users and roles for this application
-                test:
-                    $ref: '#/components/schemas/ApplicationTestConfig'
-                    description: Enable and configure automated testing for this application.
-                quotas:
-                    $ref: '#/components/schemas/Quota'
-                    description: ''
-            additionalProperties: true
         JupyterHubConfig:
             description: ''
             type: object
@@ -741,70 +635,6 @@ components:
                 name: my-files
                 size: 5Gi
                 usenfs: true
-        HarnessMainConfig:
-            description: ''
-            required:
-                - local
-                - secured_gatekeepers
-                - domain
-                - namespace
-                - mainapp
-                - apps
-            type: object
-            properties:
-                local:
-                    description: 'If set to true, local DNS mapping is added to pods.'
-                    type: boolean
-                secured_gatekeepers:
-                    description: >-
-                        Enables/disables Gatekeepers on secured applications. Set to false for
-                        testing/development
-                    type: boolean
-                domain:
-                    description: The root domain
-                    type: string
-                    example: The root domain.
-                namespace:
-                    description: The K8s namespace.
-                    type: string
-                mainapp:
-                    description: Defines the app to map to the root domain
-                    type: string
-                registry:
-                    $ref: '#/components/schemas/RegistryConfig'
-                    description: ''
-                tag:
-                    description: Docker tag used to push/pull the built images.
-                    type: string
-                apps:
-                    $ref: '#/components/schemas/ApplicationsConfigsMap'
-                    description: ''
-                env:
-                    description: 'Environmental variables added to all pods (deprecated, please use envmap)'
-                    type: array
-                    items:
-                        $ref: '#/components/schemas/NameValue'
-                privenv:
-                    $ref: '#/components/schemas/NameValue'
-                    description: Private environmental variables added to all pods
-                backup:
-                    $ref: '#/components/schemas/BackupConfig'
-                    description: ''
-                name:
-                    description: Base name
-                    type: string
-                task-images:
-                    $ref: '#/components/schemas/SimpleMap'
-                    description: ''
-                build_hash:
-                    description: ''
-                    type: string
-                envmap:
-                    $ref: '#/components/schemas/SimpleMap'
-                    description: Environmental variables added to all pods
-                dockerfile:
-                    description: Configuration for the dockerfile used to build the app
-            additionalProperties: true
         SimpleMap:
             description: ''
             type: object
@@ -886,3 +716,179 @@ components:
                 buildArgs:
                     $ref: '#/components/schemas/SimpleMap'
                     description: Map of build arguments to provide to the dockerfile at build time
+        HarnessMainConfig:
+            description: ''
+            required:
+                - local
+                - secured_gatekeepers
+                - domain
+                - namespace
+                - mainapp
+                - apps
+            type: object
+            properties:
+                local:
+                    description: 'If set to true, local DNS mapping is added to pods.'
+                    type: boolean
+                secured_gatekeepers:
+                    description: >-
+                        Enables/disables Gatekeepers on secured applications. Set to false for
+                        testing/development
+                    type: boolean
+                domain:
+                    description: The root domain
+                    type: string
+                    example: The root domain.
+                namespace:
+                    description: The K8s namespace.
+                    type: string
+                mainapp:
+                    description: Defines the app to map to the root domain
+                    type: string
+                registry:
+                    $ref: '#/components/schemas/RegistryConfig'
+                    description: ''
+                tag:
+                    description: Docker tag used to push/pull the built images.
+                    type: string
+                apps:
+                    $ref: '#/components/schemas/ApplicationsConfigsMap'
+                    description: ''
+                env:
+                    description: Environmental variables added to all pods
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/NameValue'
+                privenv:
+                    $ref: '#/components/schemas/NameValue'
+                    description: Private environmental variables added to all pods
+                backup:
+                    $ref: '#/components/schemas/BackupConfig'
+                    description: ''
+                name:
+                    description: Base name
+                    type: string
+                task-images:
+                    $ref: '#/components/schemas/SimpleMap'
+                    description: ''
+                build_hash:
+                    description: ''
+                    type: string
+            additionalProperties: true
+        ApplicationHarnessConfig:
+            description: |-
+                Define helm variables that allow CloudHarness to enable and configure your 
+                application's deployment
+            required: []
+            type: object
+            properties:
+                deployment:
+                    $ref: '#/components/schemas/DeploymentAutoArtifactConfig'
+                    description: Defines reference deployment parameters. Values maps to k8s spec
+                service:
+                    $ref: '#/components/schemas/ServiceAutoArtifactConfig'
+                    description: Defines automatic service parameters.
+                subdomain:
+                    description: 'If specified, an ingress will be created at [subdomain].[.Values.domain]'
+                    type: string
+                aliases:
+                    description: 'If specified, an ingress will be created at [alias].[.Values.domain] for each alias'
+                    type: array
+                    items:
+                        type: string
+                domain:
+                    description: 'If specified, an ingress will be created at [domain]'
+                    type: string
+                dependencies:
+                    $ref: '#/components/schemas/ApplicationDependenciesConfig'
+                    description: >-
+                        Application dependencies are used to define what is required in the deployment when
+                        --include (-i) is used. Specify application names in the list.
+                secured:
+                    description: 'When true, the application is shielded with a getekeeper'
+                    type: boolean
+                uri_role_mapping:
+                    description: 'Map uri/roles to secure with the Gatekeeper (if `secured: true`)'
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/UriRoleMappingConfig'
+                secrets:
+                    $ref: '#/components/schemas/SimpleMap'
+                    description: |-
+                        Define secrets will be mounted in the deployment
+
+                        Define as
+
+                        ```yaml
+                        secrets:
+                            secret_name: 'value'
+
+                        ```
+
+                        Values if left empty are randomly generated
+                use_services:
+                    description: >-
+                        Specify which services this application uses in the frontend to create proxy
+                        ingresses. e.g. 
+
+                        ```
+
+                        - name: samples
+
+                        ```
+                    type: array
+                    items:
+                        type: string
+                database:
+                    $ref: '#/components/schemas/DatabaseDeploymentConfig'
+                    description: ''
+                resources:
+                    description: |-
+                        Application file resources. Maps from deploy/resources folder and mounts as
+                        configmaps
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/FileResourcesConfig'
+                readinessProbe:
+                    $ref: '#/components/schemas/ApplicationProbe'
+                    description: Kubernetes readiness probe configuration
+                startupProbe:
+                    $ref: '#/components/schemas/ApplicationProbe'
+                    description: ''
+                livenessProbe:
+                    $ref: '#/components/schemas/ApplicationProbe'
+                    description: Kubernetes liveness probe configuration
+                sourceRoot:
+                    $ref: '#/components/schemas/Filename'
+                    description: ''
+                name:
+                    description: |-
+                        Application's name. Do not edit, the value is automatically set from the
+                        application directory's name
+                    type: string
+                jupyterhub:
+                    $ref: '#/components/schemas/JupyterHubConfig'
+                    description: |
+                        Configurations specific to jupyterhub. Edit only if your application is
+                        configured as a jupyterhub deployment
+                accounts:
+                    $ref: '#/components/schemas/ApplicationAccountsConfig'
+                    description: Define specific test users and roles for this application
+                test:
+                    $ref: '#/components/schemas/ApplicationTestConfig'
+                    description: Enable and configure automated testing for this application.
+                quotas:
+                    $ref: '#/components/schemas/Quota'
+                    description: ''
+                env:
+                    description: 'Environmental variables added to all containers (deprecated, please use envmap)'
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/NameValue'
+                envmap:
+                    $ref: '#/components/schemas/SimpleMap'
+                    description: Environmental variables added to all containers
+                dockerfile:
+                    $ref: '#/components/schemas/DockerfileConfig'
+                    description: Configuration for the dockerfile used to build the app
+            additionalProperties: true
diff --git a/libraries/models/cloudharness_model/models/application_harness_config.py b/libraries/models/cloudharness_model/models/application_harness_config.py
index 1921de7b..264b0ebc 100644
--- a/libraries/models/cloudharness_model/models/application_harness_config.py
+++ b/libraries/models/cloudharness_model/models/application_harness_config.py
@@ -9,8 +9,10 @@
 from cloudharness_model.models.application_test_config import ApplicationTestConfig
 from cloudharness_model.models.database_deployment_config import DatabaseDeploymentConfig
 from cloudharness_model.models.deployment_auto_artifact_config import DeploymentAutoArtifactConfig
+from cloudharness_model.models.dockerfile_config import DockerfileConfig
 from cloudharness_model.models.file_resources_config import FileResourcesConfig
 from cloudharness_model.models.jupyter_hub_config import JupyterHubConfig
+from cloudharness_model.models.name_value import NameValue
 from cloudharness_model.models.service_auto_artifact_config import ServiceAutoArtifactConfig
 from cloudharness_model.models.uri_role_mapping_config import UriRoleMappingConfig
 import re
@@ -22,8 +24,10 @@
 from cloudharness_model.models.application_test_config import ApplicationTestConfig  # noqa: E501
 from cloudharness_model.models.database_deployment_config import DatabaseDeploymentConfig  # noqa: E501
 from cloudharness_model.models.deployment_auto_artifact_config import DeploymentAutoArtifactConfig  # noqa: E501
+from cloudharness_model.models.dockerfile_config import DockerfileConfig  # noqa: E501
 from cloudharness_model.models.file_resources_config import FileResourcesConfig  # noqa: E501
 from cloudharness_model.models.jupyter_hub_config import JupyterHubConfig  # noqa: E501
+from cloudharness_model.models.name_value import NameValue  # noqa: E501
 from cloudharness_model.models.service_auto_artifact_config import ServiceAutoArtifactConfig  # noqa: E501
 from cloudharness_model.models.uri_role_mapping_config import UriRoleMappingConfig  # noqa: E501
 import re  # noqa: E501
@@ -34,7 +38,7 @@ class ApplicationHarnessConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, deployment=None, service=None, subdomain=None, aliases=None, domain=None, dependencies=None, secured=None, uri_role_mapping=None, secrets=None, use_services=None, database=None, resources=None, readiness_probe=None, startup_probe=None, liveness_probe=None, source_root=None, name=None, jupyterhub=None, accounts=None, test=None, quotas=None):  # noqa: E501
+    def __init__(self, deployment=None, service=None, subdomain=None, aliases=None, domain=None, dependencies=None, secured=None, uri_role_mapping=None, secrets=None, use_services=None, database=None, resources=None, readiness_probe=None, startup_probe=None, liveness_probe=None, source_root=None, name=None, jupyterhub=None, accounts=None, test=None, quotas=None, env=None, envmap=None, dockerfile=None):  # noqa: E501
         """ApplicationHarnessConfig - a model defined in OpenAPI
 
         :param deployment: The deployment of this ApplicationHarnessConfig.  # noqa: E501
@@ -79,6 +83,12 @@ def __init__(self, deployment=None, service=None, subdomain=None, aliases=None,
         :type test: ApplicationTestConfig
         :param quotas: The quotas of this ApplicationHarnessConfig.  # noqa: E501
         :type quotas: Dict[str, object]
+        :param env: The env of this ApplicationHarnessConfig.  # noqa: E501
+        :type env: List[NameValue]
+        :param envmap: The envmap of this ApplicationHarnessConfig.  # noqa: E501
+        :type envmap: Dict[str, object]
+        :param dockerfile: The dockerfile of this ApplicationHarnessConfig.  # noqa: E501
+        :type dockerfile: DockerfileConfig
         """
         self.openapi_types = {
             'deployment': DeploymentAutoArtifactConfig,
@@ -101,7 +111,10 @@ def __init__(self, deployment=None, service=None, subdomain=None, aliases=None,
             'jupyterhub': JupyterHubConfig,
             'accounts': ApplicationAccountsConfig,
             'test': ApplicationTestConfig,
-            'quotas': Dict[str, object]
+            'quotas': Dict[str, object],
+            'env': List[NameValue],
+            'envmap': Dict[str, object],
+            'dockerfile': DockerfileConfig
         }
 
         self.attribute_map = {
@@ -125,7 +138,10 @@ def __init__(self, deployment=None, service=None, subdomain=None, aliases=None,
             'jupyterhub': 'jupyterhub',
             'accounts': 'accounts',
             'test': 'test',
-            'quotas': 'quotas'
+            'quotas': 'quotas',
+            'env': 'env',
+            'envmap': 'envmap',
+            'dockerfile': 'dockerfile'
         }
 
         self._deployment = deployment
@@ -149,6 +165,9 @@ def __init__(self, deployment=None, service=None, subdomain=None, aliases=None,
         self._accounts = accounts
         self._test = test
         self._quotas = quotas
+        self._env = env
+        self._envmap = envmap
+        self._dockerfile = dockerfile
 
     @classmethod
     def from_dict(cls, dikt) -> 'ApplicationHarnessConfig':
@@ -625,3 +644,70 @@ def quotas(self, quotas: Dict[str, object]):
         """
 
         self._quotas = quotas
+
+    @property
+    def env(self) -> List[NameValue]:
+        """Gets the env of this ApplicationHarnessConfig.
+
+        Environmental variables added to all containers (deprecated, please use envmap)  # noqa: E501
+
+        :return: The env of this ApplicationHarnessConfig.
+        :rtype: List[NameValue]
+        """
+        return self._env
+
+    @env.setter
+    def env(self, env: List[NameValue]):
+        """Sets the env of this ApplicationHarnessConfig.
+
+        Environmental variables added to all containers (deprecated, please use envmap)  # noqa: E501
+
+        :param env: The env of this ApplicationHarnessConfig.
+        :type env: List[NameValue]
+        """
+
+        self._env = env
+
+    @property
+    def envmap(self) -> Dict[str, object]:
+        """Gets the envmap of this ApplicationHarnessConfig.
+
+          # noqa: E501
+
+        :return: The envmap of this ApplicationHarnessConfig.
+        :rtype: Dict[str, object]
+        """
+        return self._envmap
+
+    @envmap.setter
+    def envmap(self, envmap: Dict[str, object]):
+        """Sets the envmap of this ApplicationHarnessConfig.
+
+          # noqa: E501
+
+        :param envmap: The envmap of this ApplicationHarnessConfig.
+        :type envmap: Dict[str, object]
+        """
+
+        self._envmap = envmap
+
+    @property
+    def dockerfile(self) -> DockerfileConfig:
+        """Gets the dockerfile of this ApplicationHarnessConfig.
+
+
+        :return: The dockerfile of this ApplicationHarnessConfig.
+        :rtype: DockerfileConfig
+        """
+        return self._dockerfile
+
+    @dockerfile.setter
+    def dockerfile(self, dockerfile: DockerfileConfig):
+        """Sets the dockerfile of this ApplicationHarnessConfig.
+
+
+        :param dockerfile: The dockerfile of this ApplicationHarnessConfig.
+        :type dockerfile: DockerfileConfig
+        """
+
+        self._dockerfile = dockerfile
diff --git a/libraries/models/cloudharness_model/models/harness_main_config.py b/libraries/models/cloudharness_model/models/harness_main_config.py
index 5019fe54..9075268b 100644
--- a/libraries/models/cloudharness_model/models/harness_main_config.py
+++ b/libraries/models/cloudharness_model/models/harness_main_config.py
@@ -20,7 +20,7 @@ class HarnessMainConfig(Model):
     Do not edit the class manually.
     """
 
-    def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=None, mainapp=None, registry=None, tag=None, apps=None, env=None, privenv=None, backup=None, name=None, task_images=None, build_hash=None, envmap=None, dockerfile=None):  # noqa: E501
+    def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=None, mainapp=None, registry=None, tag=None, apps=None, env=None, privenv=None, backup=None, name=None, task_images=None, build_hash=None):  # noqa: E501
         """HarnessMainConfig - a model defined in OpenAPI
 
         :param local: The local of this HarnessMainConfig.  # noqa: E501
@@ -51,10 +51,6 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
         :type task_images: Dict[str, object]
         :param build_hash: The build_hash of this HarnessMainConfig.  # noqa: E501
         :type build_hash: str
-        :param envmap: The envmap of this HarnessMainConfig.  # noqa: E501
-        :type envmap: Dict[str, object]
-        :param dockerfile: The dockerfile of this HarnessMainConfig.  # noqa: E501
-        :type dockerfile: object
         """
         self.openapi_types = {
             'local': bool,
@@ -70,9 +66,7 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
             'backup': BackupConfig,
             'name': str,
             'task_images': Dict[str, object],
-            'build_hash': str,
-            'envmap': Dict[str, object],
-            'dockerfile': object
+            'build_hash': str
         }
 
         self.attribute_map = {
@@ -89,9 +83,7 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
             'backup': 'backup',
             'name': 'name',
             'task_images': 'task-images',
-            'build_hash': 'build_hash',
-            'envmap': 'envmap',
-            'dockerfile': 'dockerfile'
+            'build_hash': 'build_hash'
         }
 
         self._local = local
@@ -108,8 +100,6 @@ def __init__(self, local=None, secured_gatekeepers=None, domain=None, namespace=
         self._name = name
         self._task_images = task_images
         self._build_hash = build_hash
-        self._envmap = envmap
-        self._dockerfile = dockerfile
 
     @classmethod
     def from_dict(cls, dikt) -> 'HarnessMainConfig':
@@ -320,7 +310,7 @@ def apps(self, apps: Dict[str, ApplicationConfig]):
     def env(self) -> List[NameValue]:
         """Gets the env of this HarnessMainConfig.
 
-        Environmental variables added to all pods (deprecated, please use envmap)  # noqa: E501
+        Environmental variables added to all pods  # noqa: E501
 
         :return: The env of this HarnessMainConfig.
         :rtype: List[NameValue]
@@ -331,7 +321,7 @@ def env(self) -> List[NameValue]:
     def env(self, env: List[NameValue]):
         """Sets the env of this HarnessMainConfig.
 
-        Environmental variables added to all pods (deprecated, please use envmap)  # noqa: E501
+        Environmental variables added to all pods  # noqa: E501
 
         :param env: The env of this HarnessMainConfig.
         :type env: List[NameValue]
@@ -449,49 +439,3 @@ def build_hash(self, build_hash: str):
         """
 
         self._build_hash = build_hash
-
-    @property
-    def envmap(self) -> Dict[str, object]:
-        """Gets the envmap of this HarnessMainConfig.
-
-          # noqa: E501
-
-        :return: The envmap of this HarnessMainConfig.
-        :rtype: Dict[str, object]
-        """
-        return self._envmap
-
-    @envmap.setter
-    def envmap(self, envmap: Dict[str, object]):
-        """Sets the envmap of this HarnessMainConfig.
-
-          # noqa: E501
-
-        :param envmap: The envmap of this HarnessMainConfig.
-        :type envmap: Dict[str, object]
-        """
-
-        self._envmap = envmap
-
-    @property
-    def dockerfile(self) -> object:
-        """Gets the dockerfile of this HarnessMainConfig.
-
-        Configuration for the dockerfile used to build the app  # noqa: E501
-
-        :return: The dockerfile of this HarnessMainConfig.
-        :rtype: object
-        """
-        return self._dockerfile
-
-    @dockerfile.setter
-    def dockerfile(self, dockerfile: object):
-        """Sets the dockerfile of this HarnessMainConfig.
-
-        Configuration for the dockerfile used to build the app  # noqa: E501
-
-        :param dockerfile: The dockerfile of this HarnessMainConfig.
-        :type dockerfile: object
-        """
-
-        self._dockerfile = dockerfile

From d0b286ad5772eb73069b02084cdf03ee3f4327c7 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 12 Aug 2024 14:56:59 +0100
Subject: [PATCH 119/210] CH-142 Added support to pull docker build args from
 helm values for skaffold config

---
 .../ch_cli_tools/skaffold.py                  | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index e96d7129..17ce64f9 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -34,17 +34,28 @@ def get_image_tag(name):
 
     builds = {}
 
-    def build_artifact(image_name, context_path, requirements=None, dockerfile_path=''):
+    def build_artifact(
+        image_name: str,
+        context_path: str,
+        requirements: list[str] | None = None,
+        dockerfile_path: str = '',
+        additional_build_args: dict[str, str] | None = None,
+    ) -> dict:
+        build_args = {
+            'REGISTRY': helm_values.registry.name,
+            'TAG': helm_values.tag,
+            'NOCACHE': str(time.time()),
+        }
+
+        if additional_build_args:
+            build_args.update(additional_build_args)
+
         artifact_spec = {
             'image': image_name,
             'context': context_path,
             'docker': {
                 'dockerfile': join(dockerfile_path, 'Dockerfile'),
-                'buildArgs': {
-                    'REGISTRY': helm_values.registry.name,
-                    'TAG': helm_values.tag,
-                    'NOCACHE': str(time.time())
-                },
+                'buildArgs': build_args,
                 'ssh': 'default'
             }
         }
@@ -56,7 +67,13 @@ def build_artifact(image_name, context_path, requirements=None, dockerfile_path=
 
     base_images = set()
 
-    def process_build_dockerfile(dockerfile_path, root_path, global_context=False, requirements=None, app_name=None):
+    def process_build_dockerfile(
+        dockerfile_path: str,
+        root_path: str,
+        global_context: bool = False,
+        requirements: list[str] | None = None,
+        app_name: str | None = None
+    ) -> None:
         if app_name is None:
             app_name = app_name_from_path(basename(dockerfile_path))
         app_key = app_name.replace("-", "_")
@@ -65,12 +82,15 @@ def process_build_dockerfile(dockerfile_path, root_path, global_context=False, r
 
             builds[app_name] = context_path
             base_images.add(get_image_name(app_name))
+
             artifacts[app_name] = build_artifact(
                 get_image_tag(app_name),
                 context_path,
                 dockerfile_path=relpath(dockerfile_path, output_path),
-                requirements=requirements or guess_build_dependencies_from_dockerfile(dockerfile_path)
+                requirements=requirements or guess_build_dependencies_from_dockerfile(dockerfile_path),
+                additional_build_args=get_additional_build_args(helm_values, app_key),
             )
+
             if app_key in helm_values.apps and helm_values.apps[app_key].harness.dependencies and helm_values.apps[app_key].harness.dependencies.git:
                 artifacts[app_name]['hooks'] = {
                     'before': [git_clone_hook(conf, context_path) for conf in helm_values.apps[app_key].harness.dependencies.git]
@@ -255,4 +275,14 @@ def get_image_tag(name):
     if not os.path.exists(os.path.dirname(vscode_launch_path)):
         os.makedirs(os.path.dirname(vscode_launch_path))
     with open(vscode_launch_path, 'w') as f:
-        json.dump(vs_conf, f, indent=2, sort_keys=True)
\ No newline at end of file
+        json.dump(vs_conf, f, indent=2, sort_keys=True)
+
+
+def get_additional_build_args(helm_values: dict, app_key: str) -> dict[str, str] | None:
+    if app_key not in helm_values.apps:
+        return None
+
+    if not (helm_values.apps[app_key].harness.dockerfile and helm_values.apps[app_key].harness.dockerfile.buildArgs):
+        return None
+
+    return helm_values.apps[app_key].harness.dockerfile.buildArgs
\ No newline at end of file

From 6a550e73e27b6cefc375ad06a8f459e107f30a21 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 12 Aug 2024 16:13:47 +0100
Subject: [PATCH 120/210] CH-142 Added testing of dockerfile configuration

---
 applications/samples/Dockerfile                   | 3 +++
 applications/samples/deploy/values-minimal.yaml   | 4 +++-
 applications/samples/deploy/values.yaml           | 4 ++++
 tools/deployment-cli-tools/tests/test_skaffold.py | 2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/applications/samples/Dockerfile b/applications/samples/Dockerfile
index 2925caf5..522de3c9 100644
--- a/applications/samples/Dockerfile
+++ b/applications/samples/Dockerfile
@@ -3,6 +3,9 @@ ARG CLOUDHARNESS_FLASK
 
 FROM $CLOUDHARNESS_FRONTEND_BUILD as frontend
 
+ARG TEST_ARGUMENT=default
+RUN echo $TEST_ARGUMENT
+
 ENV APP_DIR=/app
 
 WORKDIR ${APP_DIR}
diff --git a/applications/samples/deploy/values-minimal.yaml b/applications/samples/deploy/values-minimal.yaml
index 1312b943..c6fb239a 100644
--- a/applications/samples/deploy/values-minimal.yaml
+++ b/applications/samples/deploy/values-minimal.yaml
@@ -4,4 +4,6 @@ harness:
     soft: []
     hard: []
   use_services: []
-
+  dockerfile:
+    buildArgs:
+      TEST_ARGUMENT: 'minimal value'
diff --git a/applications/samples/deploy/values.yaml b/applications/samples/deploy/values.yaml
index 7dd5e293..3d1717ec 100644
--- a/applications/samples/deploy/values.yaml
+++ b/applications/samples/deploy/values.yaml
@@ -84,3 +84,7 @@ harness:
         - "--request-timeout=180000"
         - "--hypothesis-max-examples=2"
         - "--show-errors-tracebacks"
+
+  dockerfile:
+    buildArgs:
+      TEST_ARGUMENT: example value
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
index 981aefa5..17c0832d 100644
--- a/tools/deployment-cli-tools/tests/test_skaffold.py
+++ b/tools/deployment-cli-tools/tests/test_skaffold.py
@@ -81,6 +81,8 @@ def test_create_skaffold_configuration():
         a for a in sk['build']['artifacts'] if a['image'] == 'reg/cloudharness/samples'
     )
     assert os.path.samefile(samples_artifact['context'], join(CLOUDHARNESS_ROOT, 'applications/samples'))
+    assert 'TEST_ARGUMENT' in samples_artifact['docker']['buildArgs']
+    assert samples_artifact['docker']['buildArgs']['TEST_ARGUMENT'] == 'example value'
 
     myapp_artifact = next(
         a for a in sk['build']['artifacts'] if a['image'] == 'reg/cloudharness/myapp')

From 49f055e2c44a9c6be3d37df97f8889feaa049a8b Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 12 Aug 2024 16:21:39 +0100
Subject: [PATCH 121/210] CH-142 Fixes to try and get the code to not throw
 errors with python 3.9

---
 tools/deployment-cli-tools/ch_cli_tools/skaffold.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 17ce64f9..7f6ade95 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -37,9 +37,9 @@ def get_image_tag(name):
     def build_artifact(
         image_name: str,
         context_path: str,
-        requirements: list[str] | None = None,
+        requirements: list[str] = None,
         dockerfile_path: str = '',
-        additional_build_args: dict[str, str] | None = None,
+        additional_build_args: dict[str, str] = None,
     ) -> dict:
         build_args = {
             'REGISTRY': helm_values.registry.name,
@@ -71,8 +71,8 @@ def process_build_dockerfile(
         dockerfile_path: str,
         root_path: str,
         global_context: bool = False,
-        requirements: list[str] | None = None,
-        app_name: str | None = None
+        requirements: list[str] = None,
+        app_name: str = None
     ) -> None:
         if app_name is None:
             app_name = app_name_from_path(basename(dockerfile_path))
@@ -278,7 +278,7 @@ def get_image_tag(name):
         json.dump(vs_conf, f, indent=2, sort_keys=True)
 
 
-def get_additional_build_args(helm_values: dict, app_key: str) -> dict[str, str] | None:
+def get_additional_build_args(helm_values: dict, app_key: str) -> dict[str, str]:
     if app_key not in helm_values.apps:
         return None
 

From de6d18be3bfdb2f75fee33a3a669db73fb5ebc6b Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 27 Aug 2024 10:21:23 +0100
Subject: [PATCH 122/210] CH-142 Fixed incorrect typing

---
 tools/deployment-cli-tools/ch_cli_tools/skaffold.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 7f6ade95..e2fbf1c9 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -278,7 +278,7 @@ def get_image_tag(name):
         json.dump(vs_conf, f, indent=2, sort_keys=True)
 
 
-def get_additional_build_args(helm_values: dict, app_key: str) -> dict[str, str]:
+def get_additional_build_args(helm_values: HarnessMainConfig, app_key: str) -> dict[str, str]:
     if app_key not in helm_values.apps:
         return None
 

From 37d0ec8b63163c6f9a6a0989a36269b8fa669385 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Wed, 28 Aug 2024 11:13:03 +0100
Subject: [PATCH 123/210] CH-142 Update docs regarding dockerfile build args

---
 docs/applications/README.md       | 2 ++
 docs/build-deploy/ci-cd/README.md | 4 ++++
 libraries/models/api/openapi.yaml | 9 ++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/applications/README.md b/docs/applications/README.md
index da0c44fa..1c4492fe 100644
--- a/docs/applications/README.md
+++ b/docs/applications/README.md
@@ -117,6 +117,8 @@ The most important configuration entries are the following:
   - `use_services` (`{name, src, dst}[]`): create reverse proxy endpoints in the ingress for the listed applications on [subdomain].[Values.domain]/proxy/[name]. Useful to avoid CORS requests from frontend clients
   - `readinessProbe`: defines a a url to use as a readiness probe
   - `livenessProbe`: defines a a url to use as a liveness probe
+  - `dockerfile`: configuration for the dockerfile, currently only implemented in Skaffold
+    - `buildArgs`: a map of build arguments to provide to the dockerfile when building with Skaffold
 
 # Example code
 - [Sample application](../../applications/samples) is a sample web application providing working examples of deployment configuration, backend and frontend code.
diff --git a/docs/build-deploy/ci-cd/README.md b/docs/build-deploy/ci-cd/README.md
index 77b59024..3d5f2de9 100644
--- a/docs/build-deploy/ci-cd/README.md
+++ b/docs/build-deploy/ci-cd/README.md
@@ -15,6 +15,10 @@ All you need to to is:
 - Run `skaffold build`
 - Run `skaffold run`
 
+### Dockerfile configuration with Skaffold
+
+When defining an applications values you can provide details on dockerfile configuration such as build arguments. This feature is intended to support useful development use cases (e.g. conditionally running unit tests via build arguments) and should be used with caution as it can lead to different images in different deployment environments.
+
 ## CI/CD with Codefresh
 
 [Codefresh](https://codefresh.io/) is a nice platform for CI/CD see details in the [dedicated document](./codefresh.md).
\ No newline at end of file
diff --git a/libraries/models/api/openapi.yaml b/libraries/models/api/openapi.yaml
index f7e74a42..8dd6d7d5 100644
--- a/libraries/models/api/openapi.yaml
+++ b/libraries/models/api/openapi.yaml
@@ -715,7 +715,14 @@ components:
             properties:
                 buildArgs:
                     $ref: '#/components/schemas/SimpleMap'
-                    description: Map of build arguments to provide to the dockerfile at build time
+                    description: >-
+                        Map of build arguments to provide to the dockerfile at build time.
+
+
+                        The use of this feature is to aid in development (e.g. not running tests on every
+                        local build) and not for setting environment variables in different environments;
+                        caution should be taken when using this feature as it can lead to inconsistent
+                        behaviour across environments. 
         HarnessMainConfig:
             description: ''
             required:

From 8862ee0d0ddbc9225602c03206c2c8d0f1bdf90f Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 3 Sep 2024 14:11:18 +0100
Subject: [PATCH 124/210] CH-144 Add 10 minute timeout to skaffold template

---
 deployment-configuration/skaffold-template.yaml   | 2 ++
 tools/deployment-cli-tools/tests/test_skaffold.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/deployment-configuration/skaffold-template.yaml b/deployment-configuration/skaffold-template.yaml
index 8c7b346c..6331c4d8 100644
--- a/deployment-configuration/skaffold-template.yaml
+++ b/deployment-configuration/skaffold-template.yaml
@@ -13,6 +13,8 @@ deploy:
     flags:
       upgrade:
         - --install
+      install:
+        - --timeout=10m
     releases:
     - name: null
       chartPath: deployment/helm
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
index 17c0832d..999ad639 100644
--- a/tools/deployment-cli-tools/tests/test_skaffold.py
+++ b/tools/deployment-cli-tools/tests/test_skaffold.py
@@ -104,6 +104,10 @@ def test_create_skaffold_configuration():
 
     assert len(sk['test'][1]['custom']) == 2
 
+    flags = sk['deploy']['helm']['flags']
+    assert '--timeout=10m' in flags['install']
+    assert '--install' in flags['upgrade']
+
     shutil.rmtree(OUT)
     shutil.rmtree(BUILD_DIR)
 

From 81247d8edf4bff5a6650ebd23723825e79a09c11 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Fri, 6 Sep 2024 11:37:42 +0100
Subject: [PATCH 125/210] CH-147 Add namespace to usesvolume labels and pod
 affinity selectors

---
 deployment-configuration/helm/templates/auto-database.yaml  | 6 +++---
 .../helm/templates/auto-deployments.yaml                    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment-configuration/helm/templates/auto-database.yaml b/deployment-configuration/helm/templates/auto-database.yaml
index 6ec31380..0658a47e 100644
--- a/deployment-configuration/helm/templates/auto-database.yaml
+++ b/deployment-configuration/helm/templates/auto-database.yaml
@@ -32,7 +32,7 @@ metadata:
   name: {{ .app.harness.database.name | quote }}
   namespace: {{ .root.Values.namespace }}
   labels:
-    usesvolume: {{ .app.harness.database.name }}
+    usesvolume: {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
 spec:
   replicas: 1
   selector:
@@ -43,7 +43,7 @@ spec:
       labels:
         app: {{ .app.harness.database.name | quote }}
         service: db
-        usesvolume: {{ .app.harness.database.name }}
+        usesvolume: {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
     spec:
       affinity:
         podAffinity:
@@ -53,7 +53,7 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
-                      - {{ .app.harness.database.name }}
+                      - {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: {{ .app.harness.database.name | quote }}
diff --git a/deployment-configuration/helm/templates/auto-deployments.yaml b/deployment-configuration/helm/templates/auto-deployments.yaml
index 6981c2fd..2db3714d 100644
--- a/deployment-configuration/helm/templates/auto-deployments.yaml
+++ b/deployment-configuration/helm/templates/auto-deployments.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ .app.harness.deployment.name| quote }}
     {{- if .app.harness.deployment.volume }}
-    usesvolume: {{ .app.harness.deployment.volume.name }}
+    usesvolume: {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
     {{- end }}
 {{- include "deploy_utils.labels" .root | indent 4 }}
 spec:
@@ -26,7 +26,7 @@ spec:
       labels:
         app: {{ .app.harness.deployment.name| quote }}
         {{- if .app.harness.deployment.volume }}
-        usesvolume: {{ .app.harness.deployment.volume.name }}
+        usesvolume: {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
         {{- end }}
 {{- include "deploy_utils.labels" .root | indent 8 }}
     spec:
@@ -44,7 +44,7 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
-                      - {{ .app.harness.deployment.volume.name }}
+                      - {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
               topologyKey: "kubernetes.io/hostname"
       {{- end }}
       {{- end }}

From 074d1b2f1f3e72a2ce825a6f68a43daaf1229e99 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 6 Sep 2024 18:47:59 +0200
Subject: [PATCH 126/210] Linting update

---
 applications/samples/frontend/.eslintrc.cjs |  25 +-
 applications/samples/frontend/yarn.lock     | 616 +++++++++++++++++++-
 2 files changed, 613 insertions(+), 28 deletions(-)

diff --git a/applications/samples/frontend/.eslintrc.cjs b/applications/samples/frontend/.eslintrc.cjs
index c73cf24e..976123ec 100644
--- a/applications/samples/frontend/.eslintrc.cjs
+++ b/applications/samples/frontend/.eslintrc.cjs
@@ -6,7 +6,11 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:react-hooks/recommended',
   ],
-  ignorePatterns: ['dist', '.eslintrc.cjs', 'src/rest/*'],
+  ignorePatterns: [
+    'dist',
+    '.eslintrc.cjs',
+    'src/rest/*' // do not lint generated code
+  ],
   parser: '@typescript-eslint/parser',
   plugins: ['react-refresh'],
   rules: {
@@ -14,6 +18,23 @@ module.exports = {
       'warn',
       { allowConstantExport: true },
     ],
-    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-explicit-any': "off", // No strict typing (annoying especially with React elements and events callbacks)
+    "indent": ["error", 2, { "SwitchCase": 1 }],
+    "curly": "error", // enforce braces for one-line blocks
+    "no-tabs": "error", // enforce no tabs
+
+    "no-console": ["warn", { allow: ["warn", "error", "debug"] }],
+    "consistent-return": "warn", // https://eslint.org/docs/latest/rules/consistent-return
+    "prefer-arrow-callback": ["warn"],
+    "object-curly-spacing": ["warn", "always"], // enforce consistent spacing inside braces
+
+    "func-style": "off", // function expressions or arrow functions are equally valid
+
+    "no-unneeded-ternary": "warn", // disallow unnecessary ternary expressions
+    // React rules: https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules
+    "react/prop-types": "off", // PropTypes are not forced
+    "react/forbid-prop-types": "off", // all PropTypes are allowed
+    "react-hooks/rules-of-hooks": "error", // https://react.dev/reference/rules/rules-of-hooks
+    "react-hooks/exhaustive-deps": "warn", // Hooks dependency array, sometimes it's better to ignore
   }
 }
diff --git a/applications/samples/frontend/yarn.lock b/applications/samples/frontend/yarn.lock
index 3b6f86c4..c7ae36fe 100644
--- a/applications/samples/frontend/yarn.lock
+++ b/applications/samples/frontend/yarn.lock
@@ -683,7 +683,7 @@ acorn@^8.9.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
   integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
-ajv@^6.12.4:
+ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -693,11 +693,26 @@ ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+  integrity sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
@@ -712,6 +727,11 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
+
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -722,25 +742,65 @@ array-union@^2.1.0:
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axios@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
-  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
+  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
+biome@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/biome/-/biome-0.3.3.tgz#71c29633f84a486186bec97675da6f33a925575c"
+  integrity sha512-4LXjrQYbn9iTXu9Y4SKT7ABzTV0WnLDHCVSd2fPUOKsy1gQ+E4xPFmlY1zcWexoi0j7fGHItlL6OWA2CZ/yYAQ==
+  dependencies:
+    bluebird "^3.4.1"
+    chalk "^1.1.3"
+    commander "^2.9.0"
+    editor "^1.0.0"
+    fs-promise "^0.5.0"
+    inquirer-promise "0.0.3"
+    request-promise "^3.0.0"
+    untildify "^3.0.2"
+    user-home "^2.0.0"
+
+bluebird@^3.3, bluebird@^3.4.1:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
@@ -783,6 +843,22 @@ caniuse-lite@^1.0.30001640:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz"
   integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+
+chalk@^1.0.0, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -800,6 +876,23 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+cli-cursor@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  integrity sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-width@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-1.1.1.tgz#a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"
+  integrity sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@@ -824,13 +917,18 @@ color-name@~1.1.4:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.9.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
@@ -841,6 +939,16 @@ convert-source-map@^2.0.0:
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
+core-js@^2.4.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -855,6 +963,13 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
 debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
@@ -886,6 +1001,29 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+earlgrey-runtime@>=0.0.10, earlgrey-runtime@>=0.0.11:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/earlgrey-runtime/-/earlgrey-runtime-0.1.2.tgz#5e7ea308924f107842877d59bb40bc2a9d9a29f8"
+  integrity sha512-T4qoScXi5TwALDv8nlGTvOuCT8jXcKcxtO8qVdqv46IA2GHJfQzwoBPbkOmORnyhu3A98cVVuhWLsM2CzPljJg==
+  dependencies:
+    core-js "^2.4.0"
+    kaiser ">=0.0.4"
+    lodash "^4.17.2"
+    regenerator-runtime "^0.9.5"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+editor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
+  integrity sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==
+
 electron-to-chromium@^1.4.820:
   version "1.5.2"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz"
@@ -925,7 +1063,7 @@ escalade@^3.1.2:
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
-escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
@@ -1035,6 +1173,26 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+  integrity sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+extsprintf@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
+  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -1068,6 +1226,14 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -1104,20 +1270,41 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-follow-redirects@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.8"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+fs-extra@^0.26.5:
+  version "0.26.7"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
+  integrity sha512-waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-promise@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
+  integrity sha512-Y+4F4ujhEcayCJt6JmzcOun9MYGQwz+bVUiuBmTkJImhBHKpBvmVPZR9wtfiF7k3ffwAOAuurygQe+cPLSFQhw==
+  dependencies:
+    any-promise "^1.0.0"
+    fs-extra "^0.26.5"
+    mz "^2.3.1"
+    thenify-all "^1.6.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
@@ -1133,6 +1320,13 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
@@ -1183,11 +1377,36 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
+  dependencies:
+    ansi-regex "^2.0.0"
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
@@ -1198,6 +1417,15 @@ has-flag@^4.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 ignore@^5.2.0, ignore@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
@@ -1229,11 +1457,45 @@ inherits@2:
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+inquirer-promise@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/inquirer-promise/-/inquirer-promise-0.0.3.tgz#2fa71387ef51ea3f0e22f668501d415abb8e42e2"
+  integrity sha512-82CQX586JAV9GAgU9yXZsMDs+NorjA0nLhkfFx9+PReyOnuoHRbHrC1Z90sS95bFJI1Tm1gzMObuE0HabzkJpg==
+  dependencies:
+    earlgrey-runtime ">=0.0.11"
+    inquirer "^0.11.3"
+
+inquirer@^0.11.3:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.4.tgz#81e3374e8361beaff2d97016206d359d0b32fa4d"
+  integrity sha512-QR+2TW90jnKk9LUUtbcA3yQXKt2rDEKMh6+BAZQIeumtzHexnwVLdPakSslGijXYLJCzFv7GMXbFCn0pA00EUw==
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^1.0.1"
+    figures "^1.3.5"
+    lodash "^3.3.1"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
@@ -1251,11 +1513,21 @@ is-path-inside@^3.0.3:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
@@ -1268,6 +1540,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
@@ -1283,16 +1560,50 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
+kaiser@>=0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/kaiser/-/kaiser-0.0.4.tgz#d25ddf800640857fadde08dba59ffc7a5a4f5c38"
+  integrity sha512-m8ju+rmBqvclZmyrOXgGGhOYSjKJK6RN1NhqEltemY87UqZOxEkizg9TOy1vQSyJ01Wx6SAPuuN0iO2Mgislvw==
+  dependencies:
+    earlgrey-runtime ">=0.0.10"
+
 keyv@^4.5.3:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
@@ -1300,6 +1611,13 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  integrity sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -1320,6 +1638,16 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
+lodash@^3.3.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
+
+lodash@^4.17.2, lodash@^4.6.1:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 loose-envify@^1.1.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -1352,7 +1680,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -1378,6 +1706,20 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+mute-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+  integrity sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==
+
+mz@^2.3.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
@@ -1393,6 +1735,21 @@ node-releases@^2.0.14:
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
@@ -1400,6 +1757,11 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==
+
 optionator@^0.9.3:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
@@ -1412,6 +1774,11 @@ optionator@^0.9.3:
     type-check "^0.4.0"
     word-wrap "^1.2.5"
 
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
+
 p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
@@ -1453,6 +1820,11 @@ path-type@^4.0.0:
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^1.0.0, picocolors@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"
@@ -1477,16 +1849,21 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+psl@^1.1.28:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
@@ -1512,16 +1889,80 @@ react@^18.3.1:
   dependencies:
     loose-envify "^1.1.0"
 
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  integrity sha512-8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
+
+regenerator-runtime@^0.9.5:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
+  integrity sha512-D0Y/JJ4VhusyMOd/o25a3jdUqN/bC85EFsaoL9Oqmy/O4efCh+xhp7yj2EEOsj974qvMkcW8AwUzJ1jB/MbxCw==
+
+request-promise@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-3.0.0.tgz#be1edb26f41c49cd1d5656c6753d6842a1249f46"
+  integrity sha512-wVGUX+BoKxYsavTA72i6qHcyLbjzM4LR4y/AmDCqlbuMAursZdDWO7PmgbGAUvD2SeEJ5iB99VSq/U51i/DNbw==
+  dependencies:
+    bluebird "^3.3"
+    lodash "^4.6.1"
+    request "^2.34"
+
+request@^2.34:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  integrity sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rimraf@^2.2.8:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
@@ -1554,6 +1995,13 @@ rollup@^4.13.0:
     "@rollup/rollup-win32-x64-msvc" "4.19.0"
     fsevents "~2.3.2"
 
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  integrity sha512-qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==
+  dependencies:
+    once "^1.3.0"
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
@@ -1561,6 +2009,21 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+  integrity sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
 scheduler@^0.23.2:
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
@@ -1600,6 +2063,37 @@ source-map-js@^1.2.0:
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
+sshpk@^1.7.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
+  dependencies:
+    ansi-regex "^2.0.0"
+
 strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -1612,6 +2106,11 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
@@ -1631,6 +2130,25 @@ text-table@^0.2.0:
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
+thenify-all@^1.0.0, thenify-all@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -1643,11 +2161,31 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 ts-api-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -1670,6 +2208,11 @@ undici-types@~6.11.1:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197"
   integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==
 
+untildify@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
+  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
+
 update-browserslist-db@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz"
@@ -1685,6 +2228,27 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  integrity sha512-KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==
+  dependencies:
+    os-homedir "^1.0.0"
+
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vite@^5.3.4:
   version "5.3.5"
   resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.5.tgz#b847f846fb2b6cb6f6f4ed50a830186138cb83d8"

From 33180a7a2d3da56da43245b0ae50dd5a8446a67e Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 9 Sep 2024 16:57:42 +0200
Subject: [PATCH 127/210] CH-147 fix linting WIP

---
 .../base/test/api/test_st.py                  |  3 +-
 .../django-app/api/test_st.py                 |  5 +-
 .../django-app/backend/__APP_NAME__/asgi.py   |  4 +-
 .../backend/__APP_NAME__/settings.py          |  6 +-
 .../django-app/backend/__APP_NAME__/urls.py   |  2 +-
 .../django-app/backend/__APP_NAME__/wsgi.py   |  4 +-
 .../backend/api/controllers/__init__.py       |  2 +-
 .../backend/__APP_NAME__/__main__.py          |  1 -
 .../flask-server/backend/setup.py             |  1 -
 .../webapp/backend/__APP_NAME__/__main__.py   |  1 -
 applications/common/server/common/__main__.py |  2 +-
 applications/common/server/common/config.py   |  1 -
 .../common/controllers/accounts_controller.py |  1 +
 .../common/controllers/config_controller.py   |  1 +
 .../controllers/security_controller_.py       |  2 -
 .../common/controllers/sentry_controller.py   |  1 +
 applications/common/server/common/models.py   |  2 +-
 .../common/server/common/repository/sentry.py | 34 +++++----
 .../common/test/test_sentry_controller.py     |  2 +-
 applications/common/server/common/util.py     |  8 +-
 applications/common/server/setup.py           |  1 -
 .../deploy/resources/hub/jupyterhub_config.py | 26 +++----
 .../jupyterhub/deploy/resources/hub/z2jh.py   |  4 +-
 .../chauthenticator/chauthenticator/auth.py   | 34 +++++----
 .../harness_jupyter/jupyterhub.py             | 27 ++++---
 .../release-tools/boilerplate/boilerplate.py  | 13 +++-
 .../server/notifications/__main__.py          |  1 -
 .../notifications/adapters/base_adapter.py    |  2 +-
 .../notifications/backends/console_backend.py |  2 +-
 .../notifications/backends/email_backend.py   |  3 +-
 .../notifications/controllers/helpers.py      |  4 +-
 .../controllers/notifications_controller.py   |  7 +-
 applications/notifications/server/setup.py    |  1 -
 .../samples/controllers/auth_controller.py    |  2 +-
 .../controllers/security_controller_.py       |  2 -
 .../samples/controllers/test_controller.py    |  9 ++-
 .../samples/service/resource_service.py       |  3 +-
 .../backend/samples/test/test_sample.py       |  2 +-
 applications/samples/backend/samples/util.py  | 10 +--
 applications/samples/backend/setup.py         |  1 -
 applications/samples/tasks/sum/main.py        |  4 +-
 applications/samples/test/api/test_st.py      |  9 ++-
 applications/volumemanager/server/setup.py    |  1 -
 .../controllers/rest_controller.py            |  5 +-
 .../controllers/security_controller_.py       |  2 -
 .../test/test_rest_controller.py              | 10 +--
 .../server/volumemanager/util.py              |  8 +-
 applications/workflows/server/setup.py        |  1 -
 .../server/workflows_api/__main__.py          |  2 -
 .../test/test_create_and_access_controller.py |  8 +-
 .../workflows/server/workflows_api/util.py    |  8 +-
 .../workflows/tasks/notify-queue/main.py      |  4 +-
 .../workflows/tasks/send-result-event/main.py | 13 ++--
 .../cloudharness_django/admin.py              |  2 +
 .../cloudharness_django/exceptions.py         |  7 +-
 .../cloudharness_django/middleware.py         |  5 +-
 .../cloudharness_django/models.py             |  7 +-
 .../cloudharness_django/services/__init__.py  |  5 +-
 .../cloudharness_django/services/auth.py      |  2 +-
 .../cloudharness_django/services/events.py    |  4 +-
 .../cloudharness_django/services/user.py      | 12 +--
 .../cloudharness_django/settings.py           | 32 ++++----
 libraries/client/cloudharness_cli/setup.py    |  2 +-
 .../cloudharness/__init__.py                  | 13 +++-
 .../cloudharness/auth/exceptions.py           |  5 +-
 .../cloudharness/auth/keycloak.py             | 73 +++++++++----------
 .../cloudharness/errors.py                    |  7 +-
 .../cloudharness/events/client.py             | 16 ++--
 .../cloudharness/infrastructure/k8s.py        | 12 ++-
 .../cloudharness/middleware/__init__.py       |  2 +
 .../cloudharness/models.py                    |  2 +-
 .../cloudharness/sentry/__init__.py           |  7 +-
 .../cloudharness/service/pvc.py               | 17 +++--
 .../cloudharness/utils/__init__.py            |  4 +-
 .../cloudharness/utils/config.py              |  8 +-
 .../cloudharness/utils/env.py                 | 22 ++++--
 .../cloudharness/utils/secrets.py             |  2 +-
 .../cloudharness/utils/settings.py            |  1 -
 .../cloudharness/workflows/argo.py            | 12 +--
 .../cloudharness/workflows/tasks.py           |  4 +-
 .../cloudharness/workflows/utils.py           |  4 +
 .../tests/test_applications.py                | 15 ++--
 .../cloudharness-common/tests/test_env.py     |  8 +-
 .../tests/test_infrastructure.py              |  2 +-
 .../tests/test_middleware.py                  |  3 +
 .../cloudharness-common/tests/test_quota.py   | 15 ++--
 .../tests/test_workflow.py                    | 60 ++++++++-------
 .../cloudharness_utils/constants.py           |  2 +-
 .../cloudharness_utils/testing/api.py         |  2 +-
 .../cloudharness_utils/testing/util.py        |  5 +-
 lint.sh                                       | 13 ++++
 .../cloudharness_test/api.py                  |  3 +-
 .../cloudharness_test/e2e.py                  | 33 ++++-----
 .../cloudharness_test/utils.py                |  3 +-
 tools/cloudharness-test/harness-test          | 10 +--
 tools/cloudharness-test/setup.py              |  1 -
 .../ch_cli_tools/__init__.py                  |  2 +-
 .../ch_cli_tools/codefresh.py                 | 28 +++----
 .../deployment-cli-tools/ch_cli_tools/helm.py | 14 ++--
 .../ch_cli_tools/models.py                    |  2 +-
 .../ch_cli_tools/preprocessing.py             | 39 +++++-----
 .../ch_cli_tools/skaffold.py                  | 25 +++----
 .../ch_cli_tools/utils.py                     | 10 ++-
 .../deployment-cli-tools/harness-application  |  5 +-
 tools/deployment-cli-tools/harness-deployment |  5 +-
 tools/deployment-cli-tools/setup.py           |  1 -
 .../myapp/venv/matplotlib/__main__.py         |  2 +-
 .../myapp2/venv/matplotlib/__main__.py        |  2 +-
 .../tests/test_codefresh.py                   | 17 ++---
 tools/deployment-cli-tools/tests/test_helm.py | 30 +++-----
 .../tests/test_preprocessing.py               | 21 +++---
 .../tests/test_skaffold.py                    |  8 +-
 .../deployment-cli-tools/tests/test_utils.py  |  7 +-
 113 files changed, 514 insertions(+), 480 deletions(-)
 create mode 100644 lint.sh

diff --git a/application-templates/base/test/api/test_st.py b/application-templates/base/test/api/test_st.py
index cb4e9799..902e2bd5 100644
--- a/application-templates/base/test/api/test_st.py
+++ b/application-templates/base/test/api/test_st.py
@@ -3,7 +3,7 @@
 import schemathesis as st
 from schemathesis.checks import response_schema_conformance, not_a_server_error
 
-from cloudharness_test import apitest_init # include to perform default authorization
+from cloudharness_test import apitest_init  # include to perform default authorization
 
 app_url = os.environ.get("APP_URL", "http://samples.ch.local/api")
 
@@ -15,4 +15,3 @@ def test_ping(case):
     response = case.call()
     pprint(response.__dict__)
     assert response.status_code == 200, "this api errors on purpose"
-
diff --git a/application-templates/django-app/api/test_st.py b/application-templates/django-app/api/test_st.py
index fb852433..a7527b80 100644
--- a/application-templates/django-app/api/test_st.py
+++ b/application-templates/django-app/api/test_st.py
@@ -3,7 +3,7 @@
 import schemathesis as st
 from schemathesis.checks import response_schema_conformance, not_a_server_error
 
-from cloudharness_test import apitest_init # include to perform default authorization
+from cloudharness_test import apitest_init  # include to perform default authorization
 
 app_url = os.environ.get("APP_URL", "http://samples.ch.local/api")
 
@@ -20,8 +20,9 @@ def test_ping(case):
     pprint(response.__dict__)
     assert response.status_code == 200, "this api errors on purpose"
 
+
 def test_state_machine():
     schema.as_state_machine().run()
 # APIWorkflow = schema.as_state_machine()
 # APIWorkflow.run()
-# TestAPI = APIWorkflow.TestCase
\ No newline at end of file
+# TestAPI = APIWorkflow.TestCase
diff --git a/application-templates/django-app/backend/__APP_NAME__/asgi.py b/application-templates/django-app/backend/__APP_NAME__/asgi.py
index 43321f43..6d1bf4d9 100644
--- a/application-templates/django-app/backend/__APP_NAME__/asgi.py
+++ b/application-templates/django-app/backend/__APP_NAME__/asgi.py
@@ -16,9 +16,9 @@
 application = get_asgi_application()
 
 # init the auth service
-from cloudharness_django.services import init_services
+from cloudharness_django.services import init_services  # noqa E402
 
 init_services()
 
 # start the kafka event listener
-import cloudharness_django.services.events
+import cloudharness_django.services.events  # noqa E402
diff --git a/application-templates/django-app/backend/__APP_NAME__/settings.py b/application-templates/django-app/backend/__APP_NAME__/settings.py
index e9ad5dc5..9b3c6d22 100644
--- a/application-templates/django-app/backend/__APP_NAME__/settings.py
+++ b/application-templates/django-app/backend/__APP_NAME__/settings.py
@@ -120,13 +120,13 @@
 # ***********************************************************************
 # * __APP_NAME__ settings
 # ***********************************************************************
-from cloudharness.applications import get_configuration
-from cloudharness.utils.config import ALLVALUES_PATH, CloudharnessConfig
+from cloudharness.applications import get_configuration  # noqa E402
+from cloudharness.utils.config import ALLVALUES_PATH, CloudharnessConfig  # noqa E402
 
 # ***********************************************************************
 # * import base CloudHarness Django settings
 # ***********************************************************************
-from cloudharness_django.settings import *
+from cloudharness_django.settings import *  # noqa E402
 
 # add the local apps
 INSTALLED_APPS += [
diff --git a/application-templates/django-app/backend/__APP_NAME__/urls.py b/application-templates/django-app/backend/__APP_NAME__/urls.py
index 185efb49..ce1b9629 100644
--- a/application-templates/django-app/backend/__APP_NAME__/urls.py
+++ b/application-templates/django-app/backend/__APP_NAME__/urls.py
@@ -24,7 +24,7 @@
 
 urlpatterns = [path("admin/", admin.site.urls)]
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + \
-               static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+    static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 urlpatterns += [re_path(r"^(?P<path>.*)$", index, name="index")]
 
 admin.site.site_header = "__APP_NAME__ Admin"
diff --git a/application-templates/django-app/backend/__APP_NAME__/wsgi.py b/application-templates/django-app/backend/__APP_NAME__/wsgi.py
index 34560de8..678932f0 100644
--- a/application-templates/django-app/backend/__APP_NAME__/wsgi.py
+++ b/application-templates/django-app/backend/__APP_NAME__/wsgi.py
@@ -16,9 +16,9 @@
 application = get_wsgi_application()
 
 # init the auth service
-from cloudharness_django.services import init_services
+from cloudharness_django.services import init_services  # noqa E402
 
 init_services()
 
 # start the kafka event listener
-import cloudharness_django.services.events
+import cloudharness_django.services.events  # noqa E402
diff --git a/application-templates/django-app/backend/api/controllers/__init__.py b/application-templates/django-app/backend/api/controllers/__init__.py
index d716607e..1344f5cc 100644
--- a/application-templates/django-app/backend/api/controllers/__init__.py
+++ b/application-templates/django-app/backend/api/controllers/__init__.py
@@ -1 +1 @@
-import api.controllers.test as test_controller
\ No newline at end of file
+import api.controllers.test as test_controller
diff --git a/application-templates/flask-server/backend/__APP_NAME__/__main__.py b/application-templates/flask-server/backend/__APP_NAME__/__main__.py
index 1ce1af97..f2f198da 100644
--- a/application-templates/flask-server/backend/__APP_NAME__/__main__.py
+++ b/application-templates/flask-server/backend/__APP_NAME__/__main__.py
@@ -7,4 +7,3 @@
 
 if __name__ == '__main__':
     main()
-
diff --git a/application-templates/flask-server/backend/setup.py b/application-templates/flask-server/backend/setup.py
index e3caeb8c..e7700bac 100644
--- a/application-templates/flask-server/backend/setup.py
+++ b/application-templates/flask-server/backend/setup.py
@@ -38,4 +38,3 @@
     __APP_NAME__
     """
 )
-
diff --git a/application-templates/webapp/backend/__APP_NAME__/__main__.py b/application-templates/webapp/backend/__APP_NAME__/__main__.py
index c6becb11..a4b264cb 100644
--- a/application-templates/webapp/backend/__APP_NAME__/__main__.py
+++ b/application-templates/webapp/backend/__APP_NAME__/__main__.py
@@ -7,4 +7,3 @@
 
 if __name__ == '__main__':
     main()
-
diff --git a/applications/common/server/common/__main__.py b/applications/common/server/common/__main__.py
index 4bd6ef17..0a81a3f8 100644
--- a/applications/common/server/common/__main__.py
+++ b/applications/common/server/common/__main__.py
@@ -7,13 +7,13 @@
 from common.controllers.sentry_controller import global_dsn
 
 
-
 def init_fn(app):
     log.info("initializing database from app")
     cors = CORS(app, resources={r"/api/*": {"origins": "*"}})
     if not global_dsn:
         open_db(app)
 
+
 app = init_flask(init_app_fn=init_fn)
 
 if __name__ == '__main__':
diff --git a/applications/common/server/common/config.py b/applications/common/server/common/config.py
index 23d0636f..6e29d747 100644
--- a/applications/common/server/common/config.py
+++ b/applications/common/server/common/config.py
@@ -22,7 +22,6 @@ class Config(object):
         log.error("Cannot configure SENTRY")
 
 
-
 class ProductionConfig(Config):
     DEBUG = False
 
diff --git a/applications/common/server/common/controllers/accounts_controller.py b/applications/common/server/common/controllers/accounts_controller.py
index 90202ef3..b09613be 100644
--- a/applications/common/server/common/controllers/accounts_controller.py
+++ b/applications/common/server/common/controllers/accounts_controller.py
@@ -3,6 +3,7 @@
 from cloudharness import applications
 from cloudharness.utils.config import CloudharnessConfig
 
+
 def get_config():  # noqa: E501
     """
     Gets the config for logging in into accounts
diff --git a/applications/common/server/common/controllers/config_controller.py b/applications/common/server/common/controllers/config_controller.py
index 169a0478..72f4fdd3 100644
--- a/applications/common/server/common/controllers/config_controller.py
+++ b/applications/common/server/common/controllers/config_controller.py
@@ -11,6 +11,7 @@
 from cloudharness.utils.config import CloudharnessConfig
 from cloudharness_model.models import HarnessMainConfig
 
+
 def get_version():  # noqa: E501
     """get_version
 
diff --git a/applications/common/server/common/controllers/security_controller_.py b/applications/common/server/common/controllers/security_controller_.py
index ecac4055..7d686cba 100644
--- a/applications/common/server/common/controllers/security_controller_.py
+++ b/applications/common/server/common/controllers/security_controller_.py
@@ -1,3 +1 @@
 from typing import List
-
-
diff --git a/applications/common/server/common/controllers/sentry_controller.py b/applications/common/server/common/controllers/sentry_controller.py
index 1daee66f..4d072782 100644
--- a/applications/common/server/common/controllers/sentry_controller.py
+++ b/applications/common/server/common/controllers/sentry_controller.py
@@ -13,6 +13,7 @@
 except:
     global_dsn = None
 
+
 def getdsn(appname):  # noqa: E501
     """
     Gets the Sentry DSN for a given application or returns the global dsn when set
diff --git a/applications/common/server/common/models.py b/applications/common/server/common/models.py
index 8817fa65..843e9d20 100644
--- a/applications/common/server/common/models.py
+++ b/applications/common/server/common/models.py
@@ -16,4 +16,4 @@ def __init__(self, url, result_all, result_no_stop_words):
         self.result_no_stop_words = result_no_stop_words
 
     def __repr__(self):
-        return '<id {}>'.format(self.id)
\ No newline at end of file
+        return '<id {}>'.format(self.id)
diff --git a/applications/common/server/common/repository/sentry.py b/applications/common/server/common/repository/sentry.py
index f5334995..4ad449ac 100644
--- a/applications/common/server/common/repository/sentry.py
+++ b/applications/common/server/common/repository/sentry.py
@@ -1,14 +1,16 @@
 
-import sqlalchemy 
+import sqlalchemy
 from sqlalchemy.sql import text
 
 from cloudharness.utils.env import get_service_public_address
 
 from .db import get_db
 
+
 class SentryProjectNotFound(Exception):
     pass
 
+
 def _get_api_token():
     # ToDo: may be we can use here a dynamic token, but for now let's use a hard coded one
     api_token = 'afe75d802007405dbc0c2fb1db4cc8b06b981017f58944d0afac700f743ee06a'
@@ -16,31 +18,33 @@ def _get_api_token():
     select token from sentry_apitoken 
     where token=:api_token
     ''')
-    token = get_db().engine.execute(s, 
-        api_token=api_token
-        ).fetchall()
+    token = get_db().engine.execute(s,
+                                    api_token=api_token
+                                    ).fetchall()
     if len(token) == 0:
         # token is not present in the Sentry database, let's create it
         s = text('''
         insert into sentry_apitoken(user_id, token, scopes, date_added, scope_list)
         values (1, :api_token, 0, now(), :scope_list)
         ''')
-        get_db().engine.execute(s, 
-            api_token=api_token,
-            scope_list='{event:admin,event:read,'
-                        'member:read,member:admin,'
-                        'project:read,project:releases,project:admin,project:write,'
-                        'team:read,team:write,team:admin,'
-                        'org:read,org:write,org:admin}'
-            )
+        get_db().engine.execute(s,
+                                api_token=api_token,
+                                scope_list='{event:admin,event:read,'
+                                'member:read,member:admin,'
+                                'project:read,project:releases,project:admin,project:write,'
+                                'team:read,team:write,team:admin,'
+                                'org:read,org:write,org:admin}'
+                                )
         return _get_api_token()
     else:
         # return the first column from the first row of the query result
         return token[0][0]
 
+
 def get_token():
     return _get_api_token()
 
+
 def get_dsn(appname):
     s = text('''
     select public_key, p.id
@@ -49,9 +53,9 @@ def get_dsn(appname):
     where p.slug=:project_slug
     ''')
     try:
-        public_key = get_db().engine.execute(s, 
-            project_slug=appname
-            ).fetchall()
+        public_key = get_db().engine.execute(s,
+                                             project_slug=appname
+                                             ).fetchall()
     except sqlalchemy.exc.OperationalError:
         raise SentryProjectNotFound('Sentry is not initialized.')
 
diff --git a/applications/common/server/common/test/test_sentry_controller.py b/applications/common/server/common/test/test_sentry_controller.py
index a01d90c9..6f881ad0 100644
--- a/applications/common/server/common/test/test_sentry_controller.py
+++ b/applications/common/server/common/test/test_sentry_controller.py
@@ -17,7 +17,7 @@ def test_getdsn(self):
 
         Gets the Sentry DSN for a given application
         """
-        headers = { 
+        headers = {
             'Accept': 'application/json',
         }
         response = self.client.open(
diff --git a/applications/common/server/common/util.py b/applications/common/server/common/util.py
index fcaed08f..8e7e71e6 100644
--- a/applications/common/server/common/util.py
+++ b/applications/common/server/common/util.py
@@ -68,8 +68,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -88,8 +88,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
diff --git a/applications/common/server/setup.py b/applications/common/server/setup.py
index 007ca859..838cb45c 100644
--- a/applications/common/server/setup.py
+++ b/applications/common/server/setup.py
@@ -38,4 +38,3 @@
     Cloud Harness Platform - Reference CH service API
     """
 )
-
diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
index 8fdfa8c1..688ba72a 100755
--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
@@ -1,4 +1,11 @@
 # load the config object (satisfies linters)
+from z2jh import (
+    get_config,
+    get_name,
+    get_name_env,
+    get_secret_value,
+    set_config_if_not_none,
+)
 c = get_config()  # noqa
 
 import glob
@@ -10,12 +17,12 @@
 from kubernetes_asyncio import client
 from tornado.httpclient import AsyncHTTPClient
 
-#CLOUDHARNESS: EDIT START
+# CLOUDHARNESS: EDIT START
 import logging
 
 try:
     from harness_jupyter.jupyterhub import harness_hub
-    harness_hub() # activates harness hooks on jupyterhub
+    harness_hub()  # activates harness hooks on jupyterhub
 except Exception as e:
     logging.error("could not import harness_jupyter", exc_info=True)
 # CLOUDHARNESS: EDIT END
@@ -24,14 +31,6 @@
 configuration_directory = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, configuration_directory)
 
-from z2jh import (
-    get_config,
-    get_name,
-    get_name_env,
-    get_secret_value,
-    set_config_if_not_none,
-)
-
 
 def camelCaseify(s):
     """convert snake_case to camelCase
@@ -513,9 +512,9 @@ def camelCaseify(s):
 email_domain = 'local'
 
 common_oauth_traits = (
-        ('client_id', None),
-        ('client_secret', None),
-        ('oauth_callback_url', 'callbackUrl'),
+    ('client_id', None),
+    ('client_secret', None),
+    ('oauth_callback_url', 'callbackUrl'),
 )
 print("Auth type", auth_type)
 if auth_type == 'ch':
@@ -560,4 +559,3 @@ def camelCaseify(s):
 c.domain = get_config('root.domain')
 c.namespace = get_config('root.namespace')
 # CLOUDHARNESS: EDIT END
-    
\ No newline at end of file
diff --git a/applications/jupyterhub/deploy/resources/hub/z2jh.py b/applications/jupyterhub/deploy/resources/hub/z2jh.py
index 2fe0d25b..24bba555 100755
--- a/applications/jupyterhub/deploy/resources/hub/z2jh.py
+++ b/applications/jupyterhub/deploy/resources/hub/z2jh.py
@@ -121,12 +121,12 @@ def get_config(key, default=None):
     # EDIT: CLOUDHARNESS START
     import re
     if value and isinstance(value, str):
-        replace_var = re.search("{{.*?}}",  value)
+        replace_var = re.search("{{.*?}}", value)
         if replace_var:
             variable = replace_var.group(0)[2:-2].strip()
 
             repl = get_config(variable)
-            
+
             if repl:
                 print("replace", variable, "in", value, ":", repl)
                 value = re.sub("{{.*?}}", repl, value)
diff --git a/applications/jupyterhub/src/chauthenticator/chauthenticator/auth.py b/applications/jupyterhub/src/chauthenticator/chauthenticator/auth.py
index e7b4cb0d..ba4489fc 100644
--- a/applications/jupyterhub/src/chauthenticator/chauthenticator/auth.py
+++ b/applications/jupyterhub/src/chauthenticator/chauthenticator/auth.py
@@ -13,11 +13,13 @@
 handler.setLevel(logging.DEBUG)
 logging.getLogger().addHandler(handler)
 
+
 class CloudHarnessAuthenticateHandler(BaseHandler):
     """
     Handler for /chkclogin
     Creates a new user based on the keycloak user, and auto starts their server
     """
+
     def initialize(self, force_new_server, process_user):
         super().initialize()
         self.force_new_server = force_new_server
@@ -28,23 +30,23 @@ def get(self):
         self.clear_login_cookie()
 
         try:
-                
-                accessToken = self.request.cookies.get(
-                    'kc-access', None) or self.request.cookies.get('accessToken', None)
-                print("Token", accessToken)
-                if accessToken == '-1' or not accessToken:
-                    self.redirect('/hub/logout')
-
-                accessToken = accessToken.value
-                user_data = AuthClient.decode_token(accessToken)
-                username = user_data['sub']
-                print("Username", username, "-",user_data['preferred_username'])
-                raw_user = self.user_from_username(username)
-                print("JH user: ", raw_user.__dict__)
-                self.set_login_cookie(raw_user)
+
+            accessToken = self.request.cookies.get(
+                'kc-access', None) or self.request.cookies.get('accessToken', None)
+            print("Token", accessToken)
+            if accessToken == '-1' or not accessToken:
+                self.redirect('/hub/logout')
+
+            accessToken = accessToken.value
+            user_data = AuthClient.decode_token(accessToken)
+            username = user_data['sub']
+            print("Username", username, "-", user_data['preferred_username'])
+            raw_user = self.user_from_username(username)
+            print("JH user: ", raw_user.__dict__)
+            self.set_login_cookie(raw_user)
         except Exception as e:
-                logging.error("Error getting user from session", exc_info=True)
-                raise
+            logging.error("Error getting user from session", exc_info=True)
+            raise
 
         user = yield gen.maybe_future(self.process_user(raw_user, self))
         self.redirect(self.get_next_url(user))
diff --git a/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py b/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
index ac7dafa6..3c9679e3 100644
--- a/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
+++ b/applications/jupyterhub/src/harness_jupyter/harness_jupyter/jupyterhub.py
@@ -116,7 +116,7 @@ def change_pod_manifest(self: KubeSpawner):
     quota_ws_open = user_quotas.get("quota-ws-open")
 
     # Default value, might be overwritten by the app config
-    self.storage_pvc_ensure =  bool(self.pvc_name) 
+    self.storage_pvc_ensure = bool(self.pvc_name)
 
     if quota_ws_open:
         # get user number of pods running
@@ -124,11 +124,11 @@ def change_pod_manifest(self: KubeSpawner):
         num_of_pods = len([s for s in servers if s.active])
         if num_of_pods > int(quota_ws_open):
             raise PodSpawnException(
-                                "You reached your quota of {} concurrent servers."
-                                "  One must be deleted before a new server can be started".format(
-                                    quota_ws_open
-                                ),
-                            )
+                "You reached your quota of {} concurrent servers."
+                "  One must be deleted before a new server can be started".format(
+                    quota_ws_open
+                ),
+            )
     try:
         subdomain = self.handler.request.host.split(
             str(self.config['domain']))[0][0:-1]
@@ -263,13 +263,12 @@ def change_pod_manifest(self: KubeSpawner):
         from pprint import pprint
         pprint(self.storage_class)
 
-
         # If there's a timeout, just let it propagate
         asyncio.ensure_future(exponential_backoff(
-                partial(
-                    self._make_create_pvc_request, pvc, self.k8s_api_request_timeout
-                ),
-                f'Could not create PVC {self.pvc_name}',
-                # Each req should be given k8s_api_request_timeout seconds.
-                timeout=self.k8s_api_request_retry_timeout,
-            ))
+            partial(
+                self._make_create_pvc_request, pvc, self.k8s_api_request_timeout
+            ),
+            f'Could not create PVC {self.pvc_name}',
+            # Each req should be given k8s_api_request_timeout seconds.
+            timeout=self.k8s_api_request_retry_timeout,
+        ))
diff --git a/applications/nfsserver/nfs-subdir-external-provisioner/release-tools/boilerplate/boilerplate.py b/applications/nfsserver/nfs-subdir-external-provisioner/release-tools/boilerplate/boilerplate.py
index 5618b9ab..26a2412a 100755
--- a/applications/nfsserver/nfs-subdir-external-provisioner/release-tools/boilerplate/boilerplate.py
+++ b/applications/nfsserver/nfs-subdir-external-provisioner/release-tools/boilerplate/boilerplate.py
@@ -50,6 +50,7 @@
 
 verbose_out = sys.stderr if args.verbose else open("/dev/null", "w")
 
+
 def get_refs():
     refs = {}
 
@@ -63,6 +64,7 @@ def get_refs():
 
     return refs
 
+
 def file_passes(filename, refs, regexs):
     try:
         f = open(filename, 'r')
@@ -127,13 +129,16 @@ def file_passes(filename, refs, regexs):
 
     return True
 
+
 def file_extension(filename):
     return os.path.splitext(filename)[1].split(".")[-1].lower()
 
+
 skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git',
                 'cluster/env.sh', 'vendor', 'test/e2e/generated/bindata.go',
                 'repo-infra/verify/boilerplate/test', '.glide']
 
+
 def normalize_files(files):
     newfiles = []
     for pathname in files:
@@ -142,6 +147,7 @@ def normalize_files(files):
         newfiles.append(pathname)
     return newfiles
 
+
 def get_files(extensions):
     files = []
     if len(args.filenames) > 0:
@@ -170,13 +176,14 @@ def get_files(extensions):
             outfiles.append(pathname)
     return outfiles
 
+
 def get_regexs():
     regexs = {}
     # Search for "YEAR" which exists in the boilerplate, but shouldn't in the real thing
-    regexs["year"] = re.compile( 'YEAR' )
+    regexs["year"] = re.compile('YEAR')
     # dates can be 2014, 2015, 2016, ..., CURRENT_YEAR, company holder names can be anything
     years = range(2014, date.today().year + 1)
-    regexs["date"] = re.compile( '(%s)' % "|".join(map(lambda l: str(l), years)) )
+    regexs["date"] = re.compile('(%s)' % "|".join(map(lambda l: str(l), years)))
     # strip // +build \n\n build constraints
     regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
     # strip #!.* from shell scripts
@@ -184,7 +191,6 @@ def get_regexs():
     return regexs
 
 
-
 def main():
     regexs = get_regexs()
     refs = get_refs()
@@ -196,5 +202,6 @@ def main():
 
     return 0
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/applications/notifications/server/notifications/__main__.py b/applications/notifications/server/notifications/__main__.py
index 38389bde..03c83f86 100644
--- a/applications/notifications/server/notifications/__main__.py
+++ b/applications/notifications/server/notifications/__main__.py
@@ -8,4 +8,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-
diff --git a/applications/notifications/server/notifications/adapters/base_adapter.py b/applications/notifications/server/notifications/adapters/base_adapter.py
index 4ea030fe..5ecf70f9 100644
--- a/applications/notifications/server/notifications/adapters/base_adapter.py
+++ b/applications/notifications/server/notifications/adapters/base_adapter.py
@@ -65,7 +65,7 @@ def __init__(self, notification, channel, backend):
             os.path.join(
                 self.channel["templateFolder"],
                 self.notification["template"]
-        ))
+            ))
 
     @abc.abstractmethod
     def send(self, context):
diff --git a/applications/notifications/server/notifications/backends/console_backend.py b/applications/notifications/server/notifications/backends/console_backend.py
index 0a1fd005..a50bc803 100644
--- a/applications/notifications/server/notifications/backends/console_backend.py
+++ b/applications/notifications/server/notifications/backends/console_backend.py
@@ -18,4 +18,4 @@ def __init__(self, *args, **kwargs):
     def send(self):
         log.info("Send notification")
         log.info(f"args:{self.args}")
-        log.info("kwargs:\n"+"\n".join("{0}: {1!r}".format(k,v) for k,v in self.kwargs.items()))
+        log.info("kwargs:\n" + "\n".join("{0}: {1!r}".format(k, v) for k, v in self.kwargs.items()))
diff --git a/applications/notifications/server/notifications/backends/email_backend.py b/applications/notifications/server/notifications/backends/email_backend.py
index 53f71ec8..8a3ae77d 100644
--- a/applications/notifications/server/notifications/backends/email_backend.py
+++ b/applications/notifications/server/notifications/backends/email_backend.py
@@ -22,7 +22,6 @@ def __init__(self, email_from=None, email_to=None, subject=None, message=None, *
         self.subject = subject
         self.message = message
 
-
     def send(self):
         logger.info(f"Sending notification email to {self.email_to}")
         msg = EmailMessage()
@@ -35,7 +34,7 @@ def send(self):
         email_pass = get_secret_or_empty('email-password')
         email_host = conf.get_configuration()["smtp"]["host"]
         email_port = conf.get_configuration()["smtp"]["port"]
-        email_tls  = conf.get_configuration()["smtp"].get("use_tls")
+        email_tls = conf.get_configuration()["smtp"].get("use_tls")
 
         smtp = smtplib.SMTP(email_host, email_port)
         if email_user or email_pass:
diff --git a/applications/notifications/server/notifications/controllers/helpers.py b/applications/notifications/server/notifications/controllers/helpers.py
index 090abd48..355e0894 100644
--- a/applications/notifications/server/notifications/controllers/helpers.py
+++ b/applications/notifications/server/notifications/controllers/helpers.py
@@ -14,9 +14,9 @@ def send(operation, context):
 
         if not channel:
             continue
-        
+
         for b in channel["backends"]:
-            if   b == "email":
+            if b == "email":
                 channel_backend = NotificationEmailBackend
             elif b == "console":
                 channel_backend = NotificationConsoleBackend
diff --git a/applications/notifications/server/notifications/controllers/notifications_controller.py b/applications/notifications/server/notifications/controllers/notifications_controller.py
index a0afde4a..cd4634c5 100644
--- a/applications/notifications/server/notifications/controllers/notifications_controller.py
+++ b/applications/notifications/server/notifications/controllers/notifications_controller.py
@@ -43,6 +43,7 @@ def handle_event(self, message: CDCEvent):
                         }
                     )
 
+
 class NotificationsController:
     _notification_handlers = []
 
@@ -52,7 +53,7 @@ def __init__(self):
 
     @staticmethod
     def handler(app, event_client, message):
-        log.debug("Handler received message: %s",message)
+        log.debug("Handler received message: %s", message)
         for nh in [nh for nh in NotificationsController._notification_handlers if nh.message_type == message.get("message_type")]:
             nh.handle_event(CDCEvent.from_dict(message))
 
@@ -64,8 +65,8 @@ def _init_handlers(self):
                     log.info(f"Init handler for event {notification_app['app']}.{notification_type['name']} type {event_type}")
                     nss = NotificationHandler(
                         event_type,
-                        notification_app["app"], 
-                        notification_type["name"], 
+                        notification_app["app"],
+                        notification_type["name"],
                         notification_type["events"])
                     if not nss.topic_id in (handler.topic_id for handler in NotificationsController._notification_handlers):
                         self._consume_topic(nss.topic_id)
diff --git a/applications/notifications/server/setup.py b/applications/notifications/server/setup.py
index e126c665..4f4ecf1b 100644
--- a/applications/notifications/server/setup.py
+++ b/applications/notifications/server/setup.py
@@ -34,4 +34,3 @@
     notifications
     """
 )
-
diff --git a/applications/samples/backend/samples/controllers/auth_controller.py b/applications/samples/backend/samples/controllers/auth_controller.py
index 5d3ecb47..e2930680 100644
--- a/applications/samples/backend/samples/controllers/auth_controller.py
+++ b/applications/samples/backend/samples/controllers/auth_controller.py
@@ -24,4 +24,4 @@ def valid_cookie():  # noqa: E501
 
     :rtype: List[Valid]
     """
-    return 'OK!'
\ No newline at end of file
+    return 'OK!'
diff --git a/applications/samples/backend/samples/controllers/security_controller_.py b/applications/samples/backend/samples/controllers/security_controller_.py
index 8dd254a2..c052e680 100644
--- a/applications/samples/backend/samples/controllers/security_controller_.py
+++ b/applications/samples/backend/samples/controllers/security_controller_.py
@@ -13,5 +13,3 @@ def info_from_bearerAuth(token):
     :rtype: dict | None
     """
     return {'uid': 'user_id'}
-
-
diff --git a/applications/samples/backend/samples/controllers/test_controller.py b/applications/samples/backend/samples/controllers/test_controller.py
index ff108973..f3580dc3 100644
--- a/applications/samples/backend/samples/controllers/test_controller.py
+++ b/applications/samples/backend/samples/controllers/test_controller.py
@@ -24,13 +24,13 @@ def ping():  # noqa: E501
     """
 
     import os
-    
+
     expected_environment_variables = {
         'WORKERS': '3',
         'ENVIRONMENT_TEST_A': 'value',
         'ENVIRONMENT_TEST_B': '123',
     }
-    
+
     for key, expected_value in expected_environment_variables.items():
         try:
             environment_value = os.environ[key]
@@ -38,9 +38,10 @@ def ping():  # noqa: E501
                 raise Exception(f'Expected environment variable {key} to be {expected_value}, but got {environment_value}')
         except KeyError:
             raise Exception(f'Expected to have an environment variable {key} defined')
-            
+
     import time
     return time.time()
 
+
 def serialization():
-    return User(last_name="Last", first_name="First")
\ No newline at end of file
+    return User(last_name="Last", first_name="First")
diff --git a/applications/samples/backend/samples/service/resource_service.py b/applications/samples/backend/samples/service/resource_service.py
index 64765ad2..9fbba7b4 100644
--- a/applications/samples/backend/samples/service/resource_service.py
+++ b/applications/samples/backend/samples/service/resource_service.py
@@ -8,6 +8,7 @@
 counter = 0
 resources = {}
 
+
 class ResourceNotFound(Exception):
     pass
 
@@ -34,7 +35,7 @@ def get_sample_resource(sampleresource_id: int):  # noqa: E501
 
 
 def get_sample_resources() -> List[SampleResource]:
-    return [v for v in resources.values()] 
+    return [v for v in resources.values()]
 
 
 def update_sample_resource(sampleresource_id: int, sample_resource: SampleResource) -> List[SampleResource]:
diff --git a/applications/samples/backend/samples/test/test_sample.py b/applications/samples/backend/samples/test/test_sample.py
index a6f1c78f..62acfaba 100644
--- a/applications/samples/backend/samples/test/test_sample.py
+++ b/applications/samples/backend/samples/test/test_sample.py
@@ -1,2 +1,2 @@
 def test_sample():
-    assert True
\ No newline at end of file
+    assert True
diff --git a/applications/samples/backend/samples/util.py b/applications/samples/backend/samples/util.py
index 5b241814..b802fafd 100644
--- a/applications/samples/backend/samples/util.py
+++ b/applications/samples/backend/samples/util.py
@@ -67,8 +67,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -87,8 +87,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
@@ -144,4 +144,4 @@ def _deserialize_dict(data, boxed_type):
     :rtype: dict
     """
     return {k: _deserialize(v, boxed_type)
-            for k, v in data.items() }
+            for k, v in data.items()}
diff --git a/applications/samples/backend/setup.py b/applications/samples/backend/setup.py
index 16908eb6..fe7e0ce5 100644
--- a/applications/samples/backend/setup.py
+++ b/applications/samples/backend/setup.py
@@ -37,4 +37,3 @@
     CloudHarness Sample api
     """
 )
-
diff --git a/applications/samples/tasks/sum/main.py b/applications/samples/tasks/sum/main.py
index 578c4952..30a94736 100644
--- a/applications/samples/tasks/sum/main.py
+++ b/applications/samples/tasks/sum/main.py
@@ -1,9 +1,9 @@
+from cloudharness.workflows.utils import get_shared_directory
 import sys
 import os
 
 assert len(sys.argv) > 2, 'Arguments not specified. Cannot proceed'
 
-from cloudharness.workflows.utils import get_shared_directory
 
 a = float(sys.argv[1])
 b = float(sys.argv[2])
@@ -15,4 +15,4 @@
 print("File name is", file_name)
 
 with open(file_name, "w") as f:
-    f.write(str(a+b))
+    f.write(str(a + b))
diff --git a/applications/samples/test/api/test_st.py b/applications/samples/test/api/test_st.py
index afac61dc..e67cb3e5 100644
--- a/applications/samples/test/api/test_st.py
+++ b/applications/samples/test/api/test_st.py
@@ -3,7 +3,7 @@
 import schemathesis as st
 from schemathesis.checks import response_schema_conformance, not_a_server_error
 
-from cloudharness_test import apitest_init # include to perform default authorization
+from cloudharness_test import apitest_init  # include to perform default authorization
 
 app_url = os.environ.get("APP_URL", "http://samples.ch.local/api")
 
@@ -16,18 +16,21 @@ def test_api(case):
     pprint(response.__dict__)
     assert response.status_code >= 500, "this api errors on purpose"
 
+
 @schema.parametrize(endpoint="/valid")
 def test_bearer(case):
     response = case.call()
-    
+
     case.validate_response(response, checks=(response_schema_conformance,))
 
+
 @schema.parametrize(endpoint="/valid-cookie")
 def test_cookie(case):
     response = case.call()
     case.validate_response(response, checks=(response_schema_conformance,))
 
+
 @schema.parametrize(endpoint="/sampleresources", method="POST")
 def test_response(case):
     response = case.call()
-    case.validate_response(response, checks=(response_schema_conformance,))
\ No newline at end of file
+    case.validate_response(response, checks=(response_schema_conformance,))
diff --git a/applications/volumemanager/server/setup.py b/applications/volumemanager/server/setup.py
index 5efc5693..2d6ff8de 100644
--- a/applications/volumemanager/server/setup.py
+++ b/applications/volumemanager/server/setup.py
@@ -36,4 +36,3 @@
     CloudHarness Volumes manager API
     """
 )
-
diff --git a/applications/volumemanager/server/volumemanager/controllers/rest_controller.py b/applications/volumemanager/server/volumemanager/controllers/rest_controller.py
index 879fb743..5eb30a4f 100644
--- a/applications/volumemanager/server/volumemanager/controllers/rest_controller.py
+++ b/applications/volumemanager/server/volumemanager/controllers/rest_controller.py
@@ -8,6 +8,7 @@
 from volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate  # noqa: E501
 from volumemanager import util
 
+
 def pvc_name_get(name):  # noqa: E501
     """Used to retrieve a Persistent Volume Claim from the Kubernetes repository.
 
@@ -26,7 +27,7 @@ def pvc_name_get(name):  # noqa: E501
         name=pvc.metadata.name,
         namespace=pvc.metadata.namespace,
         accessmode=pvc.status.access_modes[0],
-        size=pvc.status.capacity.get('storage','')
+        size=pvc.status.capacity.get('storage', '')
     )
     return pvc
 
@@ -44,7 +45,7 @@ def pvc_post():  # noqa: E501
     if connexion.request.is_json:
         persistent_volume_claim_create = PersistentVolumeClaimCreate.from_dict(connexion.request.get_json())  # noqa: E501
         create_persistent_volume_claim(
-            name=persistent_volume_claim_create.name, 
+            name=persistent_volume_claim_create.name,
             size=persistent_volume_claim_create.size,
             logger=flask.current_app.logger)
     return 'Saved!'
diff --git a/applications/volumemanager/server/volumemanager/controllers/security_controller_.py b/applications/volumemanager/server/volumemanager/controllers/security_controller_.py
index 8dd254a2..c052e680 100644
--- a/applications/volumemanager/server/volumemanager/controllers/security_controller_.py
+++ b/applications/volumemanager/server/volumemanager/controllers/security_controller_.py
@@ -13,5 +13,3 @@ def info_from_bearerAuth(token):
     :rtype: dict | None
     """
     return {'uid': 'user_id'}
-
-
diff --git a/applications/volumemanager/server/volumemanager/test/test_rest_controller.py b/applications/volumemanager/server/volumemanager/test/test_rest_controller.py
index d62a1dbf..ec05bbbd 100644
--- a/applications/volumemanager/server/volumemanager/test/test_rest_controller.py
+++ b/applications/volumemanager/server/volumemanager/test/test_rest_controller.py
@@ -19,7 +19,7 @@ def test_pvc_name_get(self):
 
         Used to retrieve a Persistent Volume Claim from the Kubernetes repository.
         """
-        headers = { 
+        headers = {
             'Accept': 'application/json',
             'Authorization': 'Bearer special-key',
         }
@@ -36,10 +36,10 @@ def test_pvc_post(self):
         Used to create a Persistent Volume Claim in Kubernetes
         """
         persistent_volume_claim_create = {
-  "size" : "2Gi (see also https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/resources.md#resource-quantities)",
-  "name" : "pvc-1"
-}
-        headers = { 
+            "size": "2Gi (see also https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/resources.md#resource-quantities)",
+            "name": "pvc-1"
+        }
+        headers = {
             'Accept': 'application/json',
             'Content-Type': 'application/json',
             'Authorization': 'Bearer special-key',
diff --git a/applications/volumemanager/server/volumemanager/util.py b/applications/volumemanager/server/volumemanager/util.py
index 0c0ee998..6f7117ad 100644
--- a/applications/volumemanager/server/volumemanager/util.py
+++ b/applications/volumemanager/server/volumemanager/util.py
@@ -68,8 +68,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -88,8 +88,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
diff --git a/applications/workflows/server/setup.py b/applications/workflows/server/setup.py
index 796a4812..c89f97a9 100644
--- a/applications/workflows/server/setup.py
+++ b/applications/workflows/server/setup.py
@@ -36,4 +36,3 @@
     Workflows API
     """
 )
-
diff --git a/applications/workflows/server/workflows_api/__main__.py b/applications/workflows/server/workflows_api/__main__.py
index a49051eb..bafa5109 100644
--- a/applications/workflows/server/workflows_api/__main__.py
+++ b/applications/workflows/server/workflows_api/__main__.py
@@ -6,5 +6,3 @@
 
 if __name__ == '__main__':
     main()
-
-
diff --git a/applications/workflows/server/workflows_api/test/test_create_and_access_controller.py b/applications/workflows/server/workflows_api/test/test_create_and_access_controller.py
index 04b7ca3b..ca147dad 100644
--- a/applications/workflows/server/workflows_api/test/test_create_and_access_controller.py
+++ b/applications/workflows/server/workflows_api/test/test_create_and_access_controller.py
@@ -20,7 +20,7 @@ def test_delete_operation(self):
 
         deletes operation by name
         """
-        headers = { 
+        headers = {
         }
         response = self.client.open(
             '/operations/{name}'.format(name='name_example'),
@@ -34,7 +34,7 @@ def test_get_operation(self):
 
         get operation by name
         """
-        headers = { 
+        headers = {
             'Accept': 'application/json',
         }
         response = self.client.open(
@@ -52,7 +52,7 @@ def test_list_operations(self):
         query_string = [('status', QUEUED),
                         ('previous_search_token', 'previous_search_token_example'),
                         ('limit', 10)]
-        headers = { 
+        headers = {
             'Accept': 'application/json',
         }
         response = self.client.open(
@@ -68,7 +68,7 @@ def test_log_operation(self):
 
         get operation by name
         """
-        headers = { 
+        headers = {
             'Accept': 'text/plain',
         }
         response = self.client.open(
diff --git a/applications/workflows/server/workflows_api/util.py b/applications/workflows/server/workflows_api/util.py
index d161f16f..04f3df25 100644
--- a/applications/workflows/server/workflows_api/util.py
+++ b/applications/workflows/server/workflows_api/util.py
@@ -68,8 +68,8 @@ def deserialize_date(string):
     :rtype: date
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string).date()
@@ -88,8 +88,8 @@ def deserialize_datetime(string):
     :rtype: datetime
     """
     if string is None:
-      return None
-    
+        return None
+
     try:
         from dateutil.parser import parse
         return parse(string)
diff --git a/applications/workflows/tasks/notify-queue/main.py b/applications/workflows/tasks/notify-queue/main.py
index 8c58da54..88283355 100644
--- a/applications/workflows/tasks/notify-queue/main.py
+++ b/applications/workflows/tasks/notify-queue/main.py
@@ -1,13 +1,15 @@
+
 import sys
 import os
 import logging
 
+from cloudharness.workflows.utils import notify_queue
+
 logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 
 assert len(
     sys.argv) > 3, 'Not all arguments not specified. Cannot notify queue. Usage: [workflow status] [queue name] [payload]'
 
-from cloudharness.workflows.utils import notify_queue
 
 queue = sys.argv[2]
 message = {'status': sys.argv[1], 'payload': sys.argv[3], 'workflow': os.getenv('CH_WORKFLOW_NAME')}
diff --git a/applications/workflows/tasks/send-result-event/main.py b/applications/workflows/tasks/send-result-event/main.py
index a8cad83c..b8f81e7b 100644
--- a/applications/workflows/tasks/send-result-event/main.py
+++ b/applications/workflows/tasks/send-result-event/main.py
@@ -1,17 +1,20 @@
 import sys
 import os
-print("Starting send-result-event")
+
 import glob
 from cloudharness import log, set_debug
 from cloudharness.workflows.utils import notify_queue
-MAX_FILE_SIZE = 2 ** 20  # 1MB
+
 
 from cloudharness.events.client import EventClient
 from cloudharness.workflows.utils import get_workflow_name
+
+MAX_FILE_SIZE = 2 ** 20  # 1MB
+print("Starting send-result-event")
 set_debug()
 
 
-topic_name = get_workflow_name() # Coming from the workflow name
+topic_name = get_workflow_name()  # Coming from the workflow name
 
 log.info("Topic name is: " + topic_name)
 
@@ -23,7 +26,6 @@
 log.info("Sending content of directory `{}` to event queue topic `{}`".format(shared_directory, topic_name))
 
 
-
 assert os.path.exists(shared_directory), shared_directory + " does not exist."
 
 for file_path in glob.glob(f"{shared_directory}/*"):
@@ -31,7 +33,7 @@
     size = os.path.getsize(file_path)
     if size > MAX_FILE_SIZE:
         log.warning(f"{file_path} size is {size}, which is greater than the maximum of {MAX_FILE_SIZE}."
-                        "The content will not be sent to the queue")
+                    "The content will not be sent to the queue")
         notify_queue(topic_name, {file_path: "Error: size exceeded"})
 
     log.info("Sending content for file `{}`".format(file_path))
@@ -42,5 +44,4 @@
         log.error("Error reading file " + file_path + " " + str(e))
         continue
 
-
     notify_queue(topic_name, {os.path.basename(file_path): content})
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/admin.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/admin.py
index f3db2593..493384e0 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/admin.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/admin.py
@@ -12,6 +12,7 @@
 admin.site.unregister(User)
 admin.site.unregister(Group)
 
+
 class CHUserAdmin(ExtraButtonsMixin, UserAdmin):
 
     def has_add_permission(self, request):
@@ -45,5 +46,6 @@ def sync_keycloak(self, request):
         get_user_service().sync_kc_users_groups()
         self.message_user(request, 'Keycloak users & groups synced.')
 
+
 admin.site.register(User, CHUserAdmin)
 admin.site.register(Group, CHGroupAdmin)
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/exceptions.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/exceptions.py
index 4b14452a..8c8b7eab 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/exceptions.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/exceptions.py
@@ -1,16 +1,21 @@
 from keycloak.exceptions import KeycloakOperationError
 
+
 class KeycloakOIDCNoAdminRole(KeycloakOperationError):
     pass
 
+
 class KeycloakOIDCNoDefaultUserRole(KeycloakOperationError):
     pass
 
+
 class KeycloakOIDCNoProjectError(KeycloakOperationError):
     pass
 
+
 class KeycloakOIDCAuthServiceNotInitError(KeycloakOperationError):
     pass
 
+
 class KeycloakOIDUserServiceNotInitError(KeycloakOperationError):
-    pass
\ No newline at end of file
+    pass
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/middleware.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/middleware.py
index dfe399c1..56f707e7 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/middleware.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/middleware.py
@@ -10,6 +10,7 @@
 from cloudharness_django.services import get_user_service, get_auth_service
 from cloudharness import log
 
+
 def _get_user():
     bearer = get_authentication_token()
     if bearer:
@@ -31,12 +32,12 @@ def _get_user():
         except Exception as e:
             log.exception("User mapping error, %s", payload["email"])
             return None
-        
+
     return None
 
 
 class BearerTokenMiddleware:
-    def __init__(self, get_response = None):
+    def __init__(self, get_response=None):
         # One-time configuration and initialization.
         self.get_response = get_response
 
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/models.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/models.py
index 2a44315b..99ea89cb 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/models.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/models.py
@@ -2,9 +2,11 @@
 from django.contrib.auth.models import Group, User
 
 # Create your models here.
+
+
 class Team(models.Model):
     group = models.OneToOneField(Group, on_delete=models.CASCADE)
-    kc_id = models.CharField(max_length = 100)
+    kc_id = models.CharField(max_length=100)
     owner = models.ForeignKey(User, on_delete=models.DO_NOTHING)
 
     def __str__(self):
@@ -13,8 +15,7 @@ def __str__(self):
 
 class Member(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
-    kc_id = models.CharField(max_length = 100, db_index=True)
+    kc_id = models.CharField(max_length=100, db_index=True)
 
     def __str__(self):
         return f"{self.user.first_name} {self.user.last_name}"
-
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py
index 2bee296b..4efca516 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py
@@ -10,25 +10,28 @@
 _auth_service = None
 _user_service = None
 
+
 def get_auth_service():
     global _auth_service
     if not _auth_service:
         raise KeycloakOIDCAuthServiceNotInitError("Auth Service not initialized")
     return _auth_service
 
+
 def get_user_service():
     global _user_service
     if not _user_service:
         raise KeycloakOIDUserServiceNotInitError("User Service not initialized")
     return _user_service
 
+
 def init_services(
         client_name: str = settings.KC_CLIENT_NAME,
         client_roles: List[str] = settings.KC_ALL_ROLES,
         privileged_roles: List[str] = settings.KC_PRIVILEGED_ROLES,
         admin_role: str = settings.KC_ADMIN_ROLE,
         default_user_role: str = settings.KC_DEFAULT_USER_ROLE
-        ):
+):
     from cloudharness_django.services.auth import AuthService
     from cloudharness_django.services.user import UserService
     global _auth_service, _user_service
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/auth.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/auth.py
index cb3a9ae8..5c808e9e 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/auth.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/auth.py
@@ -22,7 +22,7 @@ class AuthorizationLevel(Enum):
 # create the auth client
 if os.path.isfile(ALLVALUES_PATH):
     try:
-    # CH values exists so running with a valid config
+        # CH values exists so running with a valid config
         auth_client = AuthClient(os.getenv("ACCOUNTS_ADMIN_USERNAME", None), os.getenv("ACCOUNTS_ADMIN_PASSWORD", None))
     except:
         log.exception("Failed to initialize auth client")
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
index b20fd1a7..55909afe 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
@@ -23,7 +23,7 @@ def event_handler(app, event_client, message):
         resource_path = message["resource-path"].split("/")
 
         log.info(f"{event_client} {message}")
-        if resource in ["CLIENT_ROLE_MAPPING","GROUP","USER","GROUP_MEMBERSHIP"]:
+        if resource in ["CLIENT_ROLE_MAPPING", "GROUP", "USER", "GROUP_MEMBERSHIP"]:
             try:
                 init_services()
                 user_service = get_user_service()
@@ -71,7 +71,7 @@ def setup_event_service(self):
             from cloudharness.applications import get_current_configuration
             current_app = get_current_configuration()
 
-            self.test_kafka_running() # if the test fails (raises an exception) then k8s will restart the application
+            self.test_kafka_running()  # if the test fails (raises an exception) then k8s will restart the application
             # init the topics
             self.init_topics()
         except ConfigurationCallException as e:
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py
index e2ec8219..fc49ba36 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/user.py
@@ -3,12 +3,14 @@
 from cloudharness_django.models import Team, Member
 from cloudharness_django.services.auth import AuthorizationLevel
 
+
 def get_user_by_kc_id(kc_id) -> User:
     try:
         return Member.objects.get(kc_id=kc_id).user
     except Member.DoesNotExist:
         return None
 
+
 class UserService:
     def __init__(self, auth_service):
         self.auth_service = auth_service
@@ -35,7 +37,7 @@ def _map_kc_user(self, user, kc_user=None, is_superuser=False, delete=False):
         user.first_name = kc_user.get("firstName", "")
         user.last_name = kc_user.get("lastName", "")
         user.email = kc_user.get("email", "")
-        
+
         user.is_active = kc_user.get("enabled", delete)
         return user
 
@@ -80,7 +82,7 @@ def sync_kc_group(self, kc_group):
                 superusers = User.objects.filter(is_superuser=True)
                 if superusers and len(superusers) > 0:
                     team = Team.objects.create(
-                        owner=superusers[0], # one of the superusers will be the default team owner
+                        owner=superusers[0],  # one of the superusers will be the default team owner
                         kc_id=kc_group["id"],
                         group=group)
                     team.save()
@@ -95,14 +97,14 @@ def sync_kc_groups(self, kc_groups=None):
 
     def sync_kc_user(self, kc_user, is_superuser=False, delete=False):
         # sync the kc user with the django user
-        
+
         user, created = User.objects.get_or_create(username=kc_user["username"])
-        
+
         Member.objects.get_or_create(user=user, kc_id=kc_user["id"])
         user = self._map_kc_user(user, kc_user, is_superuser, delete)
         user.save()
         return user
-    
+
     def sync_kc_user_groups(self, kc_user):
         # Sync the user usergroups and memberships
         user = User.objects.get(username=kc_user["email"])
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/settings.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/settings.py
index 27c6d5c7..b9efd572 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/settings.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/settings.py
@@ -12,19 +12,19 @@
 INSTALLED_APPS = getattr(
     settings,
     'INSTALLED_APPS',
-    []) + [ 'admin_extra_buttons',]
+    []) + ['admin_extra_buttons', ]
 
 # add the local apps
-INSTALLED_APPS += ['cloudharness_django',]
+INSTALLED_APPS += ['cloudharness_django', ]
 
 # add the CloudHarness Django auto login middleware
 MIDDLEWARE = getattr(
-            settings,
-            'MIDDLEWARE',
-            []
-    ) + [
-        'cloudharness_django.middleware.BearerTokenMiddleware',
-    ]
+    settings,
+    'MIDDLEWARE',
+    []
+) + [
+    'cloudharness_django.middleware.BearerTokenMiddleware',
+]
 
 # test if the kubernetes CH all values exists, if so then set up specific k8s stuff
 # IMPROTANT NOTE:
@@ -35,10 +35,10 @@
 app_name = settings.PROJECT_NAME.lower()
 try:
     current_app = applications.get_current_configuration()
-    
+
     # if secured then set USE_X_FORWARDED_HOST because we are behind the GK proxy
     USE_X_FORWARDED_HOST = current_app.harness.secured
-    
+
     # CSRF, set CSRF_TRUSTED_ORIGINS
     CH_DOMAIN = conf.get_domain()
     CSRF_TRUSTED_ORIGINS = getattr(
@@ -65,14 +65,14 @@
 
 if current_app.harness.database.type == "sqlite3":
     DATABASE_ENGINE = "django.db.backends.sqlite3"
-    DATABASE_NAME = os.path.join(getattr(settings,"PERSISTENT_ROOT","."), f"{app_name}.sqlite3")
+    DATABASE_NAME = os.path.join(getattr(settings, "PERSISTENT_ROOT", "."), f"{app_name}.sqlite3")
     DATABSE_HOST = None
     DATABASE_PORT = None
 elif current_app.harness.database.type == "postgres":
-        DATABASE_ENGINE = "django.db.backends.postgresql"
-        DATABASE_NAME = current_app.harness.database.postgres.initialdb
-        DATABSE_HOST = current_app.harness.database.name
-        DATABASE_PORT = current_app.harness.database.postgres.ports[0].port
+    DATABASE_ENGINE = "django.db.backends.postgresql"
+    DATABASE_NAME = current_app.harness.database.postgres.initialdb
+    DATABSE_HOST = current_app.harness.database.name
+    DATABASE_PORT = current_app.harness.database.postgres.ports[0].port
 
 # Database
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
@@ -86,7 +86,7 @@
         "PORT": DATABASE_PORT,
         "TEST": {
             "ENGINE": "django.db.backends.sqlite3",
-            "NAME": os.path.join(getattr(settings,"PERSISTENT_ROOT","."), "testdb.sqlite3"),
+            "NAME": os.path.join(getattr(settings, "PERSISTENT_ROOT", "."), "testdb.sqlite3"),
         },
     },
 }
diff --git a/libraries/client/cloudharness_cli/setup.py b/libraries/client/cloudharness_cli/setup.py
index 890b95c2..ba088ed6 100644
--- a/libraries/client/cloudharness_cli/setup.py
+++ b/libraries/client/cloudharness_cli/setup.py
@@ -37,4 +37,4 @@
     long_description="""\
     CloudHarness Python API Client  # noqa: E501
     """
-)
\ No newline at end of file
+)
diff --git a/libraries/cloudharness-common/cloudharness/__init__.py b/libraries/cloudharness-common/cloudharness/__init__.py
index 333321f2..b0909279 100644
--- a/libraries/cloudharness-common/cloudharness/__init__.py
+++ b/libraries/cloudharness-common/cloudharness/__init__.py
@@ -1,37 +1,42 @@
+import json as js
+from cloudharness_model.encoder import CloudHarnessJSONEncoder
 import logging
 import sys
 
 log = logging
 
-from cloudharness_model.encoder import CloudHarnessJSONEncoder
 FORMAT = "%(asctime)s [%(levelname)s] %(module)s.%(funcName)s: %(message)s"
 logging.basicConfig(stream=sys.stdout, format=FORMAT, level=logging.INFO)
 
+
 def set_debug():
     logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 
 
 # TODO log will write through a rest service
 
-import json as js
 
 json_dumps = js.dumps
 
+
 def dumps(o, *args, **kwargs):
     try:
-        if  "cls" not in kwargs:
+        if "cls" not in kwargs:
             return json_dumps(o, cls=CloudHarnessJSONEncoder, *args, **kwargs)
         return json_dumps(o, *args, **kwargs)
     except:
         logging.error(repr(o))
         raise
 
+
 json = js
 json.dumps = dumps
 
+
 class NotCorrectlyInitialized(Exception):
     pass
 
+
 def init(appname: str):
     """
     Init cloudharness functionality for the current app
@@ -52,5 +57,5 @@ def init(appname: str):
     except Exception as e:
         log.warning(f'Error enabling Sentry for {appname}', exc_info=True)
 
-__all__ = ['log', 'init']
 
+__all__ = ['log', 'init']
diff --git a/libraries/cloudharness-common/cloudharness/auth/exceptions.py b/libraries/cloudharness-common/cloudharness/auth/exceptions.py
index 254340b8..3cc1e4eb 100644
--- a/libraries/cloudharness-common/cloudharness/auth/exceptions.py
+++ b/libraries/cloudharness-common/cloudharness/auth/exceptions.py
@@ -1,11 +1,14 @@
 from keycloak.exceptions import KeycloakAuthenticationError, KeycloakGetError
 
+
 class UserNotFound(KeycloakGetError):
     pass
 
+
 class InvalidToken(Exception):
     pass
 
+
 class AuthSecretNotFound(Exception):
     def __init__(self, secret_name):
-        Exception.__init__(self, f"Secret {secret_name} not found.")
\ No newline at end of file
+        Exception.__init__(self, f"Secret {secret_name} not found.")
diff --git a/libraries/cloudharness-common/cloudharness/auth/keycloak.py b/libraries/cloudharness-common/cloudharness/auth/keycloak.py
index c86aed3a..443ebdad 100644
--- a/libraries/cloudharness-common/cloudharness/auth/keycloak.py
+++ b/libraries/cloudharness-common/cloudharness/auth/keycloak.py
@@ -21,9 +21,6 @@
               ALLVALUES_PATH, exc_info=True)
 
 
-
-
-
 def get_api_password() -> str:
     name = "api_user_password"
     AUTH_SECRET_PATH = os.environ.get(
@@ -76,16 +73,18 @@ def get_server_url():
 def get_auth_realm():
     return conf.get_namespace()
 
+
 def get_token(username, password):
     conf = get_configuration("accounts")
 
     keycloak_openid = KeycloakOpenID(
-        server_url=get_server_url(), 
-        realm_name=get_auth_realm(), 
-        client_id=conf["webclient"]["id"], 
+        server_url=get_server_url(),
+        realm_name=get_auth_realm(),
+        client_id=conf["webclient"]["id"],
         client_secret_key=conf["webclient"]["secret"])
     return keycloak_openid.token(username, password)['access_token']
 
+
 def is_uuid(s):
     import uuid
     try:
@@ -116,7 +115,7 @@ def _get_keycloak_user_id():
             keycloak_user_id = "-1"  # No authorization --> no user
         else:
             token = authentication_token.split(' ')[-1]
-            
+
             keycloak_user_id = AuthClient.decode_token(token)['sub']
 
         return keycloak_user_id
@@ -127,10 +126,9 @@ def __init__(self, username=None, password=None):
         """
 
         self.user = username or os.getenv('ACCOUNTS_ADMIN_USERNAME', None) or "admin_api"
-        self.passwd = password or os.getenv('ACCOUNTS_ADMIN_PASSWORD', None) or  get_api_password()
+        self.passwd = password or os.getenv('ACCOUNTS_ADMIN_PASSWORD', None) or get_api_password()
         # test if we can connect to the Keycloak server
         dummy_client = self.get_admin_client()
-        
 
     def get_admin_client(self):
         """
@@ -143,8 +141,6 @@ def get_admin_client(self):
         :return: KeycloakAdmin
         """
 
-        
-
         if not getattr(self, "_admin_client", None):
             self._admin_client = KeycloakAdmin(
                 server_url=get_server_url(),
@@ -189,7 +185,7 @@ def decode_token(cls, token, audience="web-client"):
         """
         try:
             decoded = jwt.decode(token, cls.get_public_key(),
-                                algorithms='RS256', audience=audience)
+                                 algorithms='RS256', audience=audience)
         except jwt.exceptions.InvalidTokenError as e:
             raise InvalidToken(e) from e
         return decoded
@@ -270,7 +266,7 @@ def create_client_role(self, client_id, role):
     def get_group(self, group_id, with_members=False, with_details=False) -> UserGroup:
         """
         Return the group in the application realm
-        
+
         :param group_id: the group id to get
         :param with_members: Default False, when set to True all members of the group are also retrieved
         :param with_details: Default False, when set to True all attributes of the group are also retrieved
@@ -307,7 +303,7 @@ def get_groups(self, with_members=False) -> List[UserGroup]:
         """
         admin_client = self.get_admin_client()
         return [
-            UserGroup.from_dict(self.get_group(group['id'], with_members)) 
+            UserGroup.from_dict(self.get_group(group['id'], with_members))
             for group in admin_client.get_groups()
         ]
 
@@ -394,7 +390,7 @@ def group_user_remove(self, user_id, group_id):
     def get_users(self, query=None, with_details=False) -> List[User]:
         """
         Return a list of all users in the application realm
-        
+
         :param query: Default None, the query filter for getting the users
         :param with_details: Default False, when set to True all attributes of the group are also retrieved
 
@@ -413,7 +409,7 @@ def get_users(self, query=None, with_details=False) -> List[User]:
             user.update({
                 "userGroups": admin_client.get_user_groups(user['id'], brief_representation=not with_details),
                 'realmRoles': admin_client.get_realm_roles_of_user(user['id'])
-                })
+            })
             users.append(User.from_dict(user))
         return users
 
@@ -442,23 +438,22 @@ def get_user(self, user_id, with_details=False) -> User:
                 raise UserNotFound(user_id)
             except InvalidToken as e:
                 raise UserNotFound(user_id)
-           
-                
+
         else:
             found_users = admin_client.get_users({"username": user_id, "exact": True})
             if len(found_users) == 0:
                 raise UserNotFound(user_id)
             try:
-                user = admin_client.get_user(found_users[0]['id']) # Load full data
+                user = admin_client.get_user(found_users[0]['id'])  # Load full data
             except KeycloakGetError as e:
                 raise UserNotFound(user_id)
             except InvalidToken as e:
                 raise UserNotFound(user_id)
-            
+
         user.update({
-                "userGroups": admin_client.get_user_groups(user_id=user['id'], brief_representation=not with_details),
-                'realmRoles': admin_client.get_realm_roles_of_user(user['id'])
-                })
+            "userGroups": admin_client.get_user_groups(user_id=user['id'], brief_representation=not with_details),
+            'realmRoles': admin_client.get_realm_roles_of_user(user['id'])
+        })
         return User.from_dict(user)
 
     def get_current_user(self) -> User:
@@ -474,7 +469,7 @@ def get_current_user(self) -> User:
         :return: UserRepresentation + GroupRepresentation
         """
         return self.get_user(self._get_keycloak_user_id())
-    
+
     @with_refreshtoken
     def get_user_realm_roles(self, user_id) -> List[str]:
         """
@@ -487,7 +482,7 @@ def get_user_realm_roles(self, user_id) -> List[str]:
 
         :return: (array RoleRepresentation)
         """
-        admin_client=self.get_admin_client()
+        admin_client = self.get_admin_client()
         return admin_client.get_realm_roles_of_user(user_id)
 
     def get_current_user_realm_roles(self) -> List[str]:
@@ -510,8 +505,8 @@ def get_user_client_roles(self, user_id, client_name) -> List[str]:
         :param client_name: Client name
         :return: (array RoleRepresentation)
         """
-        admin_client=self.get_admin_client()
-        client_id=admin_client.get_client_id(client_name)
+        admin_client = self.get_admin_client()
+        client_id = admin_client.get_client_id(client_name)
         return admin_client.get_client_roles_of_user(user_id, client_id)
 
     def get_current_user_client_roles(self, client_name) -> List[str]:
@@ -521,7 +516,7 @@ def get_current_user_client_roles(self, client_name) -> List[str]:
         :param client_name: Client name
         :return: UserRepresentation + GroupRepresentation
         """
-        cur_user_id=self._get_keycloak_user_id()
+        cur_user_id = self._get_keycloak_user_id()
         return self.get_user_client_roles(cur_user_id, client_name)
 
     def user_has_client_role(self, user_id, client_name, role) -> bool:
@@ -532,7 +527,7 @@ def user_has_client_role(self, user_id, client_name, role) -> bool:
         :param client_name: Name of the client
         :param role: Name of the role
         """
-        roles=[user_client_role for user_client_role in self.get_user_client_roles(
+        roles = [user_client_role for user_client_role in self.get_user_client_roles(
             user_id, client_name) if user_client_role['name'] == role]
         return roles != []
 
@@ -543,7 +538,7 @@ def user_has_realm_role(self, user_id, role) -> bool:
         :param user_id: User id
         :param role: Name of the role
         """
-        roles=[user_realm_role for user_realm_role in self.get_user_realm_roles(
+        roles = [user_realm_role for user_realm_role in self.get_user_realm_roles(
             user_id) if user_realm_role['name'] == role]
         return roles != []
 
@@ -577,8 +572,8 @@ def get_client_role_members(self, client_name, role) -> List[User]:
         :param client_name: Client name
         :param role: Role name
         """
-        admin_client=self.get_admin_client()
-        client_id=admin_client.get_client_id(client_name)
+        admin_client = self.get_admin_client()
+        client_id = admin_client.get_client_id(client_name)
         return [User.from_dict(u) for u in admin_client.get_client_role_members(client_id, role)]
 
     @with_refreshtoken
@@ -591,10 +586,10 @@ def user_add_update_attribute(self, user_id, attribute_name, attribute_value):
         param attribute_value: value of the attribute
 
         """
-        admin_client=self.get_admin_client()
-        user=self.get_user(user_id)
-        attributes=user.get('attributes', {}) or {}
-        attributes[attribute_name]=attribute_value
+        admin_client = self.get_admin_client()
+        user = self.get_user(user_id)
+        attributes = user.get('attributes', {}) or {}
+        attributes[attribute_name] = attribute_value
         admin_client.update_user(
             user_id,
             {
@@ -610,9 +605,9 @@ def user_delete_attribute(self, user_id, attribute_name):
         param attribute_name: name of the attribute to delete
         :return: boolean True on success, False is attribute not in user attributes
         """
-        admin_client=self.get_admin_client()
-        user=self.get_user(user_id)
-        attributes=user.get('attributes', None)
+        admin_client = self.get_admin_client()
+        user = self.get_user(user_id)
+        attributes = user.get('attributes', None)
         if attributes and attribute_name in attributes:
             del attributes[attribute_name]
             admin_client.update_user(
diff --git a/libraries/cloudharness-common/cloudharness/errors.py b/libraries/cloudharness-common/cloudharness/errors.py
index b5343692..1304cdaa 100644
--- a/libraries/cloudharness-common/cloudharness/errors.py
+++ b/libraries/cloudharness-common/cloudharness/errors.py
@@ -3,23 +3,28 @@ def __init__(self, topic_id):
         self.topic_id = topic_id
         Exception.__init__(self, f'Events: unable to produce message to topic -> {topic_id}')
 
+
 class EventTopicCreationException(Exception):
     def __init__(self, topic_id):
         self.topic_id = topic_id
         Exception.__init__(self, f'Events: unable to create topic -> {topic_id}')
 
+
 class EventTopicConsumeException(Exception):
     def __init__(self, topic_id):
         self.topic_id = topic_id
         Exception.__init__(self, f'Events: unable to consume messages from topic -> {topic_id}')
 
+
 class EventTopicDeleteException(Exception):
     def __init__(self, topic_id):
         self.topic_id = topic_id
         Exception.__init__(self, f'Events: unable to delete topic -> {topic_id}')
 
+
 class EventGeneralException(Exception):
     pass
 
+
 class MongoDBConfError(Exception):
-    pass
\ No newline at end of file
+    pass
diff --git a/libraries/cloudharness-common/cloudharness/events/client.py b/libraries/cloudharness-common/cloudharness/events/client.py
index 0dad2254..f7c00391 100644
--- a/libraries/cloudharness-common/cloudharness/events/client.py
+++ b/libraries/cloudharness-common/cloudharness/events/client.py
@@ -28,6 +28,7 @@
 AUTH_CLIENT = None
 CURRENT_APP_NAME = config.get_current_app_name()
 
+
 def get_authclient():
     global AUTH_CLIENT
     if not AUTH_CLIENT:
@@ -55,13 +56,12 @@ def _get_consumer(self, group_id='default') -> KafkaConsumer:
                              group_id=group_id,
                              value_deserializer=lambda x: json.loads(x.decode('utf-8')))
 
-
     def create_topic(self):
         """ Connects to cloudharness Events and creates a new topic
         Return:
             True if topic was created correctly, False otherwise.
         """
-        ## Connect to kafka
+        # Connect to kafka
         admin_client = KafkaAdminClient(bootstrap_servers=self._get_bootstrap_servers(),
                                         client_id=self._get_client_id())
         # ## Create topic
@@ -184,7 +184,6 @@ def send_event(message_type, operation, obj, uid="id", func_name=None, func_args
         except Exception as e:
             log.error('send_event error.', exc_info=True)
 
-
     def consume_all_cdc(self, group_id='default') -> Generator[CDCEvent, None, None]:
         """
         Return a list of object modification messages published in the topic
@@ -222,10 +221,10 @@ def consume_all(self, group_id='default') -> list:
     def delete_topic(self) -> bool:
 
         log.debug("Deleting topic " + self.topic_id)
-        ## Connect to kafka
+        # Connect to kafka
         admin_client = KafkaAdminClient(bootstrap_servers=self._get_bootstrap_servers(),
                                         client_id=self._get_client_id())
-        ## Delete topic
+        # Delete topic
         try:
             admin_client.delete_topics([self.topic_id])
             return True
@@ -254,8 +253,8 @@ def _consume_task(self, app=None, group_id=None, handler=None):
                         log.error(f"Error during execution of the consumer Topic {self.topic_id} --> {e}", exc_info=True)
                 self.consumer.close()
             except Exception as e:
-                    log.error(f"Error during execution of the consumer Topic {self.topic_id} --> {e}", exc_info=True)
-                    time.sleep(15)
+                log.error(f"Error during execution of the consumer Topic {self.topic_id} --> {e}", exc_info=True)
+                time.sleep(15)
 
     def async_consume(self, app=None, handler=None, group_id='default'):
         log.debug('creating thread')
@@ -263,7 +262,7 @@ def async_consume(self, app=None, handler=None, group_id='default'):
             log.debug('get current object from app')
             app = app._get_current_object()
         self._consumer_thread = threading.Thread(
-            target=self._consume_task, 
+            target=self._consume_task,
             kwargs={'app': app,
                     'group_id': group_id,
                     'handler': handler})
@@ -271,6 +270,7 @@ def async_consume(self, app=None, handler=None, group_id='default'):
         self._consumer_thread.start()
         log.debug('thread started')
 
+
 if __name__ == "__main__":
     # creat the required os env variables
     os.environ['CLOUDHARNESS_EVENTS_CLIENT_ID'] = env.get_cloudharness_events_client_id()
diff --git a/libraries/cloudharness-common/cloudharness/infrastructure/k8s.py b/libraries/cloudharness-common/cloudharness/infrastructure/k8s.py
index 53092142..9af64a7a 100644
--- a/libraries/cloudharness-common/cloudharness/infrastructure/k8s.py
+++ b/libraries/cloudharness-common/cloudharness/infrastructure/k8s.py
@@ -5,24 +5,22 @@
 """
 import kubernetes
 
-import yaml
-import os
-from pathlib import Path
-
 from cloudharness import log
 
 # TODO handle group
 
-version = 'v1alpha1'
+from cloudharness.utils.config import CloudharnessConfig as conf
+
 
 # determine the namespace of the current app and run the workflow in that namespace
-from cloudharness.utils.config import CloudharnessConfig as conf
 
 namespace = conf.get_namespace()
 
+version = 'v1alpha1'
 
 # --- Api functions ---    `
 
+
 def get_api_client():
     configuration = get_configuration()
     api_instance = kubernetes.client.CoreV1Api(kubernetes.client.ApiClient(get_configuration()))
@@ -51,7 +49,7 @@ def create_namespace():
 
     try:
         api_response = api_instance.create_namespace(body)
-    except Exception  as e:
+    except Exception as e:
         raise Exception(f"Error creating namespace: {namespace}") from e
 
 
diff --git a/libraries/cloudharness-common/cloudharness/middleware/__init__.py b/libraries/cloudharness-common/cloudharness/middleware/__init__.py
index 780ebd49..c3e0531a 100644
--- a/libraries/cloudharness-common/cloudharness/middleware/__init__.py
+++ b/libraries/cloudharness-common/cloudharness/middleware/__init__.py
@@ -2,9 +2,11 @@
 
 _authentication_token = ContextVar("ch_authentication_token", default=None)
 
+
 def set_authentication_token(authentication_token):
     if authentication_token:
         _authentication_token.set(authentication_token)
 
+
 def get_authentication_token():
     return _authentication_token.get()
diff --git a/libraries/cloudharness-common/cloudharness/models.py b/libraries/cloudharness-common/cloudharness/models.py
index 83e950b3..a9719b60 100644
--- a/libraries/cloudharness-common/cloudharness/models.py
+++ b/libraries/cloudharness-common/cloudharness/models.py
@@ -1 +1 @@
-from cloudharness_model import *
\ No newline at end of file
+from cloudharness_model import *
diff --git a/libraries/cloudharness-common/cloudharness/sentry/__init__.py b/libraries/cloudharness-common/cloudharness/sentry/__init__.py
index fd1b3e5a..ccc09316 100644
--- a/libraries/cloudharness-common/cloudharness/sentry/__init__.py
+++ b/libraries/cloudharness-common/cloudharness/sentry/__init__.py
@@ -6,6 +6,7 @@
 
 sentry_environment = os.environ.get("DOMAIN", "Production")
 
+
 def get_dsn(appname):
     """
     Helper function for getting the Sentry DSN of the project of the application
@@ -21,15 +22,16 @@ def get_dsn(appname):
     Usage examples: 
         from cloudharness.sentry import get_dsn
         dsn = get_dsn('notifications')
-    """ 
+    """
     url = get_common_service_cluster_address() + f'/api/sentry/getdsn/{appname}'
     response = requests.get(url, verify=False).json()
     dsn = response['dsn']
-    if dsn and len(dsn)>0:
+    if dsn and len(dsn) > 0:
         return dsn
     else:
         return None
 
+
 def init(appname=None, traces_sample_rate=0, integrations=None, **kwargs):
     """
     Init cloudharness Sentry functionality for the current app
@@ -65,4 +67,5 @@ def init(appname=None, traces_sample_rate=0, integrations=None, **kwargs):
             **kwargs
         )
 
+
 __all__ = ['get_dsn', 'init']
diff --git a/libraries/cloudharness-common/cloudharness/service/pvc.py b/libraries/cloudharness-common/cloudharness/service/pvc.py
index 18c4f725..1bca54af 100644
--- a/libraries/cloudharness-common/cloudharness/service/pvc.py
+++ b/libraries/cloudharness-common/cloudharness/service/pvc.py
@@ -64,6 +64,7 @@ def _get_default_storage_class() -> str:
             break
     return selected_sc
 
+
 def create_persistent_volume_claim(name, size, logger, storage_class=None, useNFS=False, template=None, access_mode=None, **kwargs):
     """
     Create a Persistent Volume Claim in the Kubernetes cluster.
@@ -87,7 +88,7 @@ def create_persistent_volume_claim(name, size, logger, storage_class=None, useNF
 
     if not size:
         raise Exception(f"Size must be set. Got {size!r}.")
-    
+
     if not storage_class:
         if not useNFS:
             storage_class = _get_default_storage_class()
@@ -102,18 +103,18 @@ def create_persistent_volume_claim(name, size, logger, storage_class=None, useNF
         path = os.path.join(os.path.dirname(__file__), 'templates', 'pvc.yaml')
         template = open(path, 'rt').read()
     text = template.format(
-            name=name,
-            size=size,
-            storageClass=storage_class)
+        name=name,
+        size=size,
+        storageClass=storage_class)
     data = dict_merge(yaml.safe_load(text), kwargs)
 
     if access_mode:
         data["spec"]["accessModes"] = [access_mode]
 
     obj = _get_corev1_api().create_namespaced_persistent_volume_claim(
-            namespace=conf.get_configuration()['namespace'],
-            body=data,
-        )
+        namespace=conf.get_configuration()['namespace'],
+        body=data,
+    )
     logger.info(f"PVC child is created: %s", obj)
 
 
@@ -123,7 +124,7 @@ def persistent_volume_claim_exists(name):
 
     Args:
         name (string): the name of the PVC
-      
+
     Returns:
         boolean: True if the PVC exists, False is the PVC doesn't exist
     """
diff --git a/libraries/cloudharness-common/cloudharness/utils/__init__.py b/libraries/cloudharness-common/cloudharness/utils/__init__.py
index 26e0b0f7..cca07dac 100644
--- a/libraries/cloudharness-common/cloudharness/utils/__init__.py
+++ b/libraries/cloudharness-common/cloudharness/utils/__init__.py
@@ -28,8 +28,8 @@ def dict_merge(dct, merge_dct, add_keys=True):
         }
 
     for k, v in merge_dct.items():
-        if (k in dct and isinstance(dct[k], dict)
-                and isinstance(merge_dct[k], collections.abc.Mapping)):
+        if (k in dct and isinstance(dct[k], dict) and
+                isinstance(merge_dct[k], collections.abc.Mapping)):
             dct[k] = dict_merge(dct[k], merge_dct[k], add_keys=add_keys)
         else:
             dct[k] = merge_dct[k]
diff --git a/libraries/cloudharness-common/cloudharness/utils/config.py b/libraries/cloudharness-common/cloudharness/utils/config.py
index 13108d7d..f7024e9d 100644
--- a/libraries/cloudharness-common/cloudharness/utils/config.py
+++ b/libraries/cloudharness-common/cloudharness/utils/config.py
@@ -24,15 +24,16 @@ def __getitem__(self, key_or_path: str):
             obj = obj[k]
         return obj
 
+
 class CloudharnessConfig:
     """
     Helper class for the Cloud Harness configuration
 
     The CH configuration will be loaded from the values.yaml generated by helm
     via the harness-deployment script
-    
+
     """
-    allvalues={}
+    allvalues = {}
 
     @classmethod
     def _get_all_values(cls) -> dict:
@@ -63,7 +64,6 @@ def get_current_app_name(cls):
     def get_domain(cls):
         return cls.get_configuration()['domain']
 
-
     @classmethod
     def get_registry_name(cls):
         return cls.get_configuration()['registry']['name']
@@ -122,7 +122,7 @@ def get_application_by_filter(cls, **filter):
                     tmp_obj = tmp_obj[key]
                 if (tmp_obj == filter_value) or \
                     (filter_value == False and tmp_obj is None) or \
-                    (filter_value == True and tmp_obj is not None):
+                        (filter_value == True and tmp_obj is not None):
                     apps.append(app)
             except KeyError:
                 pass
diff --git a/libraries/cloudharness-common/cloudharness/utils/env.py b/libraries/cloudharness-common/cloudharness/utils/env.py
index 05588aad..cf3d47b8 100644
--- a/libraries/cloudharness-common/cloudharness/utils/env.py
+++ b/libraries/cloudharness-common/cloudharness/utils/env.py
@@ -25,21 +25,22 @@ def set_default_environment():
     values = conf.get_configuration()
 
     if values and 'env' in values:
-         os.environ.update({v['name']: str(v["value"]) for v in values['env'] if v['name'] not in os.environ})
-
-
+        os.environ.update({v['name']: str(v["value"]) for v in values['env'] if v['name'] not in os.environ})
 
 
 set_default_environment()
 
+
 def get_namespace():
     try:
-        namespace=conf.get_configuration()['namespace']
+        namespace = conf.get_configuration()['namespace']
     except:
-        namespace=''
+        namespace = ''
     return namespace
 
-namespace=get_namespace()
+
+namespace = get_namespace()
+
 
 class VariableNotFound(Exception):
     def __init__(self, variable_name):
@@ -71,6 +72,7 @@ def get_image_registry():
 
         return DEFAULT_IMAGE_REGISTRY
 
+
 def name_to_variable(application_name):
     return application_name.upper().replace('-', '_')
 
@@ -92,7 +94,7 @@ def get_service_cluster_address(cloudharness_app_name):
 
 
 def cluster_service_address(service_name):
-    return  f'{service_name}.{namespace}.svc.cluster.local'
+    return f'{service_name}.{namespace}.svc.cluster.local'
 
 
 def use_public_services():
@@ -101,6 +103,7 @@ def use_public_services():
     except VariableNotFound:
         return False
 
+
 def get_sub_variable(*vars):
     return get_variable(name_to_variable('_'.join(vars)))
 
@@ -116,19 +119,24 @@ def get_public_domain():
 def get_cloudharness_workflows_service_url():
     return get_service_public_address('workflows')
 
+
 def get_cloudharness_sentry_service_url():
     return get_configuration('sentry').get_public_address()
 
+
 def get_sentry_service_cluster_address():
     return get_configuration('sentry').get_service_address()
 
+
 def get_cloudharness_common_service_url():
     return get_configuration('common').get_public_address()
 
+
 def get_common_service_cluster_address():
     common_app = get_configuration('common')
     return common_app.get_service_address()
 
+
 def get_auth_service_cluster_address():
     return get_configuration('accounts').get_service_address()
 
diff --git a/libraries/cloudharness-common/cloudharness/utils/secrets.py b/libraries/cloudharness-common/cloudharness/utils/secrets.py
index 7e39013a..dc9dc142 100644
--- a/libraries/cloudharness-common/cloudharness/utils/secrets.py
+++ b/libraries/cloudharness-common/cloudharness/utils/secrets.py
@@ -13,7 +13,7 @@ def get_secret(name: str) -> str:
     Helper class for the CloudHarness application secrets
 
     The application secret will be read from the secret file
-    
+
     Args:
         name (str): name of the secret
         key (str): name of the data key in the secret
diff --git a/libraries/cloudharness-common/cloudharness/utils/settings.py b/libraries/cloudharness-common/cloudharness/utils/settings.py
index 8b137891..e69de29b 100644
--- a/libraries/cloudharness-common/cloudharness/utils/settings.py
+++ b/libraries/cloudharness-common/cloudharness/utils/settings.py
@@ -1 +0,0 @@
-
diff --git a/libraries/cloudharness-common/cloudharness/workflows/argo.py b/libraries/cloudharness-common/cloudharness/workflows/argo.py
index 46595beb..4f1c4cdc 100644
--- a/libraries/cloudharness-common/cloudharness/workflows/argo.py
+++ b/libraries/cloudharness-common/cloudharness/workflows/argo.py
@@ -133,11 +133,11 @@ def get_workflows(status=None, limit=10, continue_token=None, timeout_seconds=3,
     service = WorkflowServiceApi(api_client=get_api_client())
 
     try:
-        api_response = service.list_workflows(namespace, list_options_limit=limit, list_options_continue=continue_token, 
-        list_options_label_selector=f"workflows.argoproj.io/phase={status}" if status else None,
-         _request_timeout=timeout_seconds, 
-         list_options_field_selector=field_selector, fields=fields, **kwargs)
-    
+        api_response = service.list_workflows(namespace, list_options_limit=limit, list_options_continue=continue_token,
+                                              list_options_label_selector=f"workflows.argoproj.io/phase={status}" if status else None,
+                                              _request_timeout=timeout_seconds,
+                                              list_options_field_selector=field_selector, fields=fields, **kwargs)
+
     except ValueError:
         # Exception is raised when no results are found
         return SearchResult(V1alpha1WorkflowList(items=[], metadata={}))
@@ -203,4 +203,4 @@ def get_workflow_logs_list(workflow_name):
     conf.get_configuration()['test'] = True
     res = get_workflows()
     pprint(res)
-    # pprint(get_workflow('hello-world-sfzd4'))
\ No newline at end of file
+    # pprint(get_workflow('hello-world-sfzd4'))
diff --git a/libraries/cloudharness-common/cloudharness/workflows/tasks.py b/libraries/cloudharness-common/cloudharness/workflows/tasks.py
index c88ccc21..550ef848 100644
--- a/libraries/cloudharness-common/cloudharness/workflows/tasks.py
+++ b/libraries/cloudharness-common/cloudharness/workflows/tasks.py
@@ -11,7 +11,7 @@ class Task(argo.ArgoObject):
     Abstract interface for a task.
     """
 
-    def __init__(self, name, resources={}, volume_mounts=[],  **env_args):
+    def __init__(self, name, resources={}, volume_mounts=[], **env_args):
         self.name = name.replace(' ', '-').lower()
         self.resources = resources
         self.__envs = get_cloudharness_variables()
@@ -33,7 +33,7 @@ def affinity_spec(self):
         return affinity_spec(([PodExecutionContext('usesvolume', self.external_volumes[0], True)] if self.external_volumes else []) + [
             PodExecutionContext(f'usesvolume-{v}', 'true', True)
             for v in self.external_volumes
-        ] )
+        ])
 
     @property
     def image_name(self):
diff --git a/libraries/cloudharness-common/cloudharness/workflows/utils.py b/libraries/cloudharness-common/cloudharness/workflows/utils.py
index 2ad94fd2..f65d6591 100644
--- a/libraries/cloudharness-common/cloudharness/workflows/utils.py
+++ b/libraries/cloudharness-common/cloudharness/workflows/utils.py
@@ -8,6 +8,7 @@
 
 SHARED_DIRECTORY_VARIABLE_NAME = "shared_directory"
 
+
 class PodExecutionContext:
     """
     Key-value pair representing the execution context with other pods.
@@ -19,15 +20,18 @@ def __init__(self, key, value, required=False):
         self.value = str(value)
         self.required = required
 
+
 def get_workflow_name():
     """Get the workflow name from inside a workflow"""
     name = get_variable(WORKFLOW_NAME_VARIABLE_NAME)
     remove = name.split("-")[-1]
     return name[0:-len(remove) - 1]
 
+
 def volume_requires_affinity(v):
     return ':' in v and 'rwx' not in v[-4:]
 
+
 def get_shared_directory():
     return os.getenv(SHARED_DIRECTORY_VARIABLE_NAME)
 
diff --git a/libraries/cloudharness-common/tests/test_applications.py b/libraries/cloudharness-common/tests/test_applications.py
index 73da5bfe..b1df3d19 100644
--- a/libraries/cloudharness-common/tests/test_applications.py
+++ b/libraries/cloudharness-common/tests/test_applications.py
@@ -1,15 +1,13 @@
+from cloudharness.utils.config import CloudharnessConfig, ConfigObject
+from cloudharness.applications import ApplicationConfiguration, get_configuration
 from .test_env import set_default_environment
 
 set_default_environment()
 
-from cloudharness.applications import ApplicationConfiguration, get_configuration
-from cloudharness.utils.config import CloudharnessConfig, ConfigObject
-
-
 
 conf_1 = {
     'name': 'app1',
-    
+
     'harness': {
         'name': 'app1',
         'subdomain': 'myapp',
@@ -72,6 +70,7 @@ def test_application_conf():
     assert uut.conf.admin.role == 'administrator'
     assert uut.conf["admin.role"] == 'administrator'
 
+
 def test_get_configuration():
     CloudharnessConfig.apps = {
         'a': conf_1,
@@ -89,8 +88,7 @@ def test_get_configuration():
     assert uut["freefield"]["a"] == 1
     assert uut["freefield"].a == 1
     assert uut["freefield.a"] == 1
-    
-    
+
     assert uut.freefield.a == 1
 
     uut = get_configuration('app2')
@@ -100,9 +98,6 @@ def test_get_configuration():
     assert not uut.is_auto_deployment()
     assert uut.is_sentry_enabled()
 
-
-    
-
     # TODO subapp support
     # uut = get_configuration('app2sub')
 
diff --git a/libraries/cloudharness-common/tests/test_env.py b/libraries/cloudharness-common/tests/test_env.py
index b4f2638c..6956b666 100644
--- a/libraries/cloudharness-common/tests/test_env.py
+++ b/libraries/cloudharness-common/tests/test_env.py
@@ -1,3 +1,5 @@
+from cloudharness.utils.config import CloudharnessConfig as conf
+from cloudharness.utils.env import set_default_environment
 import pytest
 import os
 import yaml
@@ -5,11 +7,9 @@
 HERE = os.path.dirname(os.path.realpath(__file__))
 os.environ["CH_VALUES_PATH"] = os.path.join(HERE, "values.yaml")
 
-from cloudharness.utils.env import set_default_environment
-from cloudharness.utils.config import CloudharnessConfig as conf
 
 def set_test_environment():
-    
+
     values_file = os.environ["CH_VALUES_PATH"]
     if not os.path.exists(values_file):
 
@@ -21,5 +21,3 @@ def set_test_environment():
     pprint(values)
     conf.get_configuration().update(values)
     set_default_environment()
-
-
diff --git a/libraries/cloudharness-common/tests/test_infrastructure.py b/libraries/cloudharness-common/tests/test_infrastructure.py
index c9395467..ab060d8e 100644
--- a/libraries/cloudharness-common/tests/test_infrastructure.py
+++ b/libraries/cloudharness-common/tests/test_infrastructure.py
@@ -1,8 +1,8 @@
+from cloudharness.infrastructure import k8s
 from .test_env import set_test_environment
 
 set_test_environment()
 
-from cloudharness.infrastructure import k8s
 
 kubectl_enabled = False
 
diff --git a/libraries/cloudharness-common/tests/test_middleware.py b/libraries/cloudharness-common/tests/test_middleware.py
index 053a1337..bd438fae 100644
--- a/libraries/cloudharness-common/tests/test_middleware.py
+++ b/libraries/cloudharness-common/tests/test_middleware.py
@@ -11,6 +11,7 @@
 def new_init(self):
     pass
 
+
 def new_decode_token(token):
     # if everything went fine then the token contains the value of sub
     # let's return it
@@ -18,10 +19,12 @@ def new_decode_token(token):
         'sub': token
     }
 
+
 def test_setting_and_getting_auth_token():
     set_authentication_token(TEST_AUTHENTICATION_TOKEN)
     assert get_authentication_token() == TEST_AUTHENTICATION_TOKEN
 
+
 def test_decoding():
     mocker = AuthClient
     mocker.decode_token = new_decode_token
diff --git a/libraries/cloudharness-common/tests/test_quota.py b/libraries/cloudharness-common/tests/test_quota.py
index 707ea8a6..4c886bd7 100644
--- a/libraries/cloudharness-common/tests/test_quota.py
+++ b/libraries/cloudharness-common/tests/test_quota.py
@@ -1,28 +1,31 @@
+from cloudharness.auth.quota import get_user_quotas
+from cloudharness.applications import get_configuration
+from cloudharness import set_debug
 from .test_env import set_test_environment
 
 set_test_environment()
 
-from cloudharness import set_debug
-from cloudharness.applications import get_configuration
-from cloudharness.auth.quota import get_user_quotas
 
 set_debug()
 
 jh_config = get_configuration("jupyterhub")
 assert jh_config is not None
 
+
 def test_get_quotas(mocker):
     def mock_get_admin_client(self):
         return None
+
     def mock_get_current_user(self):
-        return {"id":"123"}
+        return {"id": "123"}
+
     def mock_get_user(self, user_id, with_details):
         return {
             "attributes": {
                 "quota-ws-guaranteemem": [0.5]
             },
             "userGroups": [
-                {"path": "/Base", "attributes": {'quota-ws-maxmem': [2.5], 'quota-ws-maxcpu': [1], 'quota-ws-open': [3], "quota-ws-guaranteemem": [0.1]} },
+                {"path": "/Base", "attributes": {'quota-ws-maxmem': [2.5], 'quota-ws-maxcpu': [1], 'quota-ws-open': [3], "quota-ws-guaranteemem": [0.1]}},
                 {"path": "/Base/Base 1/Base 1 1", "attributes": {'quota-ws-maxcpu': [2], 'quota-ws-open': [10]}},
                 {"path": "/Base/Base 2", "attributes": {'quota-ws-maxmem': [8], 'quota-ws-maxcpu': [0.25], 'quota-ws-guaranteecpu': [0.25]}},
                 {"path": "/Low CU", "attributes": {'quota-ws-maxmem': [3], 'quota-ws-maxcpu': [2.5], 'quota-ws-open': [1]}}
@@ -32,7 +35,7 @@ def mock_get_user(self, user_id, with_details):
     mocker.patch('cloudharness.auth.keycloak.AuthClient.get_current_user', mock_get_current_user)
     mocker.patch('cloudharness.auth.keycloak.AuthClient.get_user', mock_get_user)
     user_quotas_jh = get_user_quotas(jh_config, user_id=None)
-    
+
     assert user_quotas_jh.get("quota-ws-maxmem") == 8.0
     assert user_quotas_jh.get("quota-ws-maxcpu") == 2.5
     assert user_quotas_jh.get("quota-ws-open") == 10.0
diff --git a/libraries/cloudharness-common/tests/test_workflow.py b/libraries/cloudharness-common/tests/test_workflow.py
index 18a2c6d1..c66dbbd0 100644
--- a/libraries/cloudharness-common/tests/test_workflow.py
+++ b/libraries/cloudharness-common/tests/test_workflow.py
@@ -1,4 +1,8 @@
 """Notice, this test needs a fully operating kubernetes with argo environment in the container running the test"""
+from cloudharness.utils.config import CloudharnessConfig
+from cloudharness.workflows import argo
+from cloudharness import set_debug
+from cloudharness.workflows import operations, tasks, utils
 import requests
 import yaml
 
@@ -7,10 +11,6 @@
 
 set_test_environment()
 
-from cloudharness.workflows import operations, tasks, utils
-from cloudharness import set_debug
-from cloudharness.workflows import argo
-from cloudharness.utils.config import CloudharnessConfig
 
 set_debug()
 
@@ -19,17 +19,20 @@
 
 assert 'registry' in CloudharnessConfig.get_configuration()
 
+
 def check_wf(wf):
-    
+
     assert wf["kind"] == "Workflow"
     assert "spec" in wf
 
+
 def test_volume_affinity_check():
     assert not utils.volume_requires_affinity("a")
     assert utils.volume_requires_affinity("a:b")
     assert utils.volume_requires_affinity("a:b:ro")
     assert not utils.volume_requires_affinity("a:b:rwx")
 
+
 def test_sync_workflow():
     def f():
         import time
@@ -41,8 +44,7 @@ def f():
     op = operations.DistributedSyncOperation('test-sync-op-', task)
     # print('\n', yaml.dump(op.to_workflow()))
     wf = op.to_workflow()
-    
-    
+
     if execute:
         print(op.execute())
 
@@ -120,7 +122,7 @@ def test_single_task_shared():
     accounts_offset = 1 if is_accounts_present() else 0
     assert len(op.volumes) == 1
     assert len(wf['spec']['volumes']) == 2 + accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
     if accounts_offset == 1:
         assert wf['spec']['volumes'][1]['secret']['secretName'] == 'accounts'
     assert len(wf['spec']['templates'][0]['container']['volumeMounts']) == 2 + accounts_offset
@@ -135,19 +137,20 @@ def test_single_task_shared():
     if execute:
         print(op.execute())
 
+
 def test_pipeline_shared():
     shared_directory = 'myclaim:/mnt/shared'
     task_write = operations.CustomTask('download-file', 'workflows-extract-download',
                                        url='https://raw.githubusercontent.com/openworm/org.geppetto/master/README.md')
     task_script = tasks.BashTask('print-file', source="ls -la")
     op = operations.PipelineOperation('test-custom-connected-op-', [task_write, task_script],
-                                        shared_directory=shared_directory, shared_volume_size=100)
+                                      shared_directory=shared_directory, shared_volume_size=100)
     wf = op.to_workflow()
 
     accounts_offset = 1 if is_accounts_present() else 0
     assert len(op.volumes) == 1
     assert len(wf['spec']['volumes']) == 2 + accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
     if accounts_offset == 1:
         assert wf['spec']['volumes'][1]['secret']['secretName'] == 'accounts'
     assert len(wf['spec']['templates'][1]['container']['volumeMounts']) == 2 + accounts_offset
@@ -160,7 +163,8 @@ def test_pipeline_shared():
     assert affinity_glob['values'][0] == 'myclaim'
 
     if execute:
-        print(op.execute())        
+        print(op.execute())
+
 
 def test_single_task_shared_rwx():
     shared_directory = 'myclaim:/mnt/shared:rwx'
@@ -174,16 +178,14 @@ def test_single_task_shared_rwx():
     accounts_offset = 1 if is_accounts_present() else 0
     assert len(op.volumes) == 1
     assert len(wf['spec']['volumes']) == 2 + accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
     if accounts_offset == 1:
         assert wf['spec']['volumes'][1]['secret']['secretName'] == 'accounts'
     assert len(wf['spec']['templates'][0]['container']['volumeMounts']) == 2 + accounts_offset
 
-
-
-
     assert not 'affinity' in wf['spec'], "Pod affinity should not be added for rwx volumes"
 
+
 def test_single_task_volume_notshared():
 
     task_write = operations.CustomTask('download-file', 'workflows-extract-download', volume_mounts=["a:b"],
@@ -194,12 +196,11 @@ def test_single_task_volume_notshared():
     accounts_offset = 1 if is_accounts_present() else 0
     assert len(op.volumes) == 0
     assert len(wf['spec']['volumes']) == 2 + accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'a'
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'a'
     if accounts_offset == 1:
         assert wf['spec']['volumes'][1]['secret']['secretName'] == 'accounts'
     assert len(wf['spec']['templates'][0]['container']['volumeMounts']) == 2 + accounts_offset
 
-    
     assert 'affinity' not in wf['spec']
 
     affinity_tpl = \
@@ -211,6 +212,7 @@ def test_single_task_volume_notshared():
     if execute:
         print(op.execute())
 
+
 def test_single_task_volumes_notshared():
     shared_directory = 'myclaim:/mnt/shared'
     task_write = operations.CustomTask('download-file', 'workflows-extract-download', volume_mounts=["a:b"],
@@ -221,7 +223,7 @@ def test_single_task_volumes_notshared():
     accounts_offset = 1 if is_accounts_present() else 0
     assert len(op.volumes) == 1
     assert len(wf['spec']['volumes']) == 3 + accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
     if accounts_offset == 1:
         assert wf['spec']['volumes'][1]['secret']['secretName'] == 'accounts'
     assert len(wf['spec']['templates'][0]['container']['volumeMounts']) == 3 + accounts_offset
@@ -241,6 +243,7 @@ def test_single_task_volumes_notshared():
     if execute:
         print(op.execute())
 
+
 def test_single_task_shared_multiple():
     shared_directory = ['myclaim:/mnt/shared', 'myclaim2:/mnt/shared2:ro']
     task_write = operations.CustomTask('download-file', 'workflows-extract-download',
@@ -253,16 +256,16 @@ def test_single_task_shared_multiple():
 
     assert len(op.volumes) == 2
     assert len(wf['spec']['volumes']) == 3 + accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
     assert len(wf['spec']['templates'][0]['container']['volumeMounts']) == 3 + accounts_offset
 
-    assert wf['spec']['templates'][0]['container']['volumeMounts'][2+accounts_offset]['readonly']
+    assert wf['spec']['templates'][0]['container']['volumeMounts'][2 + accounts_offset]['readonly']
 
     assert wf['spec']['templates'][0]['metadata']['labels']['usesvolume']
 
     assert 'affinity' in wf['spec']
     assert len(wf['spec']['affinity']['podAffinity'][
-                   'requiredDuringSchedulingIgnoredDuringExecution']) == 2, "A pod affinity for each volume is expected"
+        'requiredDuringSchedulingIgnoredDuringExecution']) == 2, "A pod affinity for each volume is expected"
     affinity_expr = \
         wf['spec']['affinity']['podAffinity']['requiredDuringSchedulingIgnoredDuringExecution'][0]['labelSelector'][
             'matchExpressions'][0]
@@ -272,7 +275,6 @@ def test_single_task_shared_multiple():
         print(op.execute())
 
 
-
 def test_single_task_shared_script():
     shared_directory = 'myclaim:/mnt/shared'
     task_write = tasks.BashTask('download-file', source="ls -la")
@@ -283,12 +285,9 @@ def test_single_task_shared_script():
     accounts_offset = 1 if is_accounts_present() else 0
 
     assert len(op.volumes) == 1
-    assert len(wf['spec']['volumes']) == 2+accounts_offset
-    assert wf['spec']['volumes'][1+accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
-    assert len(wf['spec']['templates'][0]['script']['volumeMounts']) == 2+accounts_offset
-
-    
-    
+    assert len(wf['spec']['volumes']) == 2 + accounts_offset
+    assert wf['spec']['volumes'][1 + accounts_offset]['persistentVolumeClaim']['claimName'] == 'myclaim'
+    assert len(wf['spec']['templates'][0]['script']['volumeMounts']) == 2 + accounts_offset
 
 
 def test_result_task_workflow():
@@ -385,7 +384,7 @@ def f():
                                           operations.PodExecutionContext('a', 'b'),
                                           operations.PodExecutionContext('c', 'd', required=True),
                                           operations.PodExecutionContext('e', 'f')
-                                      ))
+    ))
     workflow = op.to_workflow()
     assert 'affinity' in workflow['spec']
     preferred = workflow['spec']['affinity']['podAffinity']['preferredDuringSchedulingIgnoredDuringExecution']
@@ -417,7 +416,6 @@ def f():
 
 def test_gpu_workflow():
 
-    
     from cloudharness.workflows import operations, tasks
 
     my_task = tasks.CustomTask('my-gpu', 'myapp-mytask', resources={"limits": {"nvidia.com/gpu": 1}})
@@ -426,4 +424,4 @@ def test_gpu_workflow():
 
     if verbose:
         print('\n', yaml.dump(wf))
-    assert "nvidia.com/gpu" in wf['spec']['templates'][1]["container"]["resources"]["limits"]
\ No newline at end of file
+    assert "nvidia.com/gpu" in wf['spec']['templates'][1]["container"]["resources"]["limits"]
diff --git a/libraries/cloudharness-utils/cloudharness_utils/constants.py b/libraries/cloudharness-utils/cloudharness_utils/constants.py
index 53282691..ced46d23 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/constants.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/constants.py
@@ -44,4 +44,4 @@
 E2E_TESTS_DIRNAME = 'e2e'
 API_TESTS_DIRNAME = 'api'
 
-E2E_TESTS_PROJECT_PATH = "test/test-e2e"
\ No newline at end of file
+E2E_TESTS_PROJECT_PATH = "test/test-e2e"
diff --git a/libraries/cloudharness-utils/cloudharness_utils/testing/api.py b/libraries/cloudharness-utils/cloudharness_utils/testing/api.py
index d7171913..57032519 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/testing/api.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/testing/api.py
@@ -12,7 +12,7 @@ def get_api_filename(app_dir):
 
 
 def get_schemathesis_command(api_filename, app_config: ApplicationHarnessConfig, app_domain: str):
-    return ["st", "--pre-run", "cloudharness_test.apitest_init", "run",  api_filename, *get_schemathesis_params(app_config, app_domain)]
+    return ["st", "--pre-run", "cloudharness_test.apitest_init", "run", api_filename, *get_schemathesis_params(app_config, app_domain)]
 
 
 def get_schemathesis_params(app_config: ApplicationHarnessConfig, app_domain: str):
diff --git a/libraries/cloudharness-utils/cloudharness_utils/testing/util.py b/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
index da758d87..528f611d 100644
--- a/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
+++ b/libraries/cloudharness-utils/cloudharness_utils/testing/util.py
@@ -4,13 +4,14 @@
 
 from cloudharness_model.models import ApplicationUser, ApplicationTestConfig, ApplicationHarnessConfig, E2ETestsConfig
 
+
 def get_user_password(main_user: ApplicationUser):
     return main_user.password or "test"
 
+
 def get_app_environment(app_config: ApplicationHarnessConfig, app_domain, use_local_env=True):
     my_env = os.environ.copy() if use_local_env else {}
     my_env["APP_URL"] = app_domain
-    
 
     if app_config.accounts and app_config.accounts.users:
         main_user: ApplicationUser = app_config.accounts.users[0]
@@ -25,4 +26,4 @@ def get_app_environment(app_config: ApplicationHarnessConfig, app_domain, use_lo
         my_env["IGNORE_CONSOLE_ERRORS"] = "true"
     if e2e_config.ignoreRequestErrors:
         my_env["IGNORE_REQUEST_ERRORS"] = "true"
-    return my_env
\ No newline at end of file
+    return my_env
diff --git a/lint.sh b/lint.sh
new file mode 100644
index 00000000..3f455702
--- /dev/null
+++ b/lint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Run autopep8 with --diff and capture the output
+diff_output=$(autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --diff\
+ --exclude '**/cloudharness_cli/**/*'\
+ --exclude '**/models/*'\
+ --exclude '**/model/*'\
+ .)
+# Check if the output is non-empty
+if [ -n "$diff_output" ]; then
+    echo $diff_output
+    echo "Code style issues found in the above files. Please run autopep8 to fix them."
+    exit 1
+fi
\ No newline at end of file
diff --git a/tools/cloudharness-test/cloudharness_test/api.py b/tools/cloudharness-test/cloudharness_test/api.py
index 5193902d..216a669c 100644
--- a/tools/cloudharness-test/cloudharness_test/api.py
+++ b/tools/cloudharness-test/cloudharness_test/api.py
@@ -6,7 +6,7 @@
 from ch_cli_tools.preprocessing import get_build_paths
 
 
-from cloudharness_model.models import  HarnessMainConfig, ApiTestsConfig, ApplicationHarnessConfig
+from cloudharness_model.models import HarnessMainConfig, ApiTestsConfig, ApplicationHarnessConfig
 from cloudharness_utils.testing.util import get_app_environment
 from cloudharness_utils.testing.api import get_api_filename, get_urls_from_api_file, get_schemathesis_command
 
@@ -90,4 +90,3 @@ def run_api_tests(root_paths, helm_values: HarnessMainConfig, base_domain, inclu
         logging.error(
             "Some api test failed. Check output for more information.")
         exit(1)
-
diff --git a/tools/cloudharness-test/cloudharness_test/e2e.py b/tools/cloudharness-test/cloudharness_test/e2e.py
index 388ed36d..d164d915 100644
--- a/tools/cloudharness-test/cloudharness_test/e2e.py
+++ b/tools/cloudharness-test/cloudharness_test/e2e.py
@@ -6,7 +6,7 @@
 
 from cloudharness_model.models import ApplicationHarnessConfig
 
-from cloudharness_utils.constants import  E2E_TESTS_PROJECT_PATH, E2E_TESTS_DIRNAME
+from cloudharness_utils.constants import E2E_TESTS_PROJECT_PATH, E2E_TESTS_DIRNAME
 from ch_cli_tools.preprocessing import get_build_paths
 from cloudharness_utils.testing.util import get_app_environment
 
@@ -16,6 +16,7 @@
 E2E_TESTS_PROJECT_ROOT = os.path.abspath(E2E_TESTS_PROJECT_PATH) if os.path.exists(
     E2E_TESTS_PROJECT_PATH) else os.path.join(ROOT, E2E_TESTS_PROJECT_PATH)
 
+
 def run_e2e_tests(root_paths, helm_values, base_domain, included_applications=[], headless=False):
 
     if which("npm") is None:
@@ -24,55 +25,53 @@ def run_e2e_tests(root_paths, helm_values, base_domain, included_applications=[]
 
     node_modules_path = os.path.join(E2E_TESTS_PROJECT_ROOT, "node_modules")
     if not os.path.exists(node_modules_path):
-            logging.info("Installing Jest-Puppeteer base project")
-            subprocess.run(["npm", "install"], cwd=E2E_TESTS_PROJECT_ROOT)
+        logging.info("Installing Jest-Puppeteer base project")
+        subprocess.run(["npm", "install"], cwd=E2E_TESTS_PROJECT_ROOT)
 
     artifacts = get_build_paths(
-            helm_values=helm_values, root_paths=root_paths)
+        helm_values=helm_values, root_paths=root_paths)
 
     failed = False
     for appkey in helm_values.apps:
         app_config: ApplicationHarnessConfig = helm_values.apps[appkey].harness
 
         appname = app_config.name
-            
+
         if included_applications and appname not in included_applications:
             continue
         if not app_config.test.e2e.enabled:
             continue
 
         tests_dir = os.path.join(
-                artifacts[appkey.replace("_", "-")], "test", E2E_TESTS_DIRNAME)
-        
+            artifacts[appkey.replace("_", "-")], "test", E2E_TESTS_DIRNAME)
+
         if not app_config.domain and not app_config.subdomain:
             logging.warn(
-                    "Application %s has a test folder but no subdomain/domain is specified", appname)
+                "Application %s has a test folder but no subdomain/domain is specified", appname)
             continue
 
         app_domain = f"http{'s' if helm_values.tls else ''}://" + \
-                (app_config.domain or f"{app_config.subdomain}.{base_domain}")
-       
-        
-        
+            (app_config.domain or f"{app_config.subdomain}.{base_domain}")
+
         env = get_app_environment(app_config, app_domain)
         if not headless and os.environ.get('DISPLAY'):
             env["PUPPETEER_DISPLAY"] = "display"
         if os.path.exists(tests_dir):
-            
+
             app_node_modules_path = os.path.join(tests_dir, "node_modules")
             if not os.path.exists(app_node_modules_path):
                 logging.info("Linking tests libraries to  %s",
-                                app_node_modules_path)
+                             app_node_modules_path)
                 os.symlink(node_modules_path, app_node_modules_path)
             env["APP"] = artifacts[appkey.replace("_", "-")]
 
         logging.info(
-                "Running tests for application %s on domain %s", appname, app_domain)
+            "Running tests for application %s on domain %s", appname, app_domain)
         result = subprocess.run(["npm", "run", "test:app"],
-                           cwd=E2E_TESTS_PROJECT_ROOT, env=env)
+                                cwd=E2E_TESTS_PROJECT_ROOT, env=env)
 
         if result.returncode > 0:
             failed = True
     if failed:
         logging.error("Some end to end test failed. Check output for more information.")
-        exit(1)
\ No newline at end of file
+        exit(1)
diff --git a/tools/cloudharness-test/cloudharness_test/utils.py b/tools/cloudharness-test/cloudharness_test/utils.py
index d0046456..e8a4aa21 100644
--- a/tools/cloudharness-test/cloudharness_test/utils.py
+++ b/tools/cloudharness-test/cloudharness_test/utils.py
@@ -1,5 +1,6 @@
 import requests
 
+
 def url_check(url):
     try:
         # Get Url
@@ -11,4 +12,4 @@ def url_check(url):
 
     except requests.exceptions.RequestException as e:
         # print URL with Errs
-        return False
\ No newline at end of file
+        return False
diff --git a/tools/cloudharness-test/harness-test b/tools/cloudharness-test/harness-test
index 43c2d501..fa69ddf8 100644
--- a/tools/cloudharness-test/harness-test
+++ b/tools/cloudharness-test/harness-test
@@ -41,7 +41,7 @@ if __name__ == "__main__":
                         help=f'Run only end to end tests (default: run both api and end to end tests')
     parser.add_argument('-a', '--api', dest='run_api', action="store_const", default=None, const=True,
                         help=f'Run only end to end tests (default: run both api and end to end tests')
-                        
+
     parser.add_argument('-hl', '--headless', dest='headless', action="store_true", default=False,
                         help=f'Run headless end to end tests')
     args, unknown = parser.parse_known_args(sys.argv[1:])
@@ -61,24 +61,22 @@ if __name__ == "__main__":
 
         with open(helm_values_path) as f:
             helm_values_raw = yaml.load(f)
-        
-        
 
         if args.domain:
-            helm_values_raw["domain"]  = args.domain
+            helm_values_raw["domain"] = args.domain
             with open(helm_values_path, 'w') as f:
                 yaml.dump(helm_values_raw, f)
 
         helm_values = HarnessMainConfig.from_dict(helm_values_raw)
         base_domain = args.domain or helm_values.domain
-        
+
         logging.info("Base domain is %s", base_domain)
         from cloudharness.utils.config import CloudharnessConfig
         CloudharnessConfig.allvalues["domain"] = base_domain
         if not url_check(f"http{'s' if helm_values.tls else ''}://{base_domain}"):
             logging.error(
                 "Base domain unreachable. Is your deployment up and running? If yes, check your DNS/hosts settings.")
-        
+
         included_applications = args.include
         if args.run_api == True or args.run_e2e is None:
             run_api_tests(root_paths, helm_values, base_domain, included_applications)
diff --git a/tools/cloudharness-test/setup.py b/tools/cloudharness-test/setup.py
index acb76ab4..5f07dfd6 100644
--- a/tools/cloudharness-test/setup.py
+++ b/tools/cloudharness-test/setup.py
@@ -28,7 +28,6 @@
 ]
 
 
-
 setup(
     name=NAME,
     version=VERSION,
diff --git a/tools/deployment-cli-tools/ch_cli_tools/__init__.py b/tools/deployment-cli-tools/ch_cli_tools/__init__.py
index 3df254d4..cca88e9b 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/__init__.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/__init__.py
@@ -12,4 +12,4 @@
 HERE = os.path.dirname(os.path.realpath(__file__))
 
 
-CH_ROOT = os.getenv("CH_ROOT") or dn(dn(dn(dn(os.path.realpath(__file__))))).replace(os.path.sep, '/')
\ No newline at end of file
+CH_ROOT = os.getenv("CH_ROOT") or dn(dn(dn(dn(os.path.realpath(__file__))))).replace(os.path.sep, '/')
diff --git a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
index 3fc5e833..5bf5c1a2 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
@@ -34,6 +34,7 @@ def literal_presenter(dumper, data):
 
 yaml.add_representer(str, literal_presenter)
 
+
 def get_main_domain(url):
     try:
         url = url.split("//")[1].split("/")[0]
@@ -45,6 +46,7 @@ def get_main_domain(url):
     except:
         return "${{ DEFAULT_REPO }}"
 
+
 def clone_step_spec(conf: GitDependencyConfig, context_path: str):
     return {
         "title": f"Cloning {os.path.basename(conf.url)} repository...",
@@ -52,9 +54,10 @@ def clone_step_spec(conf: GitDependencyConfig, context_path: str):
         "repo": conf.url,
         "revision": conf.branch_tag,
         "working_directory": join(context_path, "dependencies", conf.path or ""),
-        "git": get_main_domain(conf.url) # Cannot really tell what's the git config name, usually the name of the repo
+        "git": get_main_domain(conf.url)  # Cannot really tell what's the git config name, usually the name of the repo
     }
 
+
 def write_env_file(helm_values: HarnessMainConfig, filename, registry_secret=None):
     env = {}
     logging.info("Create env file with image info %s", filename)
@@ -74,8 +77,6 @@ def check_image_exists(name, image):
         else:
             env[app_specific_tag_variable(name) + "_NEW"] = 1
 
-    
-
     for app in helm_values.apps.values():
         if app.harness and app.harness.deployment.image:
             env[app_specific_tag_variable(app.name)] = extract_tag(app.harness.deployment.image)
@@ -95,8 +96,6 @@ def check_image_exists(name, image):
             f.write(f"{k}={v}\n")
 
 
-
-
 def create_codefresh_deployment_scripts(root_paths, envs=(), include=(), exclude=(),
                                         template_name=CF_TEMPLATE_PATH, base_image_name=None,
                                         helm_values: HarnessMainConfig = None, save=True):
@@ -128,7 +127,7 @@ def create_codefresh_deployment_scripts(root_paths, envs=(), include=(), exclude
 
     for root_path in root_paths:
         for e in envs:
-            
+
             template_name = f"codefresh-template-{e}.yaml"
             template_path = join(
                 root_path, DEPLOYMENT_CONFIGURATION_PATH, template_name)
@@ -144,7 +143,7 @@ def create_codefresh_deployment_scripts(root_paths, envs=(), include=(), exclude
             steps = codefresh['steps']
 
             def get_app_domain(app_config: ApplicationHarnessConfig):
-                base_domain=[c for c in codefresh['steps']['prepare_deployment']['commands'] if 'harness-deployment' in c][0].split("-d ")[1].split(" ")[0]
+                base_domain = [c for c in codefresh['steps']['prepare_deployment']['commands'] if 'harness-deployment' in c][0].split("-d ")[1].split(" ")[0]
                 return f"https://{app_config.subdomain}.{base_domain}"
 
             def e2e_test_environment(app_config: ApplicationHarnessConfig, app_domain: str = None):
@@ -245,7 +244,6 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
                                     clean_path(dockerfile_relative_to_root), app_name),
                                 environment=e2e_test_environment(app_config)
                             )
-            
 
             def add_unit_test_step(app_config: ApplicationHarnessConfig):
                 # Create a run step for each application with tests/unit.yaml file using the corresponding image built at the previous step
@@ -265,7 +263,7 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
                 codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE,
                                                fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
                 codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC,
-                                                include=helm_values[KEY_TASK_IMAGES].keys())
+                                               include=helm_values[KEY_TASK_IMAGES].keys())
 
             codefresh_steps_from_base_path(join(
                 root_path, APPS_PATH), CD_BUILD_STEP_PARALLEL)
@@ -281,7 +279,7 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
                 codefresh_steps_from_base_path(join(
                     root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False)
                 steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
-   
+
     if not codefresh:
         logging.warning(
             "No template file found. Codefresh script not created.")
@@ -402,9 +400,10 @@ def codefresh_app_publish_spec(app_name, build_tag, base_name=None):
         step_spec['tags'].append('latest')
     return step_spec
 
+
 def image_tag_with_variables(app_name, build_tag, base_name=""):
     return "${{REGISTRY}}/%s:${{%s}}" % (get_image_name(
-            app_name, base_name), build_tag or '${{DEPLOYMENT_TAG}}')
+        app_name, base_name), build_tag or '${{DEPLOYMENT_TAG}}')
 
 
 def app_specific_tag_variable(app_name):
@@ -421,7 +420,7 @@ def codefresh_app_build_spec(app_name, app_context_path, dockerfile_path="Docker
         title=title,
         working_directory='./' + app_context_path,
         dockerfile=dockerfile_path)
-    
+
     tag = app_specific_tag_variable(app_name)
     build["tag"] = "${{%s}}" % tag
 
@@ -451,11 +450,12 @@ def add_arg_dependencies(dependencies):
                 helm_values.apps[values_key].harness.dependencies.build)
         except (KeyError, AttributeError):
             add_arg_dependencies(helm_values['task-images'])
-    
+
     when_condition = existing_build_when_condition(tag)
     build["when"] = when_condition
     return build
 
+
 def existing_build_when_condition(tag):
     """
     See https://codefresh.io/docs/docs/pipelines/conditional-execution-of-steps/#execute-steps-according-to-the-presence-of-a-variable
@@ -472,5 +472,5 @@ def existing_build_when_condition(tag):
             }
         }
     }
-    
+
     return when_condition
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index 2552dcbe..80d6f08e 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -212,7 +212,7 @@ def __init_base_images(self, base_image_name):
             self.static_images.update(find_dockerfiles_paths(
                 os.path.join(root_path, STATIC_IMAGES_PATH)))
         return self.base_images
-    
+
     def __init_test_images(self, base_image_name):
         test_images = {}
         for root_path in self.root_paths:
@@ -224,7 +224,6 @@ def __init_test_images(self, base_image_name):
 
         return test_images
 
-    
     def __find_static_dockerfile_paths(self, root_path):
         return find_dockerfiles_paths(os.path.join(root_path, BASE_IMAGES_PATH)) + find_dockerfiles_paths(os.path.join(root_path, STATIC_IMAGES_PATH))
 
@@ -324,7 +323,6 @@ def __finish_helm_values(self, values):
         if self.registry:
             logging.info(f"Registry set: {self.registry}")
 
-
         if self.local:
             values['registry']['secret'] = ''
         if self.registry_secret:
@@ -415,19 +413,19 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()):
             tag = generate_tag_from_content(build_context_path, ignore)
             logging.info(f"Content hash: {tag}")
             dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-            tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
+            tag = sha1((tag + "".join(self.all_images.get(n, '') for n in dependencies)).encode("utf-8")).hexdigest()
             logging.info(f"Generated tag: {tag}")
-            app_name = image_name.split("/")[-1] # the image name can have a prefix
+            app_name = image_name.split("/")[-1]  # the image name can have a prefix
             self.all_images[app_name] = tag
         return self.registry + image_name + (f':{tag}' if tag else '')
-    
+
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
 
         specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
         if os.path.exists(specific_template_path):
             logging.info("Specific values template found: " +
-                        specific_template_path)
+                         specific_template_path)
             values = get_template(specific_template_path)
         else:
             values = {}
@@ -459,7 +457,7 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         if len(image_paths) > 0:
             image_name = image_name_from_dockerfile_path(os.path.relpath(
                 image_paths[0], os.path.dirname(app_path)), base_image_name)
-            
+
             values['image'] = self.image_tag(
                 image_name, build_context_path=app_path, dependencies=build_dependencies)
         elif KEY_HARNESS in values and not values[KEY_HARNESS].get(KEY_DEPLOYMENT, {}).get('image', None) and values[
diff --git a/tools/deployment-cli-tools/ch_cli_tools/models.py b/tools/deployment-cli-tools/ch_cli_tools/models.py
index 83e950b3..a9719b60 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/models.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/models.py
@@ -1 +1 @@
-from cloudharness_model import *
\ No newline at end of file
+from cloudharness_model import *
diff --git a/tools/deployment-cli-tools/ch_cli_tools/preprocessing.py b/tools/deployment-cli-tools/ch_cli_tools/preprocessing.py
index 8fc97313..f19fe9bf 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/preprocessing.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/preprocessing.py
@@ -8,8 +8,7 @@
 from .helm import KEY_APPS, KEY_TASK_IMAGES
 
 from .utils import app_name_from_path, merge_app_directories, merge_configuration_directories, find_subdirs
-from cloudharness_utils.constants import APPS_PATH,BASE_IMAGES_PATH, STATIC_IMAGES_PATH, DEFAULT_MERGE_PATH
-
+from cloudharness_utils.constants import APPS_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH, DEFAULT_MERGE_PATH
 
 
 def preprocess_build_overrides(root_paths, helm_values, merge_build_path=DEFAULT_MERGE_PATH):
@@ -27,15 +26,12 @@ def preprocess_build_overrides(root_paths, helm_values, merge_build_path=DEFAULT
     def merge_appdir(root_path, base_path):
         app_name = app_name_from_path(basename(base_path))
         dest_path = join(
-                        merge_build_path,
-                        relpath( base_path, root_path)
-                    )
+            merge_build_path,
+            relpath(base_path, root_path)
+        )
         merge_configuration_directories(artifacts[app_name], dest_path)
         merge_configuration_directories(base_path, dest_path)
 
-
-
-
     for root_path in root_paths:
 
         for base_path in find_subdirs(join(root_path, BASE_IMAGES_PATH)):
@@ -70,18 +66,19 @@ def merge_appdir(root_path, base_path):
             elif app_name.replace("-", "_") in helm_values[KEY_APPS]:
                 merge_appdir(root_path, base_path)
                 merged = True
-                
+
     if exists(merge_build_path):
         with open(join(merge_build_path, ".dockerignore"), "a") as dst:
-            
+
             for root_path in root_paths:
                 ignore_file = join(root_path, ".dockerignore")
                 if os.path.exists(ignore_file):
                     with open(ignore_file) as src:
                         dst.write(src.read())
-                
+
     return (root_paths + [merge_build_path]) if merged else root_paths
 
+
 def get_build_paths(root_paths, helm_values, merge_build_path=DEFAULT_MERGE_PATH):
     """
     Gets the same paths from preprocess_build_overrides
@@ -101,12 +98,12 @@ def get_build_paths(root_paths, helm_values, merge_build_path=DEFAULT_MERGE_PATH
                 artifacts[app_name] = base_path
             else:
                 artifacts[app_name] = join(
-                        merge_build_path,
-                        relpath( base_path, root_path)
-                    )
+                    merge_build_path,
+                    relpath(base_path, root_path)
+                )
     for root_path in root_paths:
         for base_path in find_subdirs(join(root_path, STATIC_IMAGES_PATH)):
-            
+
             app_name = app_name_from_path(basename(base_path))
             if app_name not in helm_values[KEY_TASK_IMAGES]:
                 continue
@@ -114,9 +111,9 @@ def get_build_paths(root_paths, helm_values, merge_build_path=DEFAULT_MERGE_PATH
                 artifacts[app_name] = base_path
             else:
                 artifacts[app_name] = join(
-                        merge_build_path,
-                        relpath( base_path, root_path)
-                    )
+                    merge_build_path,
+                    relpath(base_path, root_path)
+                )
 
     for root_path in root_paths:
         for base_path in find_subdirs(join(root_path, APPS_PATH)):
@@ -127,8 +124,8 @@ def get_build_paths(root_paths, helm_values, merge_build_path=DEFAULT_MERGE_PATH
                 artifacts[app_name] = base_path
             else:
                 artifacts[app_name] = join(
-                        merge_build_path,
-                        relpath( base_path, root_path)
-                    )
+                    merge_build_path,
+                    relpath(base_path, root_path)
+                )
 
     return artifacts
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index e2fbf1c9..ab39f491 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -14,11 +14,13 @@
 
 from . import HERE
 
+
 def relpath_if(p1, p2):
     if os.path.isabs(p1):
         return p1
     return relpath(p1, p2)
 
+
 def create_skaffold_configuration(root_paths, helm_values: HarnessMainConfig, output_path='.', manage_task_images=True):
     skaffold_conf = get_template('skaffold-template.yaml', True)
     apps = helm_values.apps
@@ -64,7 +66,6 @@ def build_artifact(
                                          in requirements]
         return artifact_spec
 
-
     base_images = set()
 
     def process_build_dockerfile(
@@ -106,7 +107,6 @@ def process_build_dockerfile(
         for dockerfile_path in base_dockerfiles:
             process_build_dockerfile(dockerfile_path, root_path, global_context=True)
 
-
     release_config = skaffold_conf['deploy']['helm']['releases'][0]
     release_config['name'] = helm_values.namespace
     release_config['namespace'] = helm_values.namespace
@@ -120,7 +120,6 @@ def process_build_dockerfile(
         for dockerfile_path in static_dockerfiles:
             process_build_dockerfile(dockerfile_path, root_path)
 
-
     for root_path in root_paths:
         apps_path = join(root_path, APPS_PATH)
         app_dockerfiles = find_dockerfiles_paths(apps_path)
@@ -171,7 +170,7 @@ def identify_unicorn_based_main(candidates):
                 import re
                 gunicorn_pattern = re.compile(r"gunicorn")
                 # sort candidates, shortest path first
-                for candidate in sorted(candidates,key=lambda x: len(x.split("/"))):
+                for candidate in sorted(candidates, key=lambda x: len(x.split("/"))):
                     dockerfile_path = f"{candidate}/.."
                     while not exists(f"{dockerfile_path}/Dockerfile") and abspath(dockerfile_path) != abspath(root_path):
                         dockerfile_path += "/.."
@@ -205,17 +204,17 @@ def identify_unicorn_based_main(candidates):
             test_config: ApplicationTestConfig = helm_values.apps[app_key].harness.test
             if test_config.unit.enabled and test_config.unit.commands:
 
-                    skaffold_conf['test'].append(dict(
-                        image=get_image_tag(app_name),
-                        custom=[dict(command="docker run $IMAGE " + cmd) for cmd in test_config.unit.commands]
-                    ))
-
+                skaffold_conf['test'].append(dict(
+                    image=get_image_tag(app_name),
+                    custom=[dict(command="docker run $IMAGE " + cmd) for cmd in test_config.unit.commands]
+                ))
 
         skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
         merge_to_yaml_file(skaffold_conf, os.path.join(
             output_path, 'skaffold.yaml'))
     return skaffold_conf
 
+
 def git_clone_hook(conf: GitDependencyConfig, context_path: str):
     return {
         'command': [
@@ -223,10 +222,11 @@ def git_clone_hook(conf: GitDependencyConfig, context_path: str):
             join(os.path.dirname(os.path.dirname(HERE)), 'clone.sh'),
             conf.branch_tag,
             conf.url,
-            join(context_path, "dependencies", conf.path or os.path.basename(conf.url).split('.')[0])   
+            join(context_path, "dependencies", conf.path or os.path.basename(conf.url).split('.')[0])
         ]
     }
 
+
 def create_vscode_debug_configuration(root_paths, helm_values):
     logging.info(
         "Creating VS code cloud build configuration.\nCloud build extension is needed to debug.")
@@ -267,11 +267,10 @@ def get_image_tag(name):
                     "sourceFileMap": {
                         "justMyCode": False,
                         f"${{workspaceFolder}}/{app_relative_to_root}": apps[app_key].harness.get('sourceRoot',
-                                                                                                       "/usr/src/app"),
+                                                                                                  "/usr/src/app"),
                     }
                 })
 
-
     if not os.path.exists(os.path.dirname(vscode_launch_path)):
         os.makedirs(os.path.dirname(vscode_launch_path))
     with open(vscode_launch_path, 'w') as f:
@@ -285,4 +284,4 @@ def get_additional_build_args(helm_values: HarnessMainConfig, app_key: str) -> d
     if not (helm_values.apps[app_key].harness.dockerfile and helm_values.apps[app_key].harness.dockerfile.buildArgs):
         return None
 
-    return helm_values.apps[app_key].harness.dockerfile.buildArgs
\ No newline at end of file
+    return helm_values.apps[app_key].harness.dockerfile.buildArgs
diff --git a/tools/deployment-cli-tools/ch_cli_tools/utils.py b/tools/deployment-cli-tools/ch_cli_tools/utils.py
index 3ec8e6f3..cb167110 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/utils.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/utils.py
@@ -145,9 +145,11 @@ def get_template(yaml_path, base_default=False):
 def file_is_yaml(fname):
     return fname[-4:] == 'yaml' or fname[-3:] == 'yml'
 
+
 def file_is_json(fname):
     return fname[-4:] == 'json'
 
+
 def replaceindir(root_src_dir, source, replace):
     """
     Does copy and merge (shutil.copytree requires that the destination does not exist)
@@ -290,11 +292,13 @@ def merge_yaml_files(fname, fdest):
         content_src = yaml.load(f)
     merge_to_yaml_file(content_src, fdest)
 
+
 def merge_json_files(fname, fdest):
     with open(fname) as f:
         content_src = json.load(f)
     merge_to_json_file(content_src, fdest)
 
+
 def merge_to_json_file(content_src, fdest):
     if not content_src:
         return
@@ -313,6 +317,7 @@ def merge_to_json_file(content_src, fdest):
         json.dump(merged, f, indent=2)
     return merged
 
+
 def merge_to_yaml_file(content_src, fdest):
     if not content_src:
         return
@@ -364,8 +369,8 @@ def dict_merge(dct, merge_dct, add_keys=True):
         }
 
     for k, v in merge_dct.items():
-        if (k in dct and isinstance(dct[k], dict)
-                and isinstance(merge_dct[k], collections.abc.Mapping)):
+        if (k in dct and isinstance(dct[k], dict) and
+                isinstance(merge_dct[k], collections.abc.Mapping)):
             dct[k] = dict_merge(dct[k], merge_dct[k], add_keys=add_keys)
         else:
             dct[k] = merge_dct[k]
@@ -424,6 +429,7 @@ def check_docker_manifest_exists(registry, image_name, tag, registry_secret=None
     resp = requests.get(api_url)
     return resp.status_code == 200
 
+
 def get_git_commit_hash(path):
     # return the short git commit hash in that path
     # if the path is not a git repo, return None
diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index 37bec808..58035287 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -26,7 +26,7 @@ if __name__ == "__main__":
         description='Creates a new Application.')
     parser.add_argument('name', metavar='name', type=str,
                         help='Application name')
-    parser.add_argument('-t', '--template', dest='templates', action="append", default=['base',],
+    parser.add_argument('-t', '--template', dest='templates', action="append", default=['base', ],
                         help="""Add a template name. 
                         
                         Available templates:
@@ -65,13 +65,12 @@ if __name__ == "__main__":
     if 'webapp' in templates:
         if os.path.exists(os.path.join(app_path, 'frontend')):
             shutil.rmtree(os.path.join(app_path, 'frontend'))
-        cmd = ["yarn", "create", "vite", args.name,  "--template", "react-ts"]
+        cmd = ["yarn", "create", "vite", args.name, "--template", "react-ts"]
         logging.info(f"Running command: {' '.join(cmd)}")
         subprocess.run(cmd, cwd=app_path)
         shutil.move(os.path.join(app_path, args.name), os.path.join(app_path, 'frontend'))
         generate_ts_client(openapi_file=os.path.join(app_path, 'api/openapi.yaml'))
 
-
     if 'server' in templates:
         with tempfile.TemporaryDirectory() as tmp_dirname:
             copymergedir(os.path.join(CH_ROOT, APPLICATION_TEMPLATE_PATH, template_name), tmp_dirname)
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index a9cecabb..2a0bdd0b 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -60,8 +60,7 @@ if __name__ == "__main__":
     parser.add_argument('-N', '--no-cd', dest='no_cd_gen', action="store_const", default=None, const=True,
                         help=f'Do not generate ci/cd files')
     parser.add_argument('-we', '--write-env', dest='write_env', action="store_const", default=None, const=True,
-                            help=f'Write build env to .env file in {DEPLOYMENT_PATH}')
-
+                        help=f'Write build env to .env file in {DEPLOYMENT_PATH}')
 
     args, unknown = parser.parse_known_args(sys.argv[1:])
 
@@ -108,7 +107,7 @@ if __name__ == "__main__":
                 envs=envs,
                 base_image_name=helm_values['name'],
                 helm_values=helm_values)
-            
+
         if args.write_env:
             write_env_file(helm_values, os.path.join(root_paths[-1], DEPLOYMENT_PATH, ".env"))
 
diff --git a/tools/deployment-cli-tools/setup.py b/tools/deployment-cli-tools/setup.py
index 92814c43..b01b2ae2 100644
--- a/tools/deployment-cli-tools/setup.py
+++ b/tools/deployment-cli-tools/setup.py
@@ -32,7 +32,6 @@
 ]
 
 
-
 setup(
     name=NAME,
     version=VERSION,
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/venv/matplotlib/__main__.py b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/venv/matplotlib/__main__.py
index 37de2b0b..4d9acb29 100644
--- a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/venv/matplotlib/__main__.py
+++ b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/venv/matplotlib/__main__.py
@@ -4,4 +4,4 @@
 
 
 def fake_content():
-    ...
\ No newline at end of file
+    ...
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp2/venv/matplotlib/__main__.py b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp2/venv/matplotlib/__main__.py
index 37de2b0b..4d9acb29 100644
--- a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp2/venv/matplotlib/__main__.py
+++ b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp2/venv/matplotlib/__main__.py
@@ -4,4 +4,4 @@
 
 
 def fake_content():
-    ...
\ No newline at end of file
+    ...
diff --git a/tools/deployment-cli-tools/tests/test_codefresh.py b/tools/deployment-cli-tools/tests/test_codefresh.py
index 8d118d40..4de2a07f 100644
--- a/tools/deployment-cli-tools/tests/test_codefresh.py
+++ b/tools/deployment-cli-tools/tests/test_codefresh.py
@@ -13,6 +13,7 @@
 if not os.path.exists(os.path.join(myapp_path, "dependencies/a/.git")):
     os.makedirs(os.path.join(myapp_path, "dependencies/a/.git"))
 
+
 def test_create_codefresh_configuration():
     values = create_helm_chart(
         [CLOUDHARNESS_ROOT, RESOURCES],
@@ -126,7 +127,7 @@ def test_create_codefresh_configuration():
         assert len(
             tstep['commands']) == 2, "Unit test commands are not properly loaded from the unit test configuration file"
         assert tstep['commands'][0] == "tox", "Unit test commands are not properly loaded from the unit test configuration file"
-    
+
         assert len(l1_steps[CD_BUILD_STEP_DEPENDENCIES]['steps']) == 3, "3 clone steps should be included as we have 2 dependencies from myapp, plus cloudharness"
     finally:
         shutil.rmtree(BUILD_MERGE_DIR)
@@ -153,12 +154,12 @@ def test_create_codefresh_configuration_multienv():
         )
 
         build_included = [app['harness']['name']
-                        for app in values['apps'].values() if 'harness' in app]
+                          for app in values['apps'].values() if 'harness' in app]
 
         cf = create_codefresh_deployment_scripts(root_paths, include=build_included,
-                                                envs=['dev', 'test'],
-                                                base_image_name=values['name'],
-                                                helm_values=values, save=False)
+                                                 envs=['dev', 'test'],
+                                                 base_image_name=values['name'],
+                                                 helm_values=values, save=False)
 
         assert cf['test_step'] == 'test'
         assert cf['test'] == True
@@ -173,7 +174,6 @@ def test_create_codefresh_configuration_multienv():
         shutil.rmtree(BUILD_MERGE_DIR)
 
 
-
 def test_create_codefresh_configuration_tests():
     values = create_helm_chart(
         [CLOUDHARNESS_ROOT, RESOURCES],
@@ -213,8 +213,6 @@ def test_create_codefresh_configuration_tests():
 
         assert "test-api" in st_build_test_steps["test-api"]["dockerfile"], "test-api image must be built from root context"
 
-        
-
         e2e_steps = l1_steps[CD_E2E_TEST_STEP]['scale']
 
         assert "samples_e2e_test" in e2e_steps, "samples e2e test step must be included"
@@ -245,13 +243,12 @@ def test_create_codefresh_configuration_tests():
         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"
 
     finally:
         shutil.rmtree(BUILD_MERGE_DIR)
-    
+
     values = create_helm_chart(
         [CLOUDHARNESS_ROOT, RESOURCES],
         output_path=OUT,
diff --git a/tools/deployment-cli-tools/tests/test_helm.py b/tools/deployment-cli-tools/tests/test_helm.py
index ed53ab86..da0073f0 100644
--- a/tools/deployment-cli-tools/tests/test_helm.py
+++ b/tools/deployment-cli-tools/tests/test_helm.py
@@ -148,17 +148,16 @@ def test_collect_helm_values_precedence():
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['memory'] == 'overridden'
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['cpu'] == 'overridden-prod'
 
+
 def test_collect_helm_values_multiple_envs():
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
                                namespace='test', env=['dev', 'test'], local=False, tag=1, include=["myapp"])
 
-
     assert values[KEY_APPS]['myapp']['test'] == True, 'values-test not loaded'
     assert values[KEY_APPS]['myapp']['dev'] == True, 'values-dev not loaded'
     assert values[KEY_APPS]['myapp']['a'] == 'test', 'values-test not overriding'
 
 
-
 def test_collect_helm_values_wrong_dependencies_validate():
     try:
         values = create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=OUT, domain="my.local",
@@ -209,21 +208,21 @@ def test_collect_helm_values_build_dependencies():
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
     assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
 
+
 def test_collect_helm_values_build_dependencies_nodeps():
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["events"])
 
-
     assert 'cloudharness-flask' not in values[KEY_TASK_IMAGES], "Cloudharness-flask is not included in the build dependencies"
     assert 'cloudharness-base' not in values[KEY_TASK_IMAGES], "Cloudharness-base is not included in the build dependencies"
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
     assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
 
+
 def test_collect_helm_values_build_dependencies_exclude():
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["workflows"], exclude=["workflows-extract-download"])
 
-
     assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES], "Cloudharness-base is included in cloudharness-flask Dockerfile and it should be guessed"
     assert 'workflows-extract-download' not in values[KEY_TASK_IMAGES], "workflows-extract-download has been explicitly excluded"
@@ -274,6 +273,7 @@ def test_clear_all_dbconfig_if_nodb():
     db_config = values[KEY_APPS]['myapp'][KEY_HARNESS][KEY_DATABASE]
     assert db_config is None
 
+
 def test_tag_hash_generation():
     v1 = generate_tag_from_content(RESOURCES)
     v2 = generate_tag_from_content(RESOURCES, ignore=['myapp'])
@@ -297,18 +297,19 @@ def test_tag_hash_generation():
     finally:
         os.remove(fname)
 
+
 def test_collect_helm_values_auto_tag():
     def create():
         return create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, include=['samples', 'myapp'],
-                               exclude=['events'], domain="my.local",
-                               namespace='test', env='dev', local=False, tag=None, registry='reg')
-    
+                                 exclude=['events'], domain="my.local",
+                                 namespace='test', env='dev', local=False, tag=None, registry='reg')
+
     BASE_KEY = "cloudharness-base"
     values = create()
 
     # Auto values are set by using the directory hash
     assert 'reg/cloudharness/myapp:' in values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image']
-    assert 'reg/cloudharness/myapp:' in values.apps['myapp'].harness.deployment.image 
+    assert 'reg/cloudharness/myapp:' in values.apps['myapp'].harness.deployment.image
     assert 'cloudharness/myapp-mytask' in values[KEY_TASK_IMAGES]['myapp-mytask']
     assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == values.apps['myapp'].harness.deployment.image
     v1 = values.apps['myapp'].harness.deployment.image
@@ -320,7 +321,6 @@ def create():
     assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing changed the hash value"
     assert values["task-images"][BASE_KEY] == b1, "Base image should not change following the root .dockerignore"
 
-        
     try:
         fname = os.path.join(RESOURCES, 'applications', 'myapp', 'afile.txt')
         with open(fname, 'w') as f:
@@ -333,7 +333,6 @@ def create():
     finally:
         os.remove(fname)
 
-
     try:
         with open(fname, 'w') as f:
             f.write('a')
@@ -343,7 +342,6 @@ def create():
     finally:
         os.remove(fname)
 
-
     fname = os.path.join(RESOURCES, 'applications', 'myapp', 'afile.ignored')
     try:
         with open(fname, 'w') as f:
@@ -355,8 +353,6 @@ def create():
         assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing should change the hash value as the file is ignored in the .dockerignore"
     finally:
         os.remove(fname)
-    
-
 
     # Dependencies test: if a dependency is changed, the hash should change
     fname = os.path.join(RESOURCES, 'infrastructure/common-images', 'my-common', 'afile')
@@ -366,25 +362,21 @@ def create():
             f.write('a')
 
         values = create()
-        
+
         assert c1 != values["task-images"]["my-common"], "If content of a static image is changed, the hash should change"
         assert v1 != values.apps['myapp'].harness.deployment.image, "If a static image dependency is changed, the hash should change"
     finally:
         os.remove(fname)
 
-
     fname = os.path.join(CLOUDHARNESS_ROOT, 'atestfile')
     try:
         with open(fname, 'w') as f:
             f.write('a')
 
         values = create()
-        
+
         assert b1 != values["task-images"][BASE_KEY], "Content for base image is changed, the hash should change"
         assert d1 != values["task-images"]["cloudharness-flask"], "Content for base image is changed, the static image should change"
         assert v1 != values.apps['myapp'].harness.deployment.image, "2 levels dependency: If a base image dependency is changed, the hash should change"
     finally:
         os.remove(fname)
-
-
-
diff --git a/tools/deployment-cli-tools/tests/test_preprocessing.py b/tools/deployment-cli-tools/tests/test_preprocessing.py
index b0971178..37c4bc66 100644
--- a/tools/deployment-cli-tools/tests/test_preprocessing.py
+++ b/tools/deployment-cli-tools/tests/test_preprocessing.py
@@ -9,6 +9,7 @@
 CLOUDHARNESS_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
 MERGE_BUILD_DIR = "/tmp/build"
 
+
 def test_get_build_paths():
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, include=['samples', 'myapp'],
                                exclude=['events'], domain="my.local",
@@ -16,30 +17,30 @@ def test_get_build_paths():
     artifacts = get_build_paths(root_paths=[CLOUDHARNESS_ROOT, RESOURCES], helm_values=values, merge_build_path=MERGE_BUILD_DIR)
     assert 'cloudharness-base' in artifacts
     assert "events" not in artifacts
-    assert "samples" in artifacts 
+    assert "samples" in artifacts
 
     assert artifacts['cloudharness-base'] == os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base")
     assert artifacts['samples'] == os.path.join(CLOUDHARNESS_ROOT, APPS_PATH, "samples")
 
+
 def test_preprocess_build_overrides():
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=OUT, include=['samples', 'myapp'],
                                exclude=['events'], domain="my.local",
                                namespace='test', env='dev', local=False, tag=1, registry='reg')
 
-
     res = preprocess_build_overrides(root_paths=[CLOUDHARNESS_ROOT, RESOURCES], helm_values=values, merge_build_path=MERGE_BUILD_DIR)
     assert len(res) == 3
     assert MERGE_BUILD_DIR in res[2]
     assert os.path.exists(MERGE_BUILD_DIR)
 
-    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base/testfile")) 
-    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base/Dockerfile")) 
-    assert not os.path.exists(os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base-debian")) 
-    assert not os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "events")) 
+    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base/testfile"))
+    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base/Dockerfile"))
+    assert not os.path.exists(os.path.join(MERGE_BUILD_DIR, BASE_IMAGES_PATH, "cloudharness-base-debian"))
+    assert not os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "events"))
 
-    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "accounts/deploy/values.yaml")) 
-    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "workflows/tasks/new-task/Dockerfile")) 
-    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "workflows/tasks/notify-queue/new-file")) 
-    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "workflows/tasks/notify-queue/Dockerfile")) 
+    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "accounts/deploy/values.yaml"))
+    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "workflows/tasks/new-task/Dockerfile"))
+    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "workflows/tasks/notify-queue/new-file"))
+    assert os.path.exists(os.path.join(MERGE_BUILD_DIR, APPS_PATH, "workflows/tasks/notify-queue/Dockerfile"))
 
     shutil.rmtree(MERGE_BUILD_DIR)
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
index 999ad639..3c545d21 100644
--- a/tools/deployment-cli-tools/tests/test_skaffold.py
+++ b/tools/deployment-cli-tools/tests/test_skaffold.py
@@ -70,10 +70,9 @@ def test_create_skaffold_configuration():
     cloudharness_flask_artifact = next(
         a for a in sk['build']['artifacts'] if a['image'] == 'reg/cloudharness/cloudharness-flask')
 
-
     assert os.path.samefile(cloudharness_flask_artifact['context'],
-       join(CLOUDHARNESS_ROOT, 'infrastructure/common-images/cloudharness-flask')
-    )
+                            join(CLOUDHARNESS_ROOT, 'infrastructure/common-images/cloudharness-flask')
+                            )
 
     assert len(cloudharness_flask_artifact['requires']) == 1
 
@@ -94,7 +93,6 @@ def test_create_skaffold_configuration():
         a for a in sk['build']['artifacts'] if a['image'] == 'reg/cloudharness/accounts')
     assert os.path.samefile(accounts_artifact['context'], '/tmp/build/applications/accounts')
 
-
     # Custom unit tests
     assert len(sk['test']) == 2, 'Unit tests should be included'
 
@@ -181,4 +179,4 @@ def test_create_skaffold_configuration_with_conflicting_dependencies_requirement
     assert 'matplotlib' not in release['overrides']['apps']
 
     myapp_config = release['overrides']['apps']['myapp2']
-    assert myapp_config['harness']['deployment']['args'][0] == '/usr/src/app/myapp_code/__main__.py'
\ No newline at end of file
+    assert myapp_config['harness']['deployment']['args'][0] == '/usr/src/app/myapp_code/__main__.py'
diff --git a/tools/deployment-cli-tools/tests/test_utils.py b/tools/deployment-cli-tools/tests/test_utils.py
index cade7770..78e84333 100644
--- a/tools/deployment-cli-tools/tests/test_utils.py
+++ b/tools/deployment-cli-tools/tests/test_utils.py
@@ -76,13 +76,14 @@ def test_check_docker_manifest_exists():
     assert check_docker_manifest_exists("gcr.io/metacellllc", "cloudharness/cloudharness-base", "latest")
     assert not check_docker_manifest_exists("gcr.io/metacellllc", "cloudharness/cloudharness-base", "RANDOM_TAG")
 
+
 def test_find_dockerfile_paths():
-    
+
     myapp_path = os.path.join(HERE, "resources/applications/myapp")
     if not os.path.exists(os.path.join(myapp_path, "dependencies/a/.git")):
         os.makedirs(os.path.join(myapp_path, "dependencies/a/.git"))
-        
+
     dockerfiles = find_dockerfiles_paths(myapp_path)
     assert len(dockerfiles) == 2
     assert next(d for d in dockerfiles if d.endswith("myapp")), "Must find the Dockerfile in the root directory"
-    assert next(d for d in dockerfiles if d.endswith("myapp/tasks/mytask")), "Must find the Dockerfile in the tasks directory"
\ No newline at end of file
+    assert next(d for d in dockerfiles if d.endswith("myapp/tasks/mytask")), "Must find the Dockerfile in the tasks directory"

From 8e0ff82b797aa218196eff9c3fa6ead031d805ea Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 9 Sep 2024 17:11:53 +0200
Subject: [PATCH 128/210] CH-147 linting automation

---
 .github/workflows/lint-check.yml              | 23 +++++++++++++++++++
 .../samples/paths/operation_async/get.py      |  4 +---
 lint.sh => lint-check.sh                      |  6 +----
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/lint-check.yml
 rename lint.sh => lint-check.sh (75%)

diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-check.yml
new file mode 100644
index 00000000..efee9f91
--- /dev/null
+++ b/.github/workflows/lint-check.yml
@@ -0,0 +1,23 @@
+name: Lint Check
+
+on:
+  push
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Install autopep8
+      run: pip install autopep8
+
+    - name: Run lint-check.sh
+      run: bash lint-check.sh
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py
index 24318033..a1854929 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py
@@ -25,7 +25,7 @@
 
 from cloudharness_cli.samples import schemas  # noqa: F401
 
-from cloudharness_cli/samples.model.inline_response202 import InlineResponse202
+from cloudharness_cli.samples.model.inline_response202 import InlineResponse202
 
 from . import path
 
@@ -231,5 +231,3 @@ def get(
             timeout=timeout,
             skip_deserialization=skip_deserialization
         )
-
-
diff --git a/lint.sh b/lint-check.sh
similarity index 75%
rename from lint.sh
rename to lint-check.sh
index 3f455702..426bfaff 100644
--- a/lint.sh
+++ b/lint-check.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 # Run autopep8 with --diff and capture the output
-diff_output=$(autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --diff\
- --exclude '**/cloudharness_cli/**/*'\
- --exclude '**/models/*'\
- --exclude '**/model/*'\
- .)
+diff_output=$(autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --diff --exclude '**/cloudharness_cli/**/*,**/models/*,**/model/*' .)
 # Check if the output is non-empty
 if [ -n "$diff_output" ]; then
     echo $diff_output

From ddaa206a91094d76582526ecfa80424dfb7548b6 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 9 Sep 2024 16:13:33 +0100
Subject: [PATCH 129/210] CH-137 Add obsoleted label match expression to remove
 issues with breaking changes

---
 deployment-configuration/helm/templates/auto-database.yaml    | 1 +
 deployment-configuration/helm/templates/auto-deployments.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/deployment-configuration/helm/templates/auto-database.yaml b/deployment-configuration/helm/templates/auto-database.yaml
index 0658a47e..cd7f0bdd 100644
--- a/deployment-configuration/helm/templates/auto-database.yaml
+++ b/deployment-configuration/helm/templates/auto-database.yaml
@@ -53,6 +53,7 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
+                      - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
                       - {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
               topologyKey: "kubernetes.io/hostname"
       containers:
diff --git a/deployment-configuration/helm/templates/auto-deployments.yaml b/deployment-configuration/helm/templates/auto-deployments.yaml
index 2db3714d..66c34f55 100644
--- a/deployment-configuration/helm/templates/auto-deployments.yaml
+++ b/deployment-configuration/helm/templates/auto-deployments.yaml
@@ -44,6 +44,7 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
+                      - {{ .app.harness.deployment.volume.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
                       - {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
               topologyKey: "kubernetes.io/hostname"
       {{- end }}

From 89db313430b8ca4f740f0bc927c8df1606f31567 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 9 Sep 2024 16:32:56 +0100
Subject: [PATCH 130/210] CH-137 Move value to secondary selector to fix
 deployments

---
 deployment-configuration/helm/templates/auto-database.yaml | 7 ++++++-
 .../helm/templates/auto-deployments.yaml                   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/deployment-configuration/helm/templates/auto-database.yaml b/deployment-configuration/helm/templates/auto-database.yaml
index cd7f0bdd..c2fb02dd 100644
--- a/deployment-configuration/helm/templates/auto-database.yaml
+++ b/deployment-configuration/helm/templates/auto-database.yaml
@@ -53,8 +53,13 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
-                      - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
                       - {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
+            - labelSelector:
+                matchExpressions:
+                  - key: usesvolume
+                    operator: In
+                    values:
+                      - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: {{ .app.harness.database.name | quote }}
diff --git a/deployment-configuration/helm/templates/auto-deployments.yaml b/deployment-configuration/helm/templates/auto-deployments.yaml
index 66c34f55..8c8bc047 100644
--- a/deployment-configuration/helm/templates/auto-deployments.yaml
+++ b/deployment-configuration/helm/templates/auto-deployments.yaml
@@ -44,8 +44,13 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
-                      - {{ .app.harness.deployment.volume.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
                       - {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
+            - labelSelector:
+                matchExpressions:
+                  - key: usesvolume
+                    operator: In
+                    values:
+                      - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
               topologyKey: "kubernetes.io/hostname"
       {{- end }}
       {{- end }}

From b972e82dbaa68148810e02a98492c24f2e91059a Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 9 Sep 2024 18:10:19 +0100
Subject: [PATCH 131/210] CH-137 Reverting failed attempt

---
 deployment-configuration/helm/templates/auto-database.yaml | 5 -----
 .../helm/templates/auto-deployments.yaml                   | 7 +------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/deployment-configuration/helm/templates/auto-database.yaml b/deployment-configuration/helm/templates/auto-database.yaml
index c2fb02dd..1399961a 100644
--- a/deployment-configuration/helm/templates/auto-database.yaml
+++ b/deployment-configuration/helm/templates/auto-database.yaml
@@ -54,11 +54,6 @@ spec:
                     operator: In
                     values:
                       - {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
-            - labelSelector:
-                matchExpressions:
-                  - key: usesvolume
-                    operator: In
-                    values:
                       - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
               topologyKey: "kubernetes.io/hostname"
       containers:
diff --git a/deployment-configuration/helm/templates/auto-deployments.yaml b/deployment-configuration/helm/templates/auto-deployments.yaml
index 8c8bc047..641d4852 100644
--- a/deployment-configuration/helm/templates/auto-deployments.yaml
+++ b/deployment-configuration/helm/templates/auto-deployments.yaml
@@ -45,12 +45,7 @@ spec:
                     operator: In
                     values:
                       - {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
-            - labelSelector:
-                matchExpressions:
-                  - key: usesvolume
-                    operator: In
-                    values:
-                      - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
+                      - {{ .app.harness.deployment.volume.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
               topologyKey: "kubernetes.io/hostname"
       {{- end }}
       {{- end }}

From 8c2e86079374c819b5204797816b64450ddc487c Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 10 Sep 2024 12:46:31 +0200
Subject: [PATCH 132/210] CH-32 Add Neo4j browser

---
 applications/neo4j/.gitignore                 |   1 +
 applications/neo4j/README.md                  |  22 ++++++++++
 .../deploy/templates/reverseProxyServer.yaml  |  37 ++++++++++++++++
 applications/neo4j/deploy/values.yaml         |  41 ++++++++++++++++++
 applications/neo4j/docs/browser-login.png     | Bin 0 -> 25106 bytes
 .../helm/templates/auto-database-neo4j.yaml   |   2 +
 6 files changed, 103 insertions(+)
 create mode 100644 applications/neo4j/.gitignore
 create mode 100644 applications/neo4j/README.md
 create mode 100644 applications/neo4j/deploy/templates/reverseProxyServer.yaml
 create mode 100644 applications/neo4j/deploy/values.yaml
 create mode 100644 applications/neo4j/docs/browser-login.png

diff --git a/applications/neo4j/.gitignore b/applications/neo4j/.gitignore
new file mode 100644
index 00000000..7c561691
--- /dev/null
+++ b/applications/neo4j/.gitignore
@@ -0,0 +1 @@
+helm-charts
\ No newline at end of file
diff --git a/applications/neo4j/README.md b/applications/neo4j/README.md
new file mode 100644
index 00000000..49dadb60
--- /dev/null
+++ b/applications/neo4j/README.md
@@ -0,0 +1,22 @@
+# Neo4j browser helm chart
+
+Enable this application to deploy a Neo4j server with the neo4j browser enabled.
+
+## How to use
+The browser will be enabled at neo4j.[DOMAIN].
+
+![Neo4j browser login](docs/browser-login.png)
+
+The default credentials are set in the [application configuration file](deploy/values.yaml).
+
+It is recommended to change the password during the first login, such as:
+
+```
+ALTER USER default SET PASSWORD '<new-password>'
+```
+
+## Implementation
+This implementation uses the Neo4j reverse proxy server to enable usage via Ingress and http(s).
+
+For more information, see https://neo4j.com/docs/operations-manual/current/kubernetes/accessing-neo4j-ingress/
+
diff --git a/applications/neo4j/deploy/templates/reverseProxyServer.yaml b/applications/neo4j/deploy/templates/reverseProxyServer.yaml
new file mode 100644
index 00000000..f273acb9
--- /dev/null
+++ b/applications/neo4j/deploy/templates/reverseProxyServer.yaml
@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.apps.neo4j.harness.deployment.name }}
+  labels:
+    app: {{ .Values.apps.neo4j.harness.deployment.name }}
+  namespace: "{{ .Release.Namespace }}"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.apps.neo4j.harness.deployment.name }}
+  template:
+    metadata:
+      name: {{ .Values.apps.neo4j.harness.deployment.name }}
+      labels:
+        name: {{ .Values.apps.neo4j.harness.deployment.name }}
+        app: {{ .Values.apps.neo4j.harness.deployment.name }}
+    spec:
+      securityContext: {{ toYaml .Values.apps.neo4j.reverseProxy.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Values.apps.neo4j.harness.deployment.name }}
+          image: {{ .Values.apps.neo4j.reverseProxy.image }}
+          imagePullPolicy: Always
+          securityContext: {{ toYaml .Values.apps.neo4j.reverseProxy.containerSecurityContext | nindent 12 }}
+          ports:
+            - containerPort: {{ .Values.apps.neo4j.harness.deployment.port }}
+          env:
+            - name: SERVICE_NAME
+              value: {{ .Values.apps.neo4j.harness.database.name }}
+            - name: PORT
+              value: {{ .Values.apps.neo4j.harness.deployment.port  | quote }}
+            - name: DOMAIN
+              value: {{ .Values.apps.neo4j.reverseProxy.domain | default "cluster.local" }}
+            - name: NAMESPACE
+              value: {{ .Release.Namespace }}
+---
\ No newline at end of file
diff --git a/applications/neo4j/deploy/values.yaml b/applications/neo4j/deploy/values.yaml
new file mode 100644
index 00000000..4a9a45a4
--- /dev/null
+++ b/applications/neo4j/deploy/values.yaml
@@ -0,0 +1,41 @@
+harness:
+  subdomain: neo4j
+  database:
+    auto: true
+    name: neo4j-db
+    type: neo4j
+    user: default
+    pass: default
+  deployment:
+    auto: false
+  service:
+    auto: true
+# Parameters for reverse proxy
+reverseProxy:
+  image: "neo4j/helm-charts-reverse-proxy:5.23"
+
+  # Name of the kubernetes service. This service should have the ports 7474 and 7687 open.
+  # This could be the admin service ex: "standalone-admin" or the loadbalancer service ex: "standalone" created via the neo4j helm chart
+  # serviceName , namespace , domain together will form the complete k8s service url. Ex: standalone-admin.default.svc.cluster.local
+  # When used against a cluster ensure the service being used is pointing to all the cluster instances.
+  # This could be the loadbalancer from neo4j helm chart or the headless service installed via neo4j-headless-service helm chart
+  serviceName: ""
+  # default is set to cluster.local
+  domain: "cluster.local"
+
+  # securityContext defines privilege and access control settings for a Container. Making sure that we dont run Neo4j as root user.
+  containerSecurityContext:
+    allowPrivilegeEscalation: false
+    runAsNonRoot: true
+    runAsUser: 7474
+    runAsGroup: 7474
+    capabilities:
+      drop:
+        - all
+
+  podSecurityContext:
+    runAsNonRoot: true
+    runAsUser: 7474
+    runAsGroup: 7474
+    fsGroup: 7474
+    fsGroupChangePolicy: "Always"
diff --git a/applications/neo4j/docs/browser-login.png b/applications/neo4j/docs/browser-login.png
new file mode 100644
index 0000000000000000000000000000000000000000..86e1db1ee173602f66e72c70a99ca8398586bfc9
GIT binary patch
literal 25106
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
Y`|v9LOSv0t(NuH}=<m<lYkBE^0DWEP8vp<R

literal 0
HcmV?d00001

diff --git a/deployment-configuration/helm/templates/auto-database-neo4j.yaml b/deployment-configuration/helm/templates/auto-database-neo4j.yaml
index d64d8b4c..bddbab24 100644
--- a/deployment-configuration/helm/templates/auto-database-neo4j.yaml
+++ b/deployment-configuration/helm/templates/auto-database-neo4j.yaml
@@ -21,4 +21,6 @@
             value: {{ .app.harness.database.neo4j.memory.heap.max }}
           - name: NEO4J_dbms_security_auth__enabled
             value: {{ .app.harness.database.neo4j.dbms_security_auth_enabled | quote }}
+          - name: NEO4J_auth
+            value: {{ .app.harness.database.user }}/{{ .app.harness.database.pass }}
 {{- end }}
\ No newline at end of file

From fa72dc9dfa2d385bdfc268ea4382780491e786c8 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 10 Sep 2024 12:57:45 +0200
Subject: [PATCH 133/210] CH-32 Add option to directly access a database

---
 deployment-configuration/helm/templates/auto-database.yaml | 2 +-
 deployment-configuration/value-template.yaml               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/helm/templates/auto-database.yaml b/deployment-configuration/helm/templates/auto-database.yaml
index 6ec31380..a53ea686 100644
--- a/deployment-configuration/helm/templates/auto-database.yaml
+++ b/deployment-configuration/helm/templates/auto-database.yaml
@@ -101,7 +101,7 @@ metadata:
     app: {{ .app.harness.deployment.name | quote }}
 {{ include "deploy_utils.labels" .root | indent 4 }}
 spec:
-  type: ClusterIP
+  type: {{-if .app.harness.database.expose }}LoadBalancer{{- else }}ClusterIP{{- end }}
   selector:
     app: {{ .app.harness.database.name | quote }}
   ports:
diff --git a/deployment-configuration/value-template.yaml b/deployment-configuration/value-template.yaml
index c04439a3..222aa7f6 100644
--- a/deployment-configuration/value-template.yaml
+++ b/deployment-configuration/value-template.yaml
@@ -75,6 +75,8 @@ harness:
     pass: metacell
     # -- image ref for referencing images from the build, e.g. image_ref: myownpgimage
     image_ref:
+    # -- expose database to the public with ingress
+    expose: false
     # -- settings for mongo database (for type==mongo)
     mongo:
       image: mongo:5

From 0e282101a4d1b066ea74f51bfc72059e571dd132 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 10 Sep 2024 13:07:15 +0200
Subject: [PATCH 134/210] CH-32 Update Neo4j

---
 deployment-configuration/value-template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment-configuration/value-template.yaml b/deployment-configuration/value-template.yaml
index 222aa7f6..ff281466 100644
--- a/deployment-configuration/value-template.yaml
+++ b/deployment-configuration/value-template.yaml
@@ -92,7 +92,7 @@ harness:
           port: 5432
     # -- settings for neo4j database (for type==neo4j)
     neo4j:
-      image: neo4j:4.1.9
+      image: neo4j:5
       memory:
         size: 256M
         pagecache:

From f334040bf6ff9b7ca291935f1650bf696c002c06 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 10 Sep 2024 13:07:27 +0200
Subject: [PATCH 135/210] CH-32 Add documentation

---
 docs/applications/databases.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/applications/databases.md b/docs/applications/databases.md
index 89bd2868..96498f6c 100644
--- a/docs/applications/databases.md
+++ b/docs/applications/databases.md
@@ -35,6 +35,9 @@ harness:
 
 `image_ref`: Optional setting, used for referencing a base/static image from the build. The complete image name with tag will automagically being generated from the values.yaml file. This setting overrides the `image` setting specific for the database type (e.g. postgres/image). Note: the referenced image must be included as a build dependency in order to be built by the pipelines.
 
+`expose`: This option allows you to expose the database port through a load balancer.
+Do not use on production!
+
 
 ### Specific database settings
 
@@ -91,7 +94,24 @@ harness
 
 #### Neo4j
 
-Not yet supported!
+Defaults:
+```yaml
+harness
+  database:
+    neo4j:
+      dbms_security_auth_enabled: "false"
+      image: neo4j:5
+      memory:
+        heap: { initial: 64M, max: 128M }
+        pagecache: { size: 64M }
+        size: 256M
+        ports:
+          - { name: http, port: 7474 }
+          - { name: bolt, port: 7687 }
+```
+
+Not that the default resource values are not optimized and increasing the default memory is recommended for production.
+Mapping memory configuration with Kubernetes resource requests is also recommended.
 
 ## Programmatic API
 

From 06f99f12ca329c1c49684dd2f0e59220f17d1f41 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 10 Sep 2024 14:15:19 +0200
Subject: [PATCH 136/210] CH-32 Fix

---
 deployment-configuration/helm/templates/auto-database.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment-configuration/helm/templates/auto-database.yaml b/deployment-configuration/helm/templates/auto-database.yaml
index a53ea686..2e0c1586 100644
--- a/deployment-configuration/helm/templates/auto-database.yaml
+++ b/deployment-configuration/helm/templates/auto-database.yaml
@@ -101,7 +101,7 @@ metadata:
     app: {{ .app.harness.deployment.name | quote }}
 {{ include "deploy_utils.labels" .root | indent 4 }}
 spec:
-  type: {{-if .app.harness.database.expose }}LoadBalancer{{- else }}ClusterIP{{- end }}
+  type: {{ if .app.harness.database.expose }}LoadBalancer{{ else }}ClusterIP{{ end }}
   selector:
     app: {{ .app.harness.database.name | quote }}
   ports:

From 2dc0b2c9fc6924771b81a82f3d089d9ecaff49a5 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 10 Sep 2024 18:45:11 +0200
Subject: [PATCH 137/210] CH-147 Linting update in samples and templates

---
 .../webapp/frontend/.eslintrc.cjs             |   19 -
 .../webapp/frontend/eslint.config.js          |   56 +
 .../webapp/frontend/package.json              |    3 +-
 applications/samples/frontend/.eslintrc.cjs   |   40 -
 .../samples/frontend/eslint.config.js         |   56 +
 applications/samples/frontend/package.json    |   20 +-
 applications/samples/frontend/src/App.tsx     |   16 +-
 applications/samples/frontend/vite.config.ts  |   32 +-
 applications/samples/frontend/yarn.lock       | 1260 ++++-------------
 9 files changed, 421 insertions(+), 1081 deletions(-)
 delete mode 100644 application-templates/webapp/frontend/.eslintrc.cjs
 create mode 100644 application-templates/webapp/frontend/eslint.config.js
 delete mode 100644 applications/samples/frontend/.eslintrc.cjs
 create mode 100644 applications/samples/frontend/eslint.config.js

diff --git a/application-templates/webapp/frontend/.eslintrc.cjs b/application-templates/webapp/frontend/.eslintrc.cjs
deleted file mode 100644
index c73cf24e..00000000
--- a/application-templates/webapp/frontend/.eslintrc.cjs
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = {
-  root: true,
-  env: { browser: true, es2020: true },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-  ],
-  ignorePatterns: ['dist', '.eslintrc.cjs', 'src/rest/*'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
-  rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
-    '@typescript-eslint/no-explicit-any': 'off',
-  }
-}
diff --git a/application-templates/webapp/frontend/eslint.config.js b/application-templates/webapp/frontend/eslint.config.js
new file mode 100644
index 00000000..5fbd4636
--- /dev/null
+++ b/application-templates/webapp/frontend/eslint.config.js
@@ -0,0 +1,56 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import tseslint from 'typescript-eslint'
+
+
+export default tseslint.config(
+  {
+    ignores: [
+      'dist',
+      'node_modules',
+      '.yalc',
+      'src/rest/*' // do not lint generated code
+    ]
+  },
+  {
+    extends: [js.configs.recommended, ...tseslint.configs.recommended],
+    files: ['**/*.{ts,tsx,js,jsx}'],
+    languageOptions: {
+      ecmaVersion: "latest",
+      globals: globals.browser,
+      sourceType: "module"
+    },
+    plugins: {
+      'react-hooks': reactHooks,
+      'react-refresh': reactRefresh,
+    },
+    rules: {
+      ...reactHooks.configs.recommended.rules,
+      'react-refresh/only-export-components': [
+        'warn',
+        { allowConstantExport: true },
+      ],
+      indent: ["error", 2, {
+        SwitchCase: 1,
+      }],
+      curly: "error",  // enforce braces for one-line blocks
+      "no-tabs": "error",  // enforce no tabs
+      "no-console": ["warn", {
+        allow: ["warn", "error", "debug"],
+      }],
+      "@typescript-eslint/no-explicit-any": "off", // No strict typing (annoying especially with React elements and events callbacks)
+      "consistent-return": "warn", // https://eslint.org/docs/latest/rules/consistent-return
+      "prefer-arrow-callback": ["warn"],
+      "object-curly-spacing": ["warn", "always"], // enforce consistent spacing inside braces
+      "func-style": "off", // function expressions or arrow functions are equally valid
+      "no-unneeded-ternary": "warn", // disallow unnecessary ternary expressions
+      // React rules: https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules
+      "react/prop-types": "off", // PropTypes are not forced
+      "react/forbid-prop-types": "off", // all PropTypes are allowed
+      "react-hooks/rules-of-hooks": "error", // https://react.dev/reference/rules/rules-of-hooks
+      "react-hooks/exhaustive-deps": "warn", // Hooks dependency array, sometimes it's better to ignore
+    },
+  }
+)
\ No newline at end of file
diff --git a/application-templates/webapp/frontend/package.json b/application-templates/webapp/frontend/package.json
index b8d45278..4d852c34 100644
--- a/application-templates/webapp/frontend/package.json
+++ b/application-templates/webapp/frontend/package.json
@@ -6,6 +6,7 @@
     "start:dev": "DOMAIN=https://test.ch.metacell.us vite",
     "start:local": "DOMAIN=http://samples.ch vite",
     "prebuild": "eslint .",
-    "build": "vite build"
+    "build": "vite build",
+    "lint": "eslint src --report-unused-disable-directives --fix"
   }
 }
diff --git a/applications/samples/frontend/.eslintrc.cjs b/applications/samples/frontend/.eslintrc.cjs
deleted file mode 100644
index 976123ec..00000000
--- a/applications/samples/frontend/.eslintrc.cjs
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
-  root: true,
-  env: { browser: true, es2020: true },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-  ],
-  ignorePatterns: [
-    'dist',
-    '.eslintrc.cjs',
-    'src/rest/*' // do not lint generated code
-  ],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
-  rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
-    '@typescript-eslint/no-explicit-any': "off", // No strict typing (annoying especially with React elements and events callbacks)
-    "indent": ["error", 2, { "SwitchCase": 1 }],
-    "curly": "error", // enforce braces for one-line blocks
-    "no-tabs": "error", // enforce no tabs
-
-    "no-console": ["warn", { allow: ["warn", "error", "debug"] }],
-    "consistent-return": "warn", // https://eslint.org/docs/latest/rules/consistent-return
-    "prefer-arrow-callback": ["warn"],
-    "object-curly-spacing": ["warn", "always"], // enforce consistent spacing inside braces
-
-    "func-style": "off", // function expressions or arrow functions are equally valid
-
-    "no-unneeded-ternary": "warn", // disallow unnecessary ternary expressions
-    // React rules: https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules
-    "react/prop-types": "off", // PropTypes are not forced
-    "react/forbid-prop-types": "off", // all PropTypes are allowed
-    "react-hooks/rules-of-hooks": "error", // https://react.dev/reference/rules/rules-of-hooks
-    "react-hooks/exhaustive-deps": "warn", // Hooks dependency array, sometimes it's better to ignore
-  }
-}
diff --git a/applications/samples/frontend/eslint.config.js b/applications/samples/frontend/eslint.config.js
new file mode 100644
index 00000000..5fbd4636
--- /dev/null
+++ b/applications/samples/frontend/eslint.config.js
@@ -0,0 +1,56 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import tseslint from 'typescript-eslint'
+
+
+export default tseslint.config(
+  {
+    ignores: [
+      'dist',
+      'node_modules',
+      '.yalc',
+      'src/rest/*' // do not lint generated code
+    ]
+  },
+  {
+    extends: [js.configs.recommended, ...tseslint.configs.recommended],
+    files: ['**/*.{ts,tsx,js,jsx}'],
+    languageOptions: {
+      ecmaVersion: "latest",
+      globals: globals.browser,
+      sourceType: "module"
+    },
+    plugins: {
+      'react-hooks': reactHooks,
+      'react-refresh': reactRefresh,
+    },
+    rules: {
+      ...reactHooks.configs.recommended.rules,
+      'react-refresh/only-export-components': [
+        'warn',
+        { allowConstantExport: true },
+      ],
+      indent: ["error", 2, {
+        SwitchCase: 1,
+      }],
+      curly: "error",  // enforce braces for one-line blocks
+      "no-tabs": "error",  // enforce no tabs
+      "no-console": ["warn", {
+        allow: ["warn", "error", "debug"],
+      }],
+      "@typescript-eslint/no-explicit-any": "off", // No strict typing (annoying especially with React elements and events callbacks)
+      "consistent-return": "warn", // https://eslint.org/docs/latest/rules/consistent-return
+      "prefer-arrow-callback": ["warn"],
+      "object-curly-spacing": ["warn", "always"], // enforce consistent spacing inside braces
+      "func-style": "off", // function expressions or arrow functions are equally valid
+      "no-unneeded-ternary": "warn", // disallow unnecessary ternary expressions
+      // React rules: https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules
+      "react/prop-types": "off", // PropTypes are not forced
+      "react/forbid-prop-types": "off", // all PropTypes are allowed
+      "react-hooks/rules-of-hooks": "error", // https://react.dev/reference/rules/rules-of-hooks
+      "react-hooks/exhaustive-deps": "warn", // Hooks dependency array, sometimes it's better to ignore
+    },
+  }
+)
\ No newline at end of file
diff --git a/applications/samples/frontend/package.json b/applications/samples/frontend/package.json
index a104f3af..6d468d9a 100644
--- a/applications/samples/frontend/package.json
+++ b/applications/samples/frontend/package.json
@@ -8,9 +8,9 @@
     "start": "DOMAIN=http://localhost:5000 vite",
     "start:dev": "DOMAIN=https://test.ch.metacell.us vite",
     "start:local": "DOMAIN=http://samples.ch vite",
-    "prebuild": "eslint .",
+    "prebuild": "eslint src",
     "build": "vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "lint": "eslint src --report-unused-disable-directives --fix",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -18,16 +18,16 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
+    "@eslint/js": "^9.9.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.7",
-    "typescript": "^5.2.2",
-    "vite": "^5.3.4"
+    "eslint": "^9.9.0",
+    "eslint-plugin-react-hooks": "^5.1.0-rc.0",
+    "eslint-plugin-react-refresh": "^0.4.9",
+    "globals": "^15.9.0",
+    "typescript": "^5.5.3",
+    "typescript-eslint": "^8.0.1",
+    "vite": "^5.4.1"
   }
 }
diff --git a/applications/samples/frontend/src/App.tsx b/applications/samples/frontend/src/App.tsx
index eb8c0452..a6a2ac78 100644
--- a/applications/samples/frontend/src/App.tsx
+++ b/applications/samples/frontend/src/App.tsx
@@ -3,14 +3,14 @@ import Version from './components/Version';
 
 
 const Main = () => (
-    <>
-       <img src="/logo.png" width="800" />
-      <h1>Sample React application is working!</h1>
-      <Version />
-      <RestTest />
-      <p>See api documentation <a href="/api/ui/">here</a></p>
-    </>
-  )
+  <>
+    <img src="/logo.png" width="800" />
+    <h1>Sample React application is working!</h1>
+    <Version />
+    <RestTest />
+    <p>See api documentation <a href="/api/ui/">here</a></p>
+  </>
+)
 
 
 export default Main;
diff --git a/applications/samples/frontend/vite.config.ts b/applications/samples/frontend/vite.config.ts
index 15155d73..8bb506cb 100644
--- a/applications/samples/frontend/vite.config.ts
+++ b/applications/samples/frontend/vite.config.ts
@@ -22,21 +22,21 @@ export default defineConfig(({ mode }) => {
 
 
   return {
-  plugins: [react()],
-  server: {
-    port: 9000,
-    proxy: {
-      '/api/': {
-        target: replaceHost( proxyTarget, 'samples'),
-        secure: false,
-        changeOrigin: true,
-      },
-      '/proxy/common/api': {
-        target: replaceHost( proxyTarget, 'common'),
-        secure: false,
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
+    plugins: [react()],
+    server: {
+      port: 9000,
+      proxy: {
+        '/api/': {
+          target: replaceHost( proxyTarget, 'samples'),
+          secure: false,
+          changeOrigin: true,
+        },
+        '/proxy/common/api': {
+          target: replaceHost( proxyTarget, 'common'),
+          secure: false,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
+        }
       }
-  }
-}}}
+    } }}
 )
diff --git a/applications/samples/frontend/yarn.lock b/applications/samples/frontend/yarn.lock
index c7ae36fe..5fe49fa2 100644
--- a/applications/samples/frontend/yarn.lock
+++ b/applications/samples/frontend/yarn.lock
@@ -334,49 +334,61 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0":
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
   integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/config-array@^0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d"
+  integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==
+  dependencies:
+    "@eslint/object-schema" "^2.1.4"
+    debug "^4.3.1"
+    minimatch "^3.1.2"
+
+"@eslint/eslintrc@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
+  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@9.10.0", "@eslint/js@^9.9.0":
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.10.0.tgz#eaa3cb0baec497970bb29e43a153d0d5650143c6"
+  integrity sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+"@eslint/object-schema@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843"
+  integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
+
+"@eslint/plugin-kit@^0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz#809b95a0227ee79c3195adfb562eb94352e77974"
+  integrity sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
+    levn "^0.4.1"
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
+  integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
 
 "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
@@ -431,85 +443,85 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@rollup/rollup-android-arm-eabi@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.0.tgz#3d9fd50164b94964f5de68c3c4ce61933b3a338d"
-  integrity sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==
-
-"@rollup/rollup-android-arm64@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.0.tgz#e1a6d4bca2eb08c84fd996a4bf896ce4b6f4014c"
-  integrity sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==
-
-"@rollup/rollup-darwin-arm64@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.0.tgz#0a3fffea69489a24a96079af414b0be78df8abbc"
-  integrity sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==
-
-"@rollup/rollup-darwin-x64@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.0.tgz#13fbdb15f58f090871b0ffff047ece06ad6ad74c"
-  integrity sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.0.tgz#e9d9219ddf6f6e946e2ee322198af12466d2c868"
-  integrity sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==
-
-"@rollup/rollup-linux-arm-musleabihf@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.0.tgz#4ba804a00b5e793196a622f6977e05f23e01f59a"
-  integrity sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==
-
-"@rollup/rollup-linux-arm64-gnu@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.0.tgz#d871e3f41de759a6db27fc99235b782ba47c15cc"
-  integrity sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==
-
-"@rollup/rollup-linux-arm64-musl@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.0.tgz#6e63f7ad4cc51bd2c693a2826fd279de9eaa05b5"
-  integrity sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.0.tgz#1540b284d91c440bc9fa7a1714cfb71a5597e94d"
-  integrity sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==
-
-"@rollup/rollup-linux-riscv64-gnu@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.0.tgz#70ae58103b5bc7ba2e2235738b51d97022c8ef92"
-  integrity sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==
-
-"@rollup/rollup-linux-s390x-gnu@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.0.tgz#579ca5f271421a961d3c73d221202c79e02ff03a"
-  integrity sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==
-
-"@rollup/rollup-linux-x64-gnu@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.0.tgz#f0282d761b8b4e7b92b236813475248e37231849"
-  integrity sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==
-
-"@rollup/rollup-linux-x64-musl@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.0.tgz#65da807ac66c505ad14b76f1e5976006cb67dd5f"
-  integrity sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==
-
-"@rollup/rollup-win32-arm64-msvc@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.0.tgz#1eed24b91f421c2eea8bb7ca8889ba0c867e1780"
-  integrity sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==
-
-"@rollup/rollup-win32-ia32-msvc@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.0.tgz#1ed93c9cdc84e185359797a686f4d1576afcea58"
-  integrity sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==
-
-"@rollup/rollup-win32-x64-msvc@4.19.0":
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.0.tgz#baf9b65023ea2ecc5e6ec68f787a0fecfd8ee84c"
-  integrity sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==
+"@rollup/rollup-android-arm-eabi@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz#0412834dc423d1ff7be4cb1fc13a86a0cd262c11"
+  integrity sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==
+
+"@rollup/rollup-android-arm64@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz#baf1a014b13654f3b9e835388df9caf8c35389cb"
+  integrity sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==
+
+"@rollup/rollup-darwin-arm64@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz#0a2c364e775acdf1172fe3327662eec7c46e55b1"
+  integrity sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==
+
+"@rollup/rollup-darwin-x64@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz#a972db75890dfab8df0da228c28993220a468c42"
+  integrity sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz#1609d0630ef61109dd19a278353e5176d92e30a1"
+  integrity sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==
+
+"@rollup/rollup-linux-arm-musleabihf@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz#3c1dca5f160aa2e79e4b20ff6395eab21804f266"
+  integrity sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==
+
+"@rollup/rollup-linux-arm64-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz#c2fe376e8b04eafb52a286668a8df7c761470ac7"
+  integrity sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==
+
+"@rollup/rollup-linux-arm64-musl@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz#e62a4235f01e0f66dbba587c087ca6db8008ec80"
+  integrity sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz#24b3457e75ee9ae5b1c198bd39eea53222a74e54"
+  integrity sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==
+
+"@rollup/rollup-linux-riscv64-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz#38edfba9620fe2ca8116c97e02bd9f2d606bde09"
+  integrity sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==
+
+"@rollup/rollup-linux-s390x-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz#a3bfb8bc5f1e802f8c76cff4a4be2e9f9ac36a18"
+  integrity sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==
+
+"@rollup/rollup-linux-x64-gnu@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz#0dadf34be9199fcdda44b5985a086326344f30ad"
+  integrity sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==
+
+"@rollup/rollup-linux-x64-musl@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz#7b7deddce240400eb87f2406a445061b4fed99a8"
+  integrity sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==
+
+"@rollup/rollup-win32-arm64-msvc@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz#a0ca0c5149c2cfb26fab32e6ba3f16996fbdb504"
+  integrity sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==
+
+"@rollup/rollup-win32-ia32-msvc@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz#aae2886beec3024203dbb5569db3a137bc385f8e"
+  integrity sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==
+
+"@rollup/rollup-win32-x64-msvc@4.21.2":
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz#e4291e3c1bc637083f87936c333cdbcad22af63b"
+  integrity sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==
 
 "@types/babel__core@^7.20.5":
   version "7.20.5"
@@ -549,13 +561,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/node@^22.0.0":
-  version "22.0.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.0.tgz#04862a2a71e62264426083abe1e27e87cac05a30"
-  integrity sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==
-  dependencies:
-    undici-types "~6.11.1"
-
 "@types/prop-types@*":
   version "15.7.12"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
@@ -576,92 +581,87 @@
     "@types/prop-types" "*"
     csstype "^3.0.2"
 
-"@typescript-eslint/eslint-plugin@^7.15.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz#c8ed1af1ad2928ede5cdd207f7e3090499e1f77b"
-  integrity sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==
+"@typescript-eslint/eslint-plugin@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz#7c1863693a98371703686e1c0fac64ffc576cdb1"
+  integrity sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.17.0"
-    "@typescript-eslint/type-utils" "7.17.0"
-    "@typescript-eslint/utils" "7.17.0"
-    "@typescript-eslint/visitor-keys" "7.17.0"
+    "@typescript-eslint/scope-manager" "8.5.0"
+    "@typescript-eslint/type-utils" "8.5.0"
+    "@typescript-eslint/utils" "8.5.0"
+    "@typescript-eslint/visitor-keys" "8.5.0"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@^7.15.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.17.0.tgz#be8e32c159190cd40a305a2121220eadea5a88e7"
-  integrity sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==
+"@typescript-eslint/parser@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.5.0.tgz#d590e1ef9f31f26d423999ad3f687723247e6bcc"
+  integrity sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.17.0"
-    "@typescript-eslint/types" "7.17.0"
-    "@typescript-eslint/typescript-estree" "7.17.0"
-    "@typescript-eslint/visitor-keys" "7.17.0"
+    "@typescript-eslint/scope-manager" "8.5.0"
+    "@typescript-eslint/types" "8.5.0"
+    "@typescript-eslint/typescript-estree" "8.5.0"
+    "@typescript-eslint/visitor-keys" "8.5.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz#e072d0f914662a7bfd6c058165e3c2b35ea26b9d"
-  integrity sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==
+"@typescript-eslint/scope-manager@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz#385341de65b976f02b295b8aca54bb4ffd6b5f07"
+  integrity sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==
   dependencies:
-    "@typescript-eslint/types" "7.17.0"
-    "@typescript-eslint/visitor-keys" "7.17.0"
+    "@typescript-eslint/types" "8.5.0"
+    "@typescript-eslint/visitor-keys" "8.5.0"
 
-"@typescript-eslint/type-utils@7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz#c5da78feb134c9c9978cbe89e2b1a589ed22091a"
-  integrity sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==
+"@typescript-eslint/type-utils@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz#6215b23aa39dbbd8dde0a4ef9ee0f745410c29b1"
+  integrity sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.17.0"
-    "@typescript-eslint/utils" "7.17.0"
+    "@typescript-eslint/typescript-estree" "8.5.0"
+    "@typescript-eslint/utils" "8.5.0"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.17.0.tgz#7ce8185bdf06bc3494e73d143dbf3293111b9cff"
-  integrity sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==
+"@typescript-eslint/types@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.5.0.tgz#4465d99331d1276f8fb2030e4f9c73fe01a05bf9"
+  integrity sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==
 
-"@typescript-eslint/typescript-estree@7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz#dcab3fea4c07482329dd6107d3c6480e228e4130"
-  integrity sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==
+"@typescript-eslint/typescript-estree@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz#6e5758cf2f63aa86e9ddfa4e284e2e0b81b87557"
+  integrity sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==
   dependencies:
-    "@typescript-eslint/types" "7.17.0"
-    "@typescript-eslint/visitor-keys" "7.17.0"
+    "@typescript-eslint/types" "8.5.0"
+    "@typescript-eslint/visitor-keys" "8.5.0"
     debug "^4.3.4"
-    globby "^11.1.0"
+    fast-glob "^3.3.2"
     is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.17.0.tgz#815cd85b9001845d41b699b0ce4f92d6dfb84902"
-  integrity sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==
+"@typescript-eslint/utils@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.5.0.tgz#4d4ffed96d0654546a37faa5b84bdce16d951634"
+  integrity sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.17.0"
-    "@typescript-eslint/types" "7.17.0"
-    "@typescript-eslint/typescript-estree" "7.17.0"
+    "@typescript-eslint/scope-manager" "8.5.0"
+    "@typescript-eslint/types" "8.5.0"
+    "@typescript-eslint/typescript-estree" "8.5.0"
 
-"@typescript-eslint/visitor-keys@7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz#680465c734be30969e564b4647f38d6cdf49bfb0"
-  integrity sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==
+"@typescript-eslint/visitor-keys@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz#13028df3b866d2e3e2e2cc4193cf2c1e0e04c4bf"
+  integrity sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==
   dependencies:
-    "@typescript-eslint/types" "7.17.0"
+    "@typescript-eslint/types" "8.5.0"
     eslint-visitor-keys "^3.4.3"
 
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
-
 "@vitejs/plugin-react@^4.3.1":
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz#d0be6594051ded8957df555ff07a991fb618b48e"
@@ -678,12 +678,12 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
+acorn@^8.12.0:
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
   integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
-ajv@^6.12.3, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -693,26 +693,11 @@ ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-  integrity sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
@@ -727,80 +712,16 @@ ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
-  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
-biome@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/biome/-/biome-0.3.3.tgz#71c29633f84a486186bec97675da6f33a925575c"
-  integrity sha512-4LXjrQYbn9iTXu9Y4SKT7ABzTV0WnLDHCVSd2fPUOKsy1gQ+E4xPFmlY1zcWexoi0j7fGHItlL6OWA2CZ/yYAQ==
-  dependencies:
-    bluebird "^3.4.1"
-    chalk "^1.1.3"
-    commander "^2.9.0"
-    editor "^1.0.0"
-    fs-promise "^0.5.0"
-    inquirer-promise "0.0.3"
-    request-promise "^3.0.0"
-    untildify "^3.0.2"
-    user-home "^2.0.0"
-
-bluebird@^3.3, bluebird@^3.4.1:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
@@ -843,22 +764,6 @@ caniuse-lite@^1.0.30001640:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz"
   integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
-
-chalk@^1.0.0, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -876,23 +781,6 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-width@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-1.1.1.tgz#a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"
-  integrity sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@@ -917,18 +805,6 @@ color-name@~1.1.4:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.9.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
@@ -939,16 +815,6 @@ convert-source-map@^2.0.0:
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
-
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -963,13 +829,6 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
 debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
@@ -982,48 +841,6 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-earlgrey-runtime@>=0.0.10, earlgrey-runtime@>=0.0.11:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/earlgrey-runtime/-/earlgrey-runtime-0.1.2.tgz#5e7ea308924f107842877d59bb40bc2a9d9a29f8"
-  integrity sha512-T4qoScXi5TwALDv8nlGTvOuCT8jXcKcxtO8qVdqv46IA2GHJfQzwoBPbkOmORnyhu3A98cVVuhWLsM2CzPljJg==
-  dependencies:
-    core-js "^2.4.0"
-    kaiser ">=0.0.4"
-    lodash "^4.17.2"
-    regenerator-runtime "^0.9.5"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-editor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
-  integrity sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==
-
 electron-to-chromium@^1.4.820:
   version "1.5.2"
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz"
@@ -1063,7 +880,7 @@ escalade@^3.1.2:
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
@@ -1073,66 +890,67 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-plugin-react-hooks@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
-  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
+eslint-plugin-react-hooks@^5.1.0-rc.0:
+  version "5.1.0-rc-fb9a90fa48-20240614"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0-rc-fb9a90fa48-20240614.tgz#206a7ec005f0b286aaf7091f4e566083d310b189"
+  integrity sha512-xsiRwaDNF5wWNC4ZHLut+x/YcAxksUd9Rizt7LaEn3bV8VyYRpXnRJQlLOfYaVy9esk4DFP4zPPnoNVjq5Gc0w==
 
-eslint-plugin-react-refresh@^0.4.7:
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.9.tgz#bf870372b353b12e1e6fb7fc41b282d9cbc8d93d"
-  integrity sha512-QK49YrBAo5CLNLseZ7sZgvgTy21E6NEw22eZqc4teZfH8pxV3yXc9XXOYfUI6JNpw7mfHNkAeWtBxrTyykB6HA==
+eslint-plugin-react-refresh@^0.4.9:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.11.tgz#e450761a2bdb260aa10cfb73f846209a737827cb"
+  integrity sha512-wrAKxMbVr8qhXTtIKfXqAn5SAtRZt0aXxe5P23Fh4pUAdC6XEsybGLB8P0PI4j1yYqOgUEUlzKAGDfo7rJOjcw==
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94"
+  integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.57.0:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+
+eslint@^9.9.0:
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.10.0.tgz#0bd74d7fe4db77565d0e7f57c7df6d2b04756806"
+  integrity sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint-community/regexpp" "^4.11.0"
+    "@eslint/config-array" "^0.18.0"
+    "@eslint/eslintrc" "^3.1.0"
+    "@eslint/js" "9.10.0"
+    "@eslint/plugin-kit" "^0.1.0"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.3.0"
     "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
     ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
+    eslint-scope "^8.0.2"
+    eslint-visitor-keys "^4.0.0"
+    espree "^10.1.0"
+    esquery "^1.5.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
@@ -1140,16 +958,16 @@ eslint@^8.57.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1, espree@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56"
+  integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.12.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.0.0"
 
-esquery@^1.4.2:
+esquery@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
   integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
@@ -1173,34 +991,14 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==
-
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.9:
+fast-glob@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
@@ -1226,20 +1024,12 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 fill-range@^7.1.1:
   version "7.1.1"
@@ -1256,60 +1046,19 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flatted@^3.2.9:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-fs-extra@^0.26.5:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-  integrity sha512-waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
-fs-promise@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
-  integrity sha512-Y+4F4ujhEcayCJt6JmzcOun9MYGQwz+bVUiuBmTkJImhBHKpBvmVPZR9wtfiF7k3ffwAOAuurygQe+cPLSFQhw==
-  dependencies:
-    any-promise "^1.0.0"
-    fs-extra "^0.26.5"
-    mz "^2.3.1"
-    thenify-all "^1.6.0"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -1320,13 +1069,6 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
@@ -1341,72 +1083,26 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
-globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+globals@^15.9.0:
+  version "15.9.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399"
+  integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==
 
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
@@ -1417,15 +1113,6 @@ has-flag@^4.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 ignore@^5.2.0, ignore@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
@@ -1444,58 +1131,11 @@ imurmurhash@^0.1.4:
   resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inquirer-promise@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/inquirer-promise/-/inquirer-promise-0.0.3.tgz#2fa71387ef51ea3f0e22f668501d415abb8e42e2"
-  integrity sha512-82CQX586JAV9GAgU9yXZsMDs+NorjA0nLhkfFx9+PReyOnuoHRbHrC1Z90sS95bFJI1Tm1gzMObuE0HabzkJpg==
-  dependencies:
-    earlgrey-runtime ">=0.0.11"
-    inquirer "^0.11.3"
-
-inquirer@^0.11.3:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.4.tgz#81e3374e8361beaff2d97016206d359d0b32fa4d"
-  integrity sha512-QR+2TW90jnKk9LUUtbcA3yQXKt2rDEKMh6+BAZQIeumtzHexnwVLdPakSslGijXYLJCzFv7GMXbFCn0pA00EUw==
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
@@ -1513,21 +1153,11 @@ is-path-inside@^3.0.3:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
@@ -1540,11 +1170,6 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
@@ -1560,64 +1185,23 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
 json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-kaiser@>=0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/kaiser/-/kaiser-0.0.4.tgz#d25ddf800640857fadde08dba59ffc7a5a4f5c38"
-  integrity sha512-m8ju+rmBqvclZmyrOXgGGhOYSjKJK6RN1NhqEltemY87UqZOxEkizg9TOy1vQSyJ01Wx6SAPuuN0iO2Mgislvw==
-  dependencies:
-    earlgrey-runtime ">=0.0.10"
-
-keyv@^4.5.3:
+keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -1638,16 +1222,6 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^3.3.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
-
-lodash@^4.17.2, lodash@^4.6.1:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
 loose-envify@^1.1.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -1662,7 +1236,7 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-merge2@^1.3.0, merge2@^1.4.1:
+merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -1675,19 +1249,7 @@ micromatch@^4.0.4:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -1706,20 +1268,6 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-  integrity sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==
-
-mz@^2.3.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
@@ -1735,33 +1283,6 @@ node-releases@^2.0.14:
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==
-
 optionator@^0.9.3:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
@@ -1774,11 +1295,6 @@ optionator@^0.9.3:
     type-check "^0.4.0"
     word-wrap "^1.2.5"
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
-
 p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
@@ -1805,26 +1321,11 @@ path-exists@^4.0.0:
   resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
 picocolors@^1.0.0, picocolors@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"
@@ -1835,10 +1336,10 @@ picomatch@^2.3.1:
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-postcss@^8.4.39:
-  version "8.4.40"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
-  integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
+postcss@^8.4.43:
+  version "8.4.45"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.45.tgz#538d13d89a16ef71edbf75d895284ae06b79e603"
+  integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.1"
@@ -1849,21 +1350,11 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-psl@^1.1.28:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
   version "2.3.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
@@ -1889,119 +1380,41 @@ react@^18.3.1:
   dependencies:
     loose-envify "^1.1.0"
 
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  integrity sha512-8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
-regenerator-runtime@^0.9.5:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
-  integrity sha512-D0Y/JJ4VhusyMOd/o25a3jdUqN/bC85EFsaoL9Oqmy/O4efCh+xhp7yj2EEOsj974qvMkcW8AwUzJ1jB/MbxCw==
-
-request-promise@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-3.0.0.tgz#be1edb26f41c49cd1d5656c6753d6842a1249f46"
-  integrity sha512-wVGUX+BoKxYsavTA72i6qHcyLbjzM4LR4y/AmDCqlbuMAursZdDWO7PmgbGAUvD2SeEJ5iB99VSq/U51i/DNbw==
-  dependencies:
-    bluebird "^3.3"
-    lodash "^4.6.1"
-    request "^2.34"
-
-request@^2.34:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^2.2.8:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-rollup@^4.13.0:
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.19.0.tgz#83b08cc0b2bc38c26c194cb7f2cdabd84a2a8c02"
-  integrity sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==
+rollup@^4.20.0:
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.2.tgz#f41f277a448d6264e923dd1ea179f0a926aaf9b7"
+  integrity sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==
   dependencies:
     "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.19.0"
-    "@rollup/rollup-android-arm64" "4.19.0"
-    "@rollup/rollup-darwin-arm64" "4.19.0"
-    "@rollup/rollup-darwin-x64" "4.19.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.19.0"
-    "@rollup/rollup-linux-arm-musleabihf" "4.19.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.19.0"
-    "@rollup/rollup-linux-arm64-musl" "4.19.0"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.19.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.19.0"
-    "@rollup/rollup-linux-s390x-gnu" "4.19.0"
-    "@rollup/rollup-linux-x64-gnu" "4.19.0"
-    "@rollup/rollup-linux-x64-musl" "4.19.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.19.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.19.0"
-    "@rollup/rollup-win32-x64-msvc" "4.19.0"
+    "@rollup/rollup-android-arm-eabi" "4.21.2"
+    "@rollup/rollup-android-arm64" "4.21.2"
+    "@rollup/rollup-darwin-arm64" "4.21.2"
+    "@rollup/rollup-darwin-x64" "4.21.2"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.21.2"
+    "@rollup/rollup-linux-arm-musleabihf" "4.21.2"
+    "@rollup/rollup-linux-arm64-gnu" "4.21.2"
+    "@rollup/rollup-linux-arm64-musl" "4.21.2"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.21.2"
+    "@rollup/rollup-linux-riscv64-gnu" "4.21.2"
+    "@rollup/rollup-linux-s390x-gnu" "4.21.2"
+    "@rollup/rollup-linux-x64-gnu" "4.21.2"
+    "@rollup/rollup-linux-x64-musl" "4.21.2"
+    "@rollup/rollup-win32-arm64-msvc" "4.21.2"
+    "@rollup/rollup-win32-ia32-msvc" "4.21.2"
+    "@rollup/rollup-win32-x64-msvc" "4.21.2"
     fsevents "~2.3.2"
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  integrity sha512-qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==
-  dependencies:
-    once "^1.3.0"
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
@@ -2009,21 +1422,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-  integrity sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
 scheduler@^0.23.2:
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
@@ -2053,47 +1451,11 @@ shebang-regex@^3.0.0:
   resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
 source-map-js@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-sshpk@^1.7.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
-  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -2106,11 +1468,6 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
@@ -2130,25 +1487,6 @@ text-table@^0.2.0:
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-thenify-all@^1.0.0, thenify-all@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
-  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
-  dependencies:
-    any-promise "^1.0.0"
-
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
@@ -2161,31 +1499,11 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 ts-api-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -2193,25 +1511,19 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-typescript@^5.2.2:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
-
-undici-types@~6.11.1:
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197"
-  integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==
+typescript-eslint@^8.0.1:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.5.0.tgz#041f6c302d0e9a8e116a33d60b0bb19f34036dd7"
+  integrity sha512-uD+XxEoSIvqtm4KE97etm32Tn5MfaZWgWfMMREStLxR6JzvHkc2Tkj7zhTEK5XmtpTmKHNnG8Sot6qDfhHtR1Q==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.5.0"
+    "@typescript-eslint/parser" "8.5.0"
+    "@typescript-eslint/utils" "8.5.0"
 
-untildify@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"
-  integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==
+typescript@^5.5.3:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
+  integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
 
 update-browserslist-db@^1.1.0:
   version "1.1.0"
@@ -2228,35 +1540,14 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  integrity sha512-KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==
-  dependencies:
-    os-homedir "^1.0.0"
-
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vite@^5.3.4:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.5.tgz#b847f846fb2b6cb6f6f4ed50a830186138cb83d8"
-  integrity sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==
+vite@^5.4.1:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.3.tgz#771c470e808cb6732f204e1ee96c2ed65b97a0eb"
+  integrity sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==
   dependencies:
     esbuild "^0.21.3"
-    postcss "^8.4.39"
-    rollup "^4.13.0"
+    postcss "^8.4.43"
+    rollup "^4.20.0"
   optionalDependencies:
     fsevents "~2.3.3"
 
@@ -2272,11 +1563,6 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"

From 9f5130f78bb58a2cf4ac5be424a7413c8601b2b3 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <46561561+filippomc@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:12:34 +0200
Subject: [PATCH 138/210] Update applications/neo4j/README.md

Co-authored-by: Alex <alxbrd@users.noreply.github.com>
---
 applications/neo4j/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/neo4j/README.md b/applications/neo4j/README.md
index 49dadb60..cd46617d 100644
--- a/applications/neo4j/README.md
+++ b/applications/neo4j/README.md
@@ -3,7 +3,7 @@
 Enable this application to deploy a Neo4j server with the neo4j browser enabled.
 
 ## How to use
-The browser will be enabled at neo4j.[DOMAIN].
+The neo4j browser will be enabled at neo4j.[DOMAIN].
 
 ![Neo4j browser login](docs/browser-login.png)
 

From fefad142c8c588d34689845cb537d7ff457dd867 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 11 Sep 2024 15:19:27 +0200
Subject: [PATCH 139/210] CH-32 Fix neo4j 5 config

---
 .../helm/templates/auto-database-neo4j.yaml      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/deployment-configuration/helm/templates/auto-database-neo4j.yaml b/deployment-configuration/helm/templates/auto-database-neo4j.yaml
index bddbab24..d56ca21e 100644
--- a/deployment-configuration/helm/templates/auto-database-neo4j.yaml
+++ b/deployment-configuration/helm/templates/auto-database-neo4j.yaml
@@ -5,22 +5,22 @@
         image: {{ .app.harness.database.neo4j.image }}
         {{- end }}
         env:
-          - name: NEO4J_dbms_directories_data
+          - name: NEO4J_server_directories_data
             value: /data/db/data
-          - name: NEO4J_dbms_directories_logs
+          - name: NEO4J_server_directories_logs
             value: /data/db/logs
-          - name: NEO4J_dbms_directories_metrics
+          - name: NEO4J_server_directories_metrics
             value: /data/db/metrics
-          - name: NEO4J_dbms_memory_size
-            value: {{ .app.harness.database.neo4j.memory.size }}
-          - name: NEO4J_dbms_memory_pagecache_size
+          - name: NEO4J_server_memory_pagecache_size
             value: {{ .app.harness.database.neo4j.memory.pagecache.size }}
-          - name: NEO4J_dbms_memory_heap_initial__size
+          - name: NEO4J_server_memory_heap_initial__size
             value: {{ .app.harness.database.neo4j.memory.heap.initial }}
-          - name: NEO4J_dbms_memory_heap_max__size
+          - name: NEO4J_server_memory_heap_max__size
             value: {{ .app.harness.database.neo4j.memory.heap.max }}
           - name: NEO4J_dbms_security_auth__enabled
             value: {{ .app.harness.database.neo4j.dbms_security_auth_enabled | quote }}
           - name: NEO4J_auth
             value: {{ .app.harness.database.user }}/{{ .app.harness.database.pass }}
+          - name: NEO4J_server_config_strict__validation_enabled
+            value: "false"
 {{- end }}
\ No newline at end of file

From 32f637574792c46b963b64bd1d3ab2cfc8765844 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 12 Sep 2024 11:35:49 +0100
Subject: [PATCH 140/210] CH-145 Add spec.ingressClassName to ingress template

---
 deployment-configuration/helm/templates/ingress.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deployment-configuration/helm/templates/ingress.yaml b/deployment-configuration/helm/templates/ingress.yaml
index 276d999c..6e08b756 100644
--- a/deployment-configuration/helm/templates/ingress.yaml
+++ b/deployment-configuration/helm/templates/ingress.yaml
@@ -32,7 +32,7 @@ kind: Ingress
 metadata:
   name: {{ .Values.ingress.name | quote }}
   annotations:
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: nginx # Deprecated by Kubernetes, however still required for GKE
     {{- if and (not .Values.local) $tls }}
     kubernetes.io/tls-acme: 'true'
     cert-manager.io/issuer: {{ printf "%s-%s" "letsencrypt" .Values.namespace }}
@@ -47,6 +47,7 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-send-timeout: {{ .Values.proxy.timeout.send | quote }}
     nginx.ingress.kubernetes.io/use-forwarded-headers: {{ .Values.proxy.forwardedHeaders | quote }}
 spec:
+  ingressClassName: nginx
   rules:
   {{- range $app := .Values.apps }}
     {{- if (and $mainapp (and $app.harness.name (eq $app.harness.name $mainapp))) }}

From 4f5f34ca9c94f52b41bbe65a4d1b58e247209841 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Thu, 12 Sep 2024 19:21:51 +0200
Subject: [PATCH 141/210] CH-110 fix dc resources mapping when not numbers

---
 .../compose/templates/_helpers.yaml           | 11 ++++
 .../compose/templates/auto-compose.yaml       | 25 +++------
 .../compose/templates/auto-database.yaml      |  4 +-
 .../compose/templates/auto-gatekeepers.yaml   |  4 +-
 .../ch_cli_tools/dockercompose.py             | 55 ++++++++++---------
 5 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 deployment-configuration/compose/templates/_helpers.yaml

diff --git a/deployment-configuration/compose/templates/_helpers.yaml b/deployment-configuration/compose/templates/_helpers.yaml
new file mode 100644
index 00000000..49c3c456
--- /dev/null
+++ b/deployment-configuration/compose/templates/_helpers.yaml
@@ -0,0 +1,11 @@
+{{- define "convertToDecimal" -}}
+    {{- $value := . -}}
+    {{- if hasSuffix "m" $value  -}}
+        {{- $number := replace "m" "" $value | float64 -}}
+        {{- $result := divf $number 1000.0 -}}
+        {{- printf "%.3f" $result -}}
+    {{- else -}}
+        {{- $value -}}
+    {{- end -}}
+    
+{{- end -}}
\ No newline at end of file
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index a3b46854..46b07661 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -76,10 +76,10 @@ services:
       replicas: {{ $deployment.replicas | default 1 }}
       resources:
         limits:
-          cpus: {{ $deployment.resources.limits.cpu | default "0.5" }}
+          cpus: {{ include "convertToDecimal" ( $deployment.resources.limits.cpu | default 0.5) }}
           memory: {{ trimSuffix "i" $deployment.resources.limits.memory | default "64M" }}
         reservations:
-          cpus: {{ $deployment.resources.requests.cpu | default "0.25" }}
+          cpus: {{ include "convertToDecimal" ( $deployment.resources.requests.cpu | default 0.01) }}
           memory: {{ trimSuffix "i" $deployment.resources.requests.memory | default "32M" }}
     {{- with $deployment.command }}
     # entrypoint: {{ cat . $deployment.args }}
@@ -107,10 +107,13 @@ services:
       {{- range $app_config.harness.env }}
       - {{ .name }}={{ .value }}
       {{- end }}
+    {{- if or $app_config.harness.dependencies.hard $app_config.harness.dependencies.soft }}
     {{- with compact
           (append (concat (without $app_config.harness.dependencies.hard "argo")
                   $app_config.harness.dependencies.soft)
                   (dig "database" "name" "" $app_config.harness)) }}
+    
+
     links:
       {{- range . -}}
         {{- $service := .}}
@@ -120,7 +123,7 @@ services:
             {{- break -}}
           {{- end -}}
           {{- if eq $conf.harness.name $service }}
-            {{- if has $name (list "events" "nfsserver") }}
+            {{- if has $name (list "events" "nfsserver" "jupyterhub") }}
 #     - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
         {{- else }}
       - {{ $name }}:{{ $service }}.{{ $.Values.domain }}
@@ -137,6 +140,7 @@ services:
             (append
               (without $app_config.harness.dependencies.hard "argo" "events")
               (dig "database" "name" "" $app_config.harness)) -}}
+
     depends_on:
       {{- range . -}}
         {{- $service := .}}
@@ -157,6 +161,7 @@ services:
         {{- end -}}
       {{- end }}
     {{- end }}
+    {{- end }}
     volumes:
       - ./compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
     {{- range $file_name, $_ := $app_config.harness.secrets }}
@@ -176,20 +181,6 @@ services:
     {{- end }}
     {{- end}}
     {{- end }}
-  {{/*
-  {{- if $.Values.local }}
-    # Extra /etc/hosts list
-    {{- $domain := $.Values.domain }}
-    {{- $ip := $.Values.localIp }}
-    extra_hosts:
-      - "{{ $.Values.domain }}={{ $ip }}"
-      {{- range $app := $.Values.apps }}
-      {{- with $app.harness.subdomain}}
-      - "{{ . }}.{{ $domain }}={{ $ip }}"
-      {{- end }}
-      {{- end }}
-  {{- end }}
-  */}}
   {{- if not $isSecured }}
     labels:
       - "traefik.enable=true"
diff --git a/deployment-configuration/compose/templates/auto-database.yaml b/deployment-configuration/compose/templates/auto-database.yaml
index 9d56ae00..c2c4b634 100644
--- a/deployment-configuration/compose/templates/auto-database.yaml
+++ b/deployment-configuration/compose/templates/auto-database.yaml
@@ -19,10 +19,10 @@
   deploy:
     resources:
       limits:
-        cpus: {{ .limits.cpu | default "0.75" }}
+        cpus: {{ include "convertToDecimal" (.limits.cpu | default "0.75") }}
         memory: {{ trimSuffix "i" .limits.memory | default "2G" }}
       reservations:
-        cpus: {{ .requests.cpu | default "0.50" }}
+        cpus: {{ include "convertToDecimal" (.requests.cpu | default "0.75") }}
         memory: {{ trimSuffix "i" .requests.memory | default "512M" }}
   {{- end }}
   volumes:
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index 4094a925..fcd7d19a 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -15,10 +15,10 @@
     replicas: 1
     resources:
       limits:
-        cpus: 100m
+        cpus: 0.1
         memory: 64M
       reservations:
-        cpus: 50m
+        cpus: 0.001
         memory: 32M
   environment:
     - PROXY_CONFIG_FILE=/opt/proxy.yml
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index 4b2c374b..bc6f7ba6 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -19,14 +19,14 @@
 from .configurationgenerator import ConfigurationGenerator, validate_helm_values, KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates
 
 
-def create_docker_compose_configuration(root_paths, tag: Union[str, int, None]='latest', registry='', local=True, domain=None, exclude=(), secured=True,
-                      output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-                      namespace=None) -> HarnessMainConfig:
+def create_docker_compose_configuration(root_paths, tag: Union[str, int, None] = 'latest', registry='', local=True, domain=None, exclude=(), secured=True,
+                                        output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
+                                        namespace=None) -> HarnessMainConfig:
     if (type(env)) == str:
         env = [env]
     return CloudHarnessDockerCompose(root_paths, tag=tag, registry=registry, local=local, domain=domain, exclude=exclude, secured=secured,
-                            output_path=output_path, include=include, registry_secret=registry_secret, tls=tls, env=env,
-                            namespace=namespace, templates_path=COMPOSE).process_values()
+                                     output_path=output_path, include=include, registry_secret=registry_secret, tls=tls, env=env,
+                                     namespace=namespace, templates_path=COMPOSE).process_values()
 
 
 class CloudHarnessDockerCompose(ConfigurationGenerator):
@@ -87,7 +87,9 @@ def generate_docker_compose_yaml(self):
         logging.info(f'Generate docker compose configuration in: {dest_compose_yaml}, using templates from {compose_templates}')
         command = f"helm template {compose_templates} > {dest_compose_yaml}"
 
-        subprocess.call(command, shell=True)
+        res = subprocess.call(command, shell=True)
+        if res != 0:
+            raise Exception(f"Error generating docker-compose.yaml. See above output for details or try run\n\n{command} --debug")
 
         self.__post_process_multiple_document_docker_compose(dest_compose_yaml)
 
@@ -280,7 +282,6 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
 
         return values
 
-
     def inject_entry_points_commands(self, helm_values, image_path, app_path):
         context_path = os.path.relpath(image_path, '.')
 
@@ -294,23 +295,23 @@ def inject_entry_points_commands(self, helm_values, image_path, app_path):
 
 
 def identify_unicorn_based_main(candidates, app_path):
-        import re
-        gunicorn_pattern = re.compile(r"gunicorn")
-        # sort candidates, shortest path first
-        for candidate in sorted(candidates,key=lambda x: len(x.split("/"))):
-            dockerfile_path = f"{candidate}/.."
-            while not os.path.exists(f"{dockerfile_path}/Dockerfile") and os.path.abspath(dockerfile_path) != os.path.abspath(app_path):
-                dockerfile_path += "/.."
-            dockerfile = f"{dockerfile_path}/Dockerfile"
-            if not os.path.exists(dockerfile):
-                continue
-            with open(dockerfile, 'r') as file:
-                if re.search(gunicorn_pattern, file.read()):
-                    return candidate
-            requirements = f"{candidate}/../requirements.txt"
-            if not os.path.exists(requirements):
-                continue
-            with open(requirements, 'r') as file:
-                if re.search(gunicorn_pattern, file.read()):
-                    return candidate
-        return None
\ No newline at end of file
+    import re
+    gunicorn_pattern = re.compile(r"gunicorn")
+    # sort candidates, shortest path first
+    for candidate in sorted(candidates, key=lambda x: len(x.split("/"))):
+        dockerfile_path = f"{candidate}/.."
+        while not os.path.exists(f"{dockerfile_path}/Dockerfile") and os.path.abspath(dockerfile_path) != os.path.abspath(app_path):
+            dockerfile_path += "/.."
+        dockerfile = f"{dockerfile_path}/Dockerfile"
+        if not os.path.exists(dockerfile):
+            continue
+        with open(dockerfile, 'r') as file:
+            if re.search(gunicorn_pattern, file.read()):
+                return candidate
+        requirements = f"{candidate}/../requirements.txt"
+        if not os.path.exists(requirements):
+            continue
+        with open(requirements, 'r') as file:
+            if re.search(gunicorn_pattern, file.read()):
+                return candidate
+    return None

From bbc57d20618793233d987f72e97409924577944c Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Thu, 12 Sep 2024 19:22:10 +0200
Subject: [PATCH 142/210] chore: remove unneded dependencies

---
 libraries/cloudharness-utils/setup.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libraries/cloudharness-utils/setup.py b/libraries/cloudharness-utils/setup.py
index 67de60c8..e92773ed 100644
--- a/libraries/cloudharness-utils/setup.py
+++ b/libraries/cloudharness-utils/setup.py
@@ -22,9 +22,7 @@
 REQUIREMENTS = [
     'ruamel.yaml',
     'cloudharness_model',
-    'docker',
-    'pyaml',
-    'cloudharness_model'
+    'docker'
 ]
 
 

From 2a87ba5ac92dcfea2fe87fb65332d6eb70ba6ff6 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 11:22:21 +0200
Subject: [PATCH 143/210] CH-110 small fixes + tests

---
 .../ch_cli_tools/configurationgenerator.py    | 41 +++++++---------
 .../deployment-cli-tools/ch_cli_tools/helm.py | 31 ------------
 .../tests/test_dockercompose.py               | 49 +++++++++----------
 tools/deployment-cli-tools/tests/test_helm.py | 27 +++++-----
 4 files changed, 52 insertions(+), 96 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
index e371bb53..2228e3af 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
@@ -3,27 +3,21 @@
 """
 from typing import Union
 import yaml
-from ruamel.yaml import YAML
 import os
 import shutil
 import logging
 from hashlib import sha1
-import subprocess
-from functools import cache
 import tarfile
 from docker import from_env as DockerClient
 from pathlib import Path
-import copy
 
 
 from . import HERE, CH_ROOT
-from cloudharness_utils.constants import TEST_IMAGES_PATH, VALUES_MANUAL_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
-    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH, COMPOSE
-from .utils import get_cluster_ip, get_image_name, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
-    get_template, merge_configuration_directories, merge_to_yaml_file, dict_merge, app_name_from_path, \
-    find_dockerfiles_paths, find_file_paths
-
-from .models import HarnessMainConfig
+from cloudharness_utils.constants import TEST_IMAGES_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
+    DEPLOYMENT_CONFIGURATION_PATH, BASE_IMAGES_PATH, STATIC_IMAGES_PATH
+from .utils import get_cluster_ip, env_variable, get_sub_paths, guess_build_dependencies_from_dockerfile, image_name_from_dockerfile_path, \
+    get_template, merge_configuration_directories, dict_merge, app_name_from_path, \
+    find_dockerfiles_paths
 
 
 KEY_HARNESS = 'harness'
@@ -39,7 +33,7 @@
 
 
 class ConfigurationGenerator(object):
-    def __init__(self, root_paths, tag: Union[str, int, None]='latest', registry='', local=True, domain=None, exclude=(), secured=True,
+    def __init__(self, root_paths, tag: Union[str, int, None] = 'latest', registry='', local=True, domain=None, exclude=(), secured=True,
                  output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
                  namespace=None, templates_path=HELM_PATH):
         assert domain, 'A domain must be specified'
@@ -81,7 +75,7 @@ def __init_deployment(self):
         # Override for every cloudharness scaffolding
         for root_path in self.root_paths:
             copy_merge_base_deployment(dest_helm_chart_path=self.dest_deployment_path,
-                                       base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH /self.templates_path)
+                                       base_helm_chart=root_path / DEPLOYMENT_CONFIGURATION_PATH / self.templates_path)
             collect_apps_helm_templates(root_path, exclude=self.exclude, include=self.include,
                                         dest_helm_chart_path=self.dest_deployment_path, templates_path=self.templates_path)
 
@@ -150,7 +144,9 @@ def _init_static_images(self, base_image_name):
             img_name = image_name_from_dockerfile_path(os.path.basename(
                 static_img_dockerfile), base_name=base_image_name)
             self.base_images[os.path.basename(static_img_dockerfile)] = self.image_tag(
-                img_name, build_context_path=static_img_dockerfile)
+                img_name, build_context_path=static_img_dockerfile,
+                dependencies=guess_build_dependencies_from_dockerfile(static_img_dockerfile)
+            )
 
     def _assign_static_build_dependencies(self, helm_values):
         for static_img_dockerfile in self.static_images:
@@ -178,7 +174,9 @@ def _init_base_images(self, base_image_name):
                 img_name = image_name_from_dockerfile_path(
                     os.path.basename(base_img_dockerfile), base_name=base_image_name)
                 self.base_images[os.path.basename(base_img_dockerfile)] = self.image_tag(
-                    img_name, build_context_path=root_path)
+                    img_name, build_context_path=root_path,
+                    dependencies=guess_build_dependencies_from_dockerfile(base_img_dockerfile)
+                )
 
             self.static_images.update(find_dockerfiles_paths(
                 os.path.join(root_path, STATIC_IMAGES_PATH)))
@@ -312,10 +310,9 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()):
             logging.info(f"Ignoring {ignore}")
             tag = generate_tag_from_content(build_context_path, ignore)
             logging.info(f"Content hash: {tag}")
-            dependencies = dependencies or guess_build_dependencies_from_dockerfile(f"{build_context_path}")
-            tag = sha1((tag + "".join(self.all_images.get(n , '') for n in dependencies)).encode("utf-8")).hexdigest()
+            tag = sha1((tag + "".join(self.all_images.get(n, '') for n in dependencies)).encode("utf-8")).hexdigest()
             logging.info(f"Generated tag: {tag}")
-            app_name = image_name.split("/")[-1] # the image name can have a prefix
+            app_name = image_name.split("/")[-1]  # the image name can have a prefix
             self.all_images[app_name] = tag
         return self.registry + image_name + (f':{tag}' if tag else '')
 
@@ -347,11 +344,11 @@ def copy_merge_base_deployment(dest_helm_chart_path, base_helm_chart):
         return
     if dest_helm_chart_path.exists():
         logging.info("Merging/overriding all files in directory %s",
-                    dest_helm_chart_path)
+                     dest_helm_chart_path)
         merge_configuration_directories(f"{base_helm_chart}", f"{dest_helm_chart_path}")
     else:
         logging.info("Copying base deployment chart from %s to %s",
-                    base_helm_chart, dest_helm_chart_path)
+                     base_helm_chart, dest_helm_chart_path)
         shutil.copytree(base_helm_chart, dest_helm_chart_path)
 
 
@@ -365,7 +362,7 @@ def collect_helm_values(deployment_root, env=()):
 
     for e in env:
         specific_template_path = os.path.join(deployment_root, DEPLOYMENT_CONFIGURATION_PATH,
-                                            f'values-template-{e}.yaml')
+                                              f'values-template-{e}.yaml')
         if os.path.exists(specific_template_path):
             logging.info(
                 "Specific environment values template found: " + specific_template_path)
@@ -652,4 +649,4 @@ def collect_apps_helm_templates(search_root, dest_helm_chart_path, templates_pat
 #                     "Merging/overriding all files in directory %s", dest_dir)
 #                 merge_configuration_directories(subchart_dir, dest_dir)
 #             else:
-#                 shutil.copytree(subchart_dir, dest_dir)
\ No newline at end of file
+#                 shutil.copytree(subchart_dir, dest_dir)
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index 693a8977..d1725c67 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -155,37 +155,6 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    def __clear_unused_db_configuration(self, harness_config):
-        database_config = harness_config[KEY_DATABASE]
-        database_type = database_config.get('type', None)
-        if database_type is None:
-            del harness_config[KEY_DATABASE]
-            return
-        db_specific_keys = [k for k, v in database_config.items()
-                            if isinstance(v, dict) and 'image' in v and 'ports' in v]
-        for db in db_specific_keys:
-            if database_type != db:
-                del database_config[db]
-
-    def image_tag(self, image_name, build_context_path=None, dependencies=()):
-        tag = self.tag
-        if tag is None and not self.local:
-            logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
-            ignore_path = os.path.join(build_context_path, '.dockerignore')
-            ignore = set(DEFAULT_IGNORE)
-            if os.path.exists(ignore_path):
-                with open(ignore_path) as f:
-                    ignore = ignore.union({line.strip() for line in f if line.strip() and not line.startswith('#')})
-            logging.info(f"Ignoring {ignore}")
-            tag = generate_tag_from_content(build_context_path, ignore)
-            logging.info(f"Content hash: {tag}")
-            dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-            tag = sha1((tag + "".join(self.all_images.get(n, '') for n in dependencies)).encode("utf-8")).hexdigest()
-            logging.info(f"Generated tag: {tag}")
-            app_name = image_name.split("/")[-1]  # the image name can have a prefix
-            self.all_images[app_name] = tag
-        return self.registry + image_name + (f':{tag}' if tag else '')
-
     def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         logging.info('Generating values script for ' + app_name)
 
diff --git a/tools/deployment-cli-tools/tests/test_dockercompose.py b/tools/deployment-cli-tools/tests/test_dockercompose.py
index 86fff944..3e2c2300 100644
--- a/tools/deployment-cli-tools/tests/test_dockercompose.py
+++ b/tools/deployment-cli-tools/tests/test_dockercompose.py
@@ -12,14 +12,14 @@
 
 
 def exists(path):
-        return path.exists()
+    return path.exists()
 
 
 def test_collect_compose_values(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
-                               exclude=['events'], domain="my.local",
-                               namespace='test', env='dev', local=False, tag=1, registry='reg')
+                                                 exclude=['events'], domain="my.local",
+                                                 namespace='test', env='dev', local=False, tag=1, registry='reg')
 
     # Auto values
     assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'reg/cloudharness/myapp:1'
@@ -96,7 +96,7 @@ def test_collect_compose_values(tmp_path):
 def test_collect_compose_values_noreg_noinclude(tmp_path):
     out_path = tmp_path / 'test_collect_compose_values_noreg_noinclude'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_path, domain="my.local",
-                               namespace='test', env='dev', local=False, tag=1)
+                                                 namespace='test', env='dev', local=False, tag=1)
 
     # Auto values
     assert values[KEY_APPS]['myapp'][KEY_HARNESS]['deployment']['image'] == 'cloudharness/myapp:1'
@@ -152,6 +152,7 @@ def test_collect_compose_values_noreg_noinclude(tmp_path):
         assert content == 'mykey: myvalue'
         content = (compose_path / 'resources' / 'generated' / 'test2.yaml').read_text()
         assert content == 'mykey2: myvalue2'
+    else:
         assert False
 
     assert values[KEY_TASK_IMAGES]
@@ -160,63 +161,61 @@ def test_collect_compose_values_noreg_noinclude(tmp_path):
     assert values[KEY_TASK_IMAGES]['myapp-mytask'] == 'cloudharness/myapp-mytask:1'
 
 
-
 def test_collect_compose_values_precedence(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_precedence'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               namespace='test', env='prod', local=False, tag=1, include=["events"])
+                                                 namespace='test', env='prod', local=False, tag=1, include=["events"])
 
     # Values.yaml from current app must override values-prod.yaml from cloudharness
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['memory'] == 'overridden'
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['cpu'] == 'overridden-prod'
 
+
 def test_collect_compose_values_multiple_envs(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_multiple_envs'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               namespace='test', env=['dev', 'test'], local=False, tag=1, include=["myapp"])
-
+                                                 namespace='test', env=['dev', 'test'], local=False, tag=1, include=["myapp"])
 
     assert values[KEY_APPS]['myapp']['test'] is True, 'values-test not loaded'
     assert values[KEY_APPS]['myapp']['dev'] is True, 'values-dev not loaded'
     assert values[KEY_APPS]['myapp']['a'] == 'test', 'values-test not overriding'
 
 
-
 def test_collect_compose_values_wrong_dependencies_validate(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_wrong_dependencies_validate'
     with pytest.raises(ValuesValidationException):
         create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-hard"])
+                                            namespace='test', env='prod', local=False, tag=1, include=["wrong-hard"])
     try:
         create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-soft"])
+                                            namespace='test', env='prod', local=False, tag=1, include=["wrong-soft"])
 
     except ValuesValidationException as e:
         pytest.fail("Should not error because of wrong soft dependency")
 
     with pytest.raises(ValuesValidationException):
         create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-build"])
+                                            namespace='test', env='prod', local=False, tag=1, include=["wrong-build"])
     with pytest.raises(ValuesValidationException):
         create_docker_compose_configuration([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-services"])
+                                            namespace='test', env='prod', local=False, tag=1, include=["wrong-services"])
 
 
 def test_collect_compose_values_build_dependencies(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_build_dependencies'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               namespace='test', env='prod', local=False, tag=1, include=["myapp"])
+                                                 namespace='test', env='prod', local=False, tag=1, include=["myapp"])
 
     assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES], "Cloudharness-base is included in cloudharness-flask Dockerfile and it should be guessed"
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
     assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
 
+
 def test_collect_compose_values_build_dependencies_nodeps(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_build_dependencies_nodeps'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               namespace='test', env='prod', local=False, tag=1, include=["events"])
-
+                                                 namespace='test', env='prod', local=False, tag=1, include=["events"])
 
     assert 'cloudharness-flask' not in values[KEY_TASK_IMAGES], "Cloudharness-flask is not included in the build dependencies"
     assert 'cloudharness-base' not in values[KEY_TASK_IMAGES], "Cloudharness-base is not included in the build dependencies"
@@ -227,8 +226,7 @@ def test_collect_compose_values_build_dependencies_nodeps(tmp_path):
 def test_collect_compose_values_build_dependencies_exclude(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_build_dependencies_exclude'
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               namespace='test', env='prod', local=False, tag=1, include=["workflows"], exclude=["workflows-extract-download"])
-
+                                                 namespace='test', env='prod', local=False, tag=1, include=["workflows"], exclude=["workflows-extract-download"])
 
     assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES], "Cloudharness-base is included in cloudharness-flask Dockerfile and it should be guessed"
@@ -239,7 +237,7 @@ def test_clear_unused_dbconfig(tmp_path):
     out_folder = tmp_path / 'test_clear_unused_dbconfig'
 
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               env='withpostgres', local=False, include=["myapp"], exclude=["legacy"])
+                                                 env='withpostgres', local=False, include=["myapp"], exclude=["legacy"])
 
     # There is a DB config
     assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
@@ -256,7 +254,7 @@ def test_clear_unused_dbconfig(tmp_path):
     assert db_config['neo4j'] is None
 
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               env='withmongo', local=False, include=["myapp"], exclude=["legacy"])
+                                                 env='withmongo', local=False, include=["myapp"], exclude=["legacy"])
 
     assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
     db_config = values[KEY_APPS]['myapp'][KEY_HARNESS][KEY_DATABASE]
@@ -273,7 +271,7 @@ def test_clear_all_dbconfig_if_nodb(tmp_path):
     out_folder = tmp_path / 'test_clear_all_dbconfig_if_nodb'
 
     values = create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
-                               env='withoutdb', local=False, include=["myapp"], exclude=["legacy"])
+                                                 env='withoutdb', local=False, include=["myapp"], exclude=["legacy"])
 
     # There is a DB config
     assert KEY_DATABASE in values[KEY_APPS]['myapp'][KEY_HARNESS]
@@ -308,10 +306,11 @@ def test_tag_hash_generation():
 
 def test_collect_compose_values_auto_tag(tmp_path):
     out_folder = tmp_path / 'test_collect_compose_values_auto_tag'
+
     def create():
         return create_docker_compose_configuration([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
-                               exclude=['events'], domain="my.local",
-                               namespace='test', env='dev', local=False, tag=None, registry='reg')
+                                                   exclude=['events'], domain="my.local",
+                                                   namespace='test', env='dev', local=False, tag=None, registry='reg')
 
     BASE_KEY = "cloudharness-base"
     values = create()
@@ -330,7 +329,6 @@ def create():
     assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing changed the hash value"
     assert values["task-images"][BASE_KEY] == b1, "Base image should not change following the root .dockerignore"
 
-
     fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.txt'
     try:
         fname.write_text('a')
@@ -350,12 +348,10 @@ def create():
     finally:
         fname.unlink()
 
-
     fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.ignored'
     try:
         fname.write_text('a')
 
-
         values = create()
         assert values["task-images"][BASE_KEY] == b1, "2: Application files should be ignored for base image following the root .dockerignore"
 
@@ -376,7 +372,6 @@ def create():
     finally:
         fname.unlink()
 
-
     fname = Path(CLOUDHARNESS_ROOT) / 'atestfile'
     try:
         fname.write_text('a')
diff --git a/tools/deployment-cli-tools/tests/test_helm.py b/tools/deployment-cli-tools/tests/test_helm.py
index 9a773442..35d903a1 100644
--- a/tools/deployment-cli-tools/tests/test_helm.py
+++ b/tools/deployment-cli-tools/tests/test_helm.py
@@ -8,7 +8,7 @@
 
 
 def exists(path):
-        return path.exists()
+    return path.exists()
 
 
 def test_collect_helm_values(tmp_path):
@@ -144,36 +144,35 @@ def test_collect_helm_values_precedence(tmp_path):
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['memory'] == 'overridden'
     assert values[KEY_APPS]['events']['kafka']['resources']['limits']['cpu'] == 'overridden-prod'
 
+
 def test_collect_helm_values_multiple_envs(tmp_path):
     out_folder = tmp_path / 'test_collect_helm_values_multiple_envs'
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env=['dev', 'test'], local=False, tag=1, include=["myapp"])
 
-
     assert values[KEY_APPS]['myapp']['test'] is True, 'values-test not loaded'
     assert values[KEY_APPS]['myapp']['dev'] is True, 'values-dev not loaded'
     assert values[KEY_APPS]['myapp']['a'] == 'test', 'values-test not overriding'
 
 
-
 def test_collect_helm_values_wrong_dependencies_validate(tmp_path):
     out_folder = tmp_path / 'test_collect_helm_values_wrong_dependencies_validate'
     with pytest.raises(ValuesValidationException):
         create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-hard"])
+                          namespace='test', env='prod', local=False, tag=1, include=["wrong-hard"])
     try:
         create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-soft"])
+                          namespace='test', env='prod', local=False, tag=1, include=["wrong-soft"])
 
     except ValuesValidationException as e:
         pytest.fail("Should not error because of wrong soft dependency")
 
     with pytest.raises(ValuesValidationException):
         create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-build"])
+                          namespace='test', env='prod', local=False, tag=1, include=["wrong-build"])
     with pytest.raises(ValuesValidationException):
         create_helm_chart([CLOUDHARNESS_ROOT, f"{RESOURCES}/wrong-dependencies"], output_path=out_folder, domain="my.local",
-                                   namespace='test', env='prod', local=False, tag=1, include=["wrong-services"])
+                          namespace='test', env='prod', local=False, tag=1, include=["wrong-services"])
 
 
 def test_collect_helm_values_build_dependencies(tmp_path):
@@ -186,12 +185,12 @@ def test_collect_helm_values_build_dependencies(tmp_path):
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
     assert 'cloudharness-frontend-build' not in values[KEY_TASK_IMAGES], "cloudharness-frontend-build is not included in any dependency"
 
+
 def test_collect_helm_values_build_dependencies_nodeps(tmp_path):
     out_folder = tmp_path / 'test_collect_helm_values_build_dependencies_nodeps'
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["events"])
 
-
     assert 'cloudharness-flask' not in values[KEY_TASK_IMAGES], "Cloudharness-flask is not included in the build dependencies"
     assert 'cloudharness-base' not in values[KEY_TASK_IMAGES], "Cloudharness-base is not included in the build dependencies"
     assert 'cloudharness-base-debian' not in values[KEY_TASK_IMAGES], "Cloudharness-base-debian is not included in any dependency"
@@ -203,7 +202,6 @@ def test_collect_helm_values_build_dependencies_exclude(tmp_path):
     values = create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, domain="my.local",
                                namespace='test', env='prod', local=False, tag=1, include=["workflows"], exclude=["workflows-extract-download"])
 
-
     assert 'cloudharness-flask' in values[KEY_TASK_IMAGES], "Cloudharness-flask is included in the build dependencies"
     assert 'cloudharness-base' in values[KEY_TASK_IMAGES], "Cloudharness-base is included in cloudharness-flask Dockerfile and it should be guessed"
     assert 'workflows-extract-download' not in values[KEY_TASK_IMAGES], "workflows-extract-download has been explicitly excluded"
@@ -281,11 +279,12 @@ def test_tag_hash_generation():
 
 
 def test_collect_helm_values_auto_tag(tmp_path):
-    out_folder = tmp_path / 'test_collect_helm_values_auto_tag'
+    out_folder = str(tmp_path / 'test_collect_helm_values_auto_tag')
+
     def create():
         return create_helm_chart([CLOUDHARNESS_ROOT, RESOURCES], output_path=out_folder, include=['samples', 'myapp'],
-                               exclude=['events'], domain="my.local",
-                               namespace='test', env='dev', local=False, tag=None, registry='reg')
+                                 exclude=['events'], domain="my.local",
+                                 namespace='test', env='dev', local=False, tag=None, registry='reg')
 
     BASE_KEY = "cloudharness-base"
     values = create()
@@ -304,7 +303,6 @@ def create():
     assert v1 == values.apps['myapp'].harness.deployment.image, "Nothing changed the hash value"
     assert values["task-images"][BASE_KEY] == b1, "Base image should not change following the root .dockerignore"
 
-
     fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.txt'
     try:
         fname.write_text('a')
@@ -324,12 +322,10 @@ def create():
     finally:
         fname.unlink()
 
-
     fname = Path(RESOURCES) / 'applications' / 'myapp' / 'afile.ignored'
     try:
         fname.write_text('a')
 
-
         values = create()
         assert values["task-images"][BASE_KEY] == b1, "2: Application files should be ignored for base image following the root .dockerignore"
 
@@ -350,7 +346,6 @@ def create():
     finally:
         fname.unlink()
 
-
     fname = Path(CLOUDHARNESS_ROOT) / 'atestfile'
     try:
         fname.write_text('a')

From 5adab28ae28b92fa894025b5518ae2a7300ca346 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 11:23:45 +0200
Subject: [PATCH 144/210] CH-110 chore: ignore generated compose file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b09e20fd..1c0fcc2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ node_modules
 *.DS_Store
 deployment/helm
 deployment/compose
+deployment/docker-compose.yaml
 *.egg-info
 *.idea
 /build

From c10719e0d021f205afeb79468eb9e48b1b4a428d Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 15:01:18 +0200
Subject: [PATCH 145/210] CH-126 update python client generation

---
 .../frontend/src/rest/apis/ResourceApi.ts     |   45 +-
 .../frontend/src/rest/apis/WorkflowsApi.ts    |   22 +-
 .../src/rest/models/InlineResponse202.ts      |   21 +-
 .../src/rest/models/InlineResponse202Task.ts  |   25 +-
 .../src/rest/models/SampleResource.ts         |   29 +-
 .../samples/frontend/src/rest/runtime.ts      |    9 +-
 libraries/client/cloudharness_cli/README.md   |  480 ++++
 .../cloudharness_cli/common/__init__.py       |   25 +-
 .../cloudharness_cli/common/api/__init__.py   |    7 +
 .../common/api/accounts_api.py                |  279 ++
 .../cloudharness_cli/common/api/config_api.py |  276 ++
 .../cloudharness_cli/common/api/sentry_api.py |  303 ++
 .../cloudharness_cli/common/api_client.py     | 2016 +++++---------
 .../cloudharness_cli/common/api_response.py   |   21 +
 .../cloudharness_cli/common/apis/__init__.py  |    3 -
 .../common/apis/path_to_api.py                |   20 -
 .../common/apis/paths/__init__.py             |    3 -
 .../common/apis/paths/accounts_config.py      |    7 -
 .../apis/paths/sentry_getdsn_appname.py       |    7 -
 .../common/apis/tag_to_api.py                 |   20 -
 .../common/apis/tags/__init__.py              |   10 -
 .../common/apis/tags/accounts_api.py          |   23 -
 .../common/apis/tags/sentry_api.py            |   23 -
 .../cloudharness_cli/common/configuration.py  |  150 +-
 .../cloudharness_cli/common/exceptions.py     |  103 +-
 .../cloudharness_cli/common/model/__init__.py |    5 -
 .../common/models/__init__.py                 |   21 +-
 .../common/models/app_version.py              |   89 +
 .../common/models/get_config200_response.py   |   91 +
 .../cloudharness_cli/common/paths/__init__.py |   10 -
 .../common/paths/accounts_config/__init__.py  |    7 -
 .../common/paths/accounts_config/get.py       |  302 --
 .../common/paths/accounts_config/get.pyi      |  297 --
 .../paths/sentry_getdsn_appname/__init__.py   |    7 -
 .../common/paths/sentry_getdsn_appname/get.py |  287 --
 .../paths/sentry_getdsn_appname/get.pyi       |  282 --
 .../common/py.typed}                          |    0
 .../cloudharness_cli/common/rest.py           |  331 +--
 .../cloudharness_cli/common/schemas.py        | 2462 ----------------
 .../cloudharness_cli/samples/__init__.py      |   27 +-
 .../cloudharness_cli/samples/api/__init__.py  |    8 +
 .../cloudharness_cli/samples/api/auth_api.py  |  531 ++++
 .../samples/api/resource_api.py               | 1356 +++++++++
 .../cloudharness_cli/samples/api/test_api.py  |  527 ++++
 .../samples/api/workflows_api.py              |  800 ++++++
 .../cloudharness_cli/samples/api_client.py    | 2016 +++++---------
 .../cloudharness_cli/samples/api_response.py  |   21 +
 .../cloudharness_cli/samples/apis/__init__.py |    3 -
 .../samples/apis/path_to_api.py               |   41 -
 .../samples/apis/paths/__init__.py            |    3 -
 .../samples/apis/paths/error.py               |    7 -
 .../samples/apis/paths/operation_async.py     |    7 -
 .../samples/apis/paths/operation_sync.py      |    7 -
 .../apis/paths/operation_sync_results.py      |    7 -
 .../samples/apis/paths/ping.py                |    7 -
 .../samples/apis/paths/sampleresources.py     |    9 -
 .../sampleresources_sampleresource_id.py      |   11 -
 .../samples/apis/paths/valid.py               |    7 -
 .../samples/apis/paths/valid_cookie.py        |    7 -
 .../samples/apis/tag_to_api.py                |   26 -
 .../samples/apis/tags/__init__.py             |   12 -
 .../samples/apis/tags/auth_api.py             |   26 -
 .../samples/apis/tags/resource_api.py         |   32 -
 .../samples/apis/tags/test_api.py             |   26 -
 .../samples/apis/tags/workflows_api.py        |   28 -
 .../cloudharness_cli/samples/configuration.py |  150 +-
 .../cloudharness_cli/samples/exceptions.py    |  103 +-
 .../samples/model/__init__.py                 |    5 -
 .../samples/model/inline_response202.py       |   84 -
 .../samples/model/inline_response202.pyi      |   84 -
 .../samples/model/inline_response202_task.py  |   89 -
 .../samples/model/inline_response202_task.pyi |   89 -
 .../samples/model/sample_resource.py          |  104 -
 .../samples/model/sample_resource.pyi         |  104 -
 .../samples/models/__init__.py                |   26 +-
 .../samples/models/inline_response202.py      |   92 +
 .../samples/models/inline_response202_task.py |   90 +
 .../samples/models/sample_resource.py         |   92 +
 .../samples/paths/__init__.py                 |   17 -
 .../samples/paths/error/__init__.py           |    7 -
 .../samples/paths/error/get.py                |  246 --
 .../samples/paths/error/get.pyi               |  240 --
 .../samples/paths/operation_async/__init__.py |    7 -
 .../samples/paths/operation_async/get.py      |  235 --
 .../samples/paths/operation_async/get.pyi     |  230 --
 .../samples/paths/operation_sync/__init__.py  |    7 -
 .../samples/paths/operation_sync/get.py       |  233 --
 .../samples/paths/operation_sync/get.pyi      |  228 --
 .../paths/operation_sync_results/__init__.py  |    7 -
 .../paths/operation_sync_results/get.py       |  298 --
 .../paths/operation_sync_results/get.pyi      |  293 --
 .../samples/paths/ping/__init__.py            |    7 -
 .../samples/paths/ping/get.py                 |  246 --
 .../samples/paths/ping/get.pyi                |  240 --
 .../samples/paths/sampleresources/__init__.py |    7 -
 .../samples/paths/sampleresources/get.py      |  260 --
 .../samples/paths/sampleresources/get.pyi     |  255 --
 .../samples/paths/sampleresources/post.py     |  312 ---
 .../samples/paths/sampleresources/post.pyi    |  306 --
 .../__init__.py                               |    7 -
 .../delete.py                                 |  282 --
 .../delete.pyi                                |  275 --
 .../sampleresources_sampleresource_id/get.py  |  315 ---
 .../sampleresources_sampleresource_id/get.pyi |  308 ---
 .../sampleresources_sampleresource_id/put.py  |  382 ---
 .../sampleresources_sampleresource_id/put.pyi |  375 ---
 .../samples/paths/valid/__init__.py           |    7 -
 .../samples/paths/valid/get.py                |  250 --
 .../samples/paths/valid/get.pyi               |  241 --
 .../samples/paths/valid_cookie/__init__.py    |    7 -
 .../samples/paths/valid_cookie/get.py         |  250 --
 .../samples/paths/valid_cookie/get.pyi        |  241 --
 .../samples/py.typed}                         |    0
 .../cloudharness_cli/samples/rest.py          |  331 +--
 .../cloudharness_cli/samples/schemas.py       | 2463 -----------------
 .../volumemanager/__init__.py                 |   23 +-
 .../volumemanager/api/__init__.py             |    5 +
 .../volumemanager/api/rest_api.py             |  570 ++++
 .../volumemanager/api_client.py               | 2016 +++++---------
 .../volumemanager/api_response.py             |   21 +
 .../volumemanager/apis/__init__.py            |    3 -
 .../volumemanager/apis/path_to_api.py         |   20 -
 .../volumemanager/apis/paths/__init__.py      |    3 -
 .../volumemanager/apis/paths/pvc.py           |    7 -
 .../volumemanager/apis/paths/pvc_name.py      |    7 -
 .../volumemanager/apis/tag_to_api.py          |   17 -
 .../volumemanager/apis/tags/__init__.py       |    9 -
 .../volumemanager/apis/tags/rest_api.py       |   25 -
 .../volumemanager/configuration.py            |  150 +-
 .../volumemanager/exceptions.py               |  103 +-
 .../volumemanager/model/__init__.py           |    5 -
 .../model/persistent_volume_claim.py          |  108 -
 .../model/persistent_volume_claim.pyi         |  108 -
 .../model/persistent_volume_claim_create.py   |   88 -
 .../model/persistent_volume_claim_create.pyi  |   88 -
 .../volumemanager/models/__init__.py          |   25 +-
 .../models/persistent_volume_claim.py         |   93 +
 .../models/persistent_volume_claim_create.py  |   89 +
 .../volumemanager/paths/__init__.py           |   10 -
 .../volumemanager/paths/pvc/__init__.py       |    7 -
 .../volumemanager/paths/pvc/post.py           |  347 ---
 .../volumemanager/paths/pvc/post.pyi          |  338 ---
 .../volumemanager/paths/pvc_name/__init__.py  |    7 -
 .../volumemanager/paths/pvc_name/get.py       |  306 --
 .../volumemanager/paths/pvc_name/get.pyi      |  297 --
 .../volumemanager/py.typed}                   |    0
 .../cloudharness_cli/volumemanager/rest.py    |  331 +--
 .../cloudharness_cli/volumemanager/schemas.py | 2462 ----------------
 .../cloudharness_cli/workflows/__init__.py    |   25 +-
 .../workflows/api/__init__.py                 |    5 +
 .../workflows/api/create_and_access_api.py    | 1120 ++++++++
 .../cloudharness_cli/workflows/api_client.py  | 2016 +++++---------
 .../workflows/api_response.py                 |   21 +
 .../workflows/apis/__init__.py                |    3 -
 .../workflows/apis/path_to_api.py             |   23 -
 .../workflows/apis/paths/__init__.py          |    3 -
 .../workflows/apis/paths/operations.py        |    7 -
 .../workflows/apis/paths/operations_name.py   |    9 -
 .../apis/paths/operations_name_logs.py        |    7 -
 .../workflows/apis/tag_to_api.py              |   17 -
 .../workflows/apis/tags/__init__.py           |    9 -
 .../apis/tags/create_and_access_api.py        |   30 -
 .../workflows/configuration.py                |  154 +-
 .../cloudharness_cli/workflows/exceptions.py  |  103 +-
 .../workflows/model/__init__.py               |    5 -
 .../workflows/model/operation.py              |  127 -
 .../workflows/model/operation.pyi             |  127 -
 .../model/operation_search_result.py          |  123 -
 .../model/operation_search_result.pyi         |  123 -
 .../workflows/model/operation_status.py       |   70 -
 .../workflows/model/operation_status.pyi      |   59 -
 .../workflows/model/search_result_data.py     |   82 -
 .../workflows/model/search_result_data.pyi    |   82 -
 .../workflows/models/__init__.py              |   28 +-
 .../workflows/models/operation.py             |  100 +
 .../models/operation_search_result.py         |  102 +
 .../workflows/models/operation_status.py      |   42 +
 .../workflows/models/search_result_data.py    |   88 +
 .../workflows/paths/__init__.py               |   11 -
 .../workflows/paths/operations/__init__.py    |    7 -
 .../workflows/paths/operations/get.py         |  330 ---
 .../workflows/paths/operations/get.pyi        |  320 ---
 .../paths/operations_name/__init__.py         |    7 -
 .../workflows/paths/operations_name/delete.py |  269 --
 .../paths/operations_name/delete.pyi          |  263 --
 .../workflows/paths/operations_name/get.py    |  327 ---
 .../workflows/paths/operations_name/get.pyi   |  321 ---
 .../paths/operations_name_logs/__init__.py    |    7 -
 .../paths/operations_name_logs/get.py         |  300 --
 .../paths/operations_name_logs/get.pyi        |  294 --
 .../workflows/py.typed}                       |    0
 .../cloudharness_cli/workflows/rest.py        |  331 +--
 .../cloudharness_cli/workflows/schemas.py     | 2463 -----------------
 .../docs/common/AccountsApi.md                |   73 +
 .../docs/common/AppVersion.md                 |   31 +
 .../cloudharness_cli/docs/common/ConfigApi.md |   70 +
 .../docs/common/GetConfig200Response.md       |   31 +
 .../cloudharness_cli/docs/common/SentryApi.md |   78 +
 .../docs/common/apis/tags/AccountsApi.md      |   80 -
 .../docs/common/apis/tags/SentryApi.md        |   98 -
 .../cloudharness_cli/docs/samples/AuthApi.md  |  159 ++
 .../docs/samples/InlineResponse202.md         |   29 +
 .../docs/samples/InlineResponse202Task.md     |   30 +
 .../docs/samples/ResourceApi.md               |  351 +++
 .../docs/samples/SampleResource.md            |   32 +
 .../cloudharness_cli/docs/samples/TestApi.md  |  134 +
 .../docs/samples/WorkflowsApi.md              |  201 ++
 .../docs/samples/apis/tags/AuthApi.md         |  173 --
 .../docs/samples/apis/tags/ResourceApi.md     |  482 ----
 .../docs/samples/apis/tags/TestApi.md         |  148 -
 .../docs/samples/apis/tags/WorkflowsApi.md    |  230 --
 .../docs/samples/models/InlineResponse202.md  |   15 -
 .../samples/models/InlineResponse202Task.md   |   16 -
 .../docs/samples/models/SampleResource.md     |   17 -
 .../volumemanager/PersistentVolumeClaim.md    |   32 +
 .../PersistentVolumeClaimCreate.md            |   30 +
 .../docs/volumemanager/RestApi.md             |  165 ++
 .../docs/volumemanager/apis/tags/RestApi.md   |  217 --
 .../models/PersistentVolumeClaim.md           |   18 -
 .../models/PersistentVolumeClaimCreate.md     |   16 -
 .../docs/workflows/CreateAndAccessApi.md      |  290 ++
 .../docs/workflows/Operation.md               |   34 +
 .../docs/workflows/OperationSearchResult.md   |   31 +
 .../docs/workflows/OperationStatus.md         |   20 +
 .../docs/workflows/SearchResultData.md        |   30 +
 .../workflows/apis/tags/CreateAndAccessApi.md |  416 ---
 .../docs/workflows/models/Operation.md        |   21 -
 .../workflows/models/OperationSearchResult.md |   30 -
 .../docs/workflows/models/OperationStatus.md  |    9 -
 .../docs/workflows/models/SearchResultData.md |   17 -
 .../client/cloudharness_cli/requirements.txt  |   10 +-
 libraries/client/cloudharness_cli/setup.py    |    5 +-
 .../cloudharness_cli/test-requirements.txt    |    8 +-
 .../test/common/test_paths/__init__.py        |   68 -
 .../test_accounts_config/test_get.py          |   41 -
 .../test_sentry_getdsn_appname/test_get.py    |   41 -
 .../cloudharness_cli/test/samples/__init__.py |    0
 .../test/samples/test_models/__init__.py      |    0
 .../test_models/test_inline_response202.py    |   26 -
 .../test_inline_response202_task.py           |   26 -
 .../test_models/test_sample_resource.py       |   26 -
 .../test/samples/test_paths/__init__.py       |   68 -
 .../samples/test_paths/test_error/__init__.py |    0
 .../samples/test_paths/test_error/test_get.py |   41 -
 .../test_operation_async/__init__.py          |    0
 .../test_operation_async/test_get.py          |   41 -
 .../test_operation_sync/__init__.py           |    0
 .../test_operation_sync/test_get.py           |   41 -
 .../test_operation_sync_results/__init__.py   |    0
 .../test_operation_sync_results/test_get.py   |   41 -
 .../samples/test_paths/test_ping/__init__.py  |    0
 .../samples/test_paths/test_ping/test_get.py  |   41 -
 .../test_sampleresources/__init__.py          |    0
 .../test_sampleresources/test_get.py          |   41 -
 .../test_sampleresources/test_post.py         |   42 -
 .../__init__.py                               |    0
 .../test_delete.py                            |   40 -
 .../test_get.py                               |   41 -
 .../test_put.py                               |   42 -
 .../samples/test_paths/test_valid/__init__.py |    0
 .../samples/test_paths/test_valid/test_get.py |   41 -
 .../test_paths/test_valid_cookie/__init__.py  |    0
 .../test_paths/test_valid_cookie/test_get.py  |   41 -
 .../test/volumemanager/__init__.py            |    0
 .../volumemanager/test_models/__init__.py     |    0
 .../test_persistent_volume_claim.py           |   25 -
 .../test_persistent_volume_claim_create.py    |   25 -
 .../test/volumemanager/test_paths/__init__.py |   68 -
 .../test_paths/test_pvc/__init__.py           |    0
 .../test_paths/test_pvc/test_post.py          |   43 -
 .../test_paths/test_pvc_name/__init__.py      |    0
 .../test_paths/test_pvc_name/test_get.py      |   41 -
 .../test/workflows/__init__.py                |    0
 .../test/workflows/test_models/__init__.py    |    0
 .../workflows/test_models/test_operation.py   |   26 -
 .../test_operation_search_result.py           |   26 -
 .../test_models/test_operation_status.py      |   26 -
 .../test_models/test_search_result_data.py    |   26 -
 .../test/workflows/test_paths/__init__.py     |   68 -
 .../test_paths/test_operations/__init__.py    |    0
 .../test_paths/test_operations/test_get.py    |   41 -
 .../test_operations_name/__init__.py          |    0
 .../test_operations_name/test_delete.py       |   40 -
 .../test_operations_name/test_get.py          |   41 -
 .../test_operations_name_logs/__init__.py     |    0
 .../test_operations_name_logs/test_get.py     |   41 -
 openapitools.json                             |    7 +
 .../ch_cli_tools/openapi.py                   |    8 +-
 tools/deployment-cli-tools/harness-generate   |   10 +-
 289 files changed, 13318 insertions(+), 33755 deletions(-)
 create mode 100644 libraries/client/cloudharness_cli/README.md
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/api/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/api/accounts_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/api/config_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/api/sentry_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/api_response.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/path_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/accounts_config.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/sentry_getdsn_appname.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tag_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/accounts_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/sentry_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/model/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/models/app_version.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/models/get_config200_response.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.pyi
 rename libraries/client/cloudharness_cli/{test/common/__init__.py => cloudharness_cli/common/py.typed} (100%)
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/common/schemas.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/api/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/api/auth_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/api/resource_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/api/test_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/api/workflows_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/api_response.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/path_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/error.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_async.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync_results.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/ping.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources_sampleresource_id.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid_cookie.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tag_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/auth_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/resource_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/test_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/workflows_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.pyi
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202_task.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/models/sample_resource.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.pyi
 rename libraries/client/cloudharness_cli/{test/common/test_models/__init__.py => cloudharness_cli/samples/py.typed} (100%)
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/samples/schemas.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/rest_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_response.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/path_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc_name.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tag_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/rest_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.pyi
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim_create.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.pyi
 rename libraries/client/cloudharness_cli/{test/common/test_paths/test_accounts_config/__init__.py => cloudharness_cli/volumemanager/py.typed} (100%)
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/schemas.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/create_and_access_api.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_response.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/path_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name_logs.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tag_to_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/create_and_access_api.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.pyi
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_search_result.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_status.py
 create mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/search_result_data.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.pyi
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.py
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.pyi
 rename libraries/client/cloudharness_cli/{test/common/test_paths/test_sentry_getdsn_appname/__init__.py => cloudharness_cli/workflows/py.typed} (100%)
 delete mode 100644 libraries/client/cloudharness_cli/cloudharness_cli/workflows/schemas.py
 create mode 100644 libraries/client/cloudharness_cli/docs/common/AccountsApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/common/AppVersion.md
 create mode 100644 libraries/client/cloudharness_cli/docs/common/ConfigApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/common/GetConfig200Response.md
 create mode 100644 libraries/client/cloudharness_cli/docs/common/SentryApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/common/apis/tags/AccountsApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/common/apis/tags/SentryApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/AuthApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/InlineResponse202.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/InlineResponse202Task.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/ResourceApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/SampleResource.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/TestApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/samples/WorkflowsApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/apis/tags/AuthApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/apis/tags/ResourceApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/apis/tags/TestApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/apis/tags/WorkflowsApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202Task.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/samples/models/SampleResource.md
 create mode 100644 libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaim.md
 create mode 100644 libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaimCreate.md
 create mode 100644 libraries/client/cloudharness_cli/docs/volumemanager/RestApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/volumemanager/apis/tags/RestApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaim.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaimCreate.md
 create mode 100644 libraries/client/cloudharness_cli/docs/workflows/CreateAndAccessApi.md
 create mode 100644 libraries/client/cloudharness_cli/docs/workflows/Operation.md
 create mode 100644 libraries/client/cloudharness_cli/docs/workflows/OperationSearchResult.md
 create mode 100644 libraries/client/cloudharness_cli/docs/workflows/OperationStatus.md
 create mode 100644 libraries/client/cloudharness_cli/docs/workflows/SearchResultData.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/workflows/apis/tags/CreateAndAccessApi.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/workflows/models/Operation.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/workflows/models/OperationSearchResult.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/workflows/models/OperationStatus.md
 delete mode 100644 libraries/client/cloudharness_cli/docs/workflows/models/SearchResultData.md
 delete mode 100644 libraries/client/cloudharness_cli/test/common/test_paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/common/test_paths/test_accounts_config/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/common/test_paths/test_sentry_getdsn_appname/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_models/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202_task.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_models/test_sample_resource.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_error/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_error/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_post.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_delete.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_put.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_models/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim_create.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/test_post.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_models/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_models/test_operation.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_search_result.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_status.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_models/test_search_result_data.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_delete.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_get.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/__init__.py
 delete mode 100644 libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/test_get.py
 create mode 100644 openapitools.json

diff --git a/applications/samples/frontend/src/rest/apis/ResourceApi.ts b/applications/samples/frontend/src/rest/apis/ResourceApi.ts
index a0c70d83..a5da64ee 100644
--- a/applications/samples/frontend/src/rest/apis/ResourceApi.ts
+++ b/applications/samples/frontend/src/rest/apis/ResourceApi.ts
@@ -49,8 +49,11 @@ export class ResourceApi extends runtime.BaseAPI {
      * Create a SampleResource
      */
     async createSampleResourceRaw(requestParameters: CreateSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.sampleResource === null || requestParameters.sampleResource === undefined) {
-            throw new runtime.RequiredError('sampleResource','Required parameter requestParameters.sampleResource was null or undefined when calling createSampleResource.');
+        if (requestParameters['sampleResource'] == null) {
+            throw new runtime.RequiredError(
+                'sampleResource',
+                'Required parameter "sampleResource" was null or undefined when calling createSampleResource().'
+            );
         }
 
         const queryParameters: any = {};
@@ -64,7 +67,7 @@ export class ResourceApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: SampleResourceToJSON(requestParameters.sampleResource),
+            body: SampleResourceToJSON(requestParameters['sampleResource']),
         }, initOverrides);
 
         return new runtime.VoidApiResponse(response);
@@ -83,8 +86,11 @@ export class ResourceApi extends runtime.BaseAPI {
      * Delete a SampleResource
      */
     async deleteSampleResourceRaw(requestParameters: DeleteSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.sampleresourceId === null || requestParameters.sampleresourceId === undefined) {
-            throw new runtime.RequiredError('sampleresourceId','Required parameter requestParameters.sampleresourceId was null or undefined when calling deleteSampleResource.');
+        if (requestParameters['sampleresourceId'] == null) {
+            throw new runtime.RequiredError(
+                'sampleresourceId',
+                'Required parameter "sampleresourceId" was null or undefined when calling deleteSampleResource().'
+            );
         }
 
         const queryParameters: any = {};
@@ -92,7 +98,7 @@ export class ResourceApi extends runtime.BaseAPI {
         const headerParameters: runtime.HTTPHeaders = {};
 
         const response = await this.request({
-            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters.sampleresourceId))),
+            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters['sampleresourceId']))),
             method: 'DELETE',
             headers: headerParameters,
             query: queryParameters,
@@ -114,8 +120,11 @@ export class ResourceApi extends runtime.BaseAPI {
      * Get a SampleResource
      */
     async getSampleResourceRaw(requestParameters: GetSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SampleResource>> {
-        if (requestParameters.sampleresourceId === null || requestParameters.sampleresourceId === undefined) {
-            throw new runtime.RequiredError('sampleresourceId','Required parameter requestParameters.sampleresourceId was null or undefined when calling getSampleResource.');
+        if (requestParameters['sampleresourceId'] == null) {
+            throw new runtime.RequiredError(
+                'sampleresourceId',
+                'Required parameter "sampleresourceId" was null or undefined when calling getSampleResource().'
+            );
         }
 
         const queryParameters: any = {};
@@ -123,7 +132,7 @@ export class ResourceApi extends runtime.BaseAPI {
         const headerParameters: runtime.HTTPHeaders = {};
 
         const response = await this.request({
-            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters.sampleresourceId))),
+            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters['sampleresourceId']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -174,12 +183,18 @@ export class ResourceApi extends runtime.BaseAPI {
      * Update a SampleResource
      */
     async updateSampleResourceRaw(requestParameters: UpdateSampleResourceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.sampleresourceId === null || requestParameters.sampleresourceId === undefined) {
-            throw new runtime.RequiredError('sampleresourceId','Required parameter requestParameters.sampleresourceId was null or undefined when calling updateSampleResource.');
+        if (requestParameters['sampleresourceId'] == null) {
+            throw new runtime.RequiredError(
+                'sampleresourceId',
+                'Required parameter "sampleresourceId" was null or undefined when calling updateSampleResource().'
+            );
         }
 
-        if (requestParameters.sampleResource === null || requestParameters.sampleResource === undefined) {
-            throw new runtime.RequiredError('sampleResource','Required parameter requestParameters.sampleResource was null or undefined when calling updateSampleResource.');
+        if (requestParameters['sampleResource'] == null) {
+            throw new runtime.RequiredError(
+                'sampleResource',
+                'Required parameter "sampleResource" was null or undefined when calling updateSampleResource().'
+            );
         }
 
         const queryParameters: any = {};
@@ -189,11 +204,11 @@ export class ResourceApi extends runtime.BaseAPI {
         headerParameters['Content-Type'] = 'application/json';
 
         const response = await this.request({
-            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters.sampleresourceId))),
+            path: `/sampleresources/{sampleresourceId}`.replace(`{${"sampleresourceId"}}`, encodeURIComponent(String(requestParameters['sampleresourceId']))),
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: SampleResourceToJSON(requestParameters.sampleResource),
+            body: SampleResourceToJSON(requestParameters['sampleResource']),
         }, initOverrides);
 
         return new runtime.VoidApiResponse(response);
diff --git a/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts b/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts
index 5294d5cf..c70e2df6 100644
--- a/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts
+++ b/applications/samples/frontend/src/rest/apis/WorkflowsApi.ts
@@ -91,22 +91,28 @@ export class WorkflowsApi extends runtime.BaseAPI {
      * @deprecated
      */
     async submitSyncWithResultsRaw(requestParameters: SubmitSyncWithResultsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<string>> {
-        if (requestParameters.a === null || requestParameters.a === undefined) {
-            throw new runtime.RequiredError('a','Required parameter requestParameters.a was null or undefined when calling submitSyncWithResults.');
+        if (requestParameters['a'] == null) {
+            throw new runtime.RequiredError(
+                'a',
+                'Required parameter "a" was null or undefined when calling submitSyncWithResults().'
+            );
         }
 
-        if (requestParameters.b === null || requestParameters.b === undefined) {
-            throw new runtime.RequiredError('b','Required parameter requestParameters.b was null or undefined when calling submitSyncWithResults.');
+        if (requestParameters['b'] == null) {
+            throw new runtime.RequiredError(
+                'b',
+                'Required parameter "b" was null or undefined when calling submitSyncWithResults().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.a !== undefined) {
-            queryParameters['a'] = requestParameters.a;
+        if (requestParameters['a'] != null) {
+            queryParameters['a'] = requestParameters['a'];
         }
 
-        if (requestParameters.b !== undefined) {
-            queryParameters['b'] = requestParameters.b;
+        if (requestParameters['b'] != null) {
+            queryParameters['b'] = requestParameters['b'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};
diff --git a/applications/samples/frontend/src/rest/models/InlineResponse202.ts b/applications/samples/frontend/src/rest/models/InlineResponse202.ts
index 6703a8e7..6e25cd6c 100644
--- a/applications/samples/frontend/src/rest/models/InlineResponse202.ts
+++ b/applications/samples/frontend/src/rest/models/InlineResponse202.ts
@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
+import { mapValues } from '../runtime';
 import type { InlineResponse202Task } from './InlineResponse202Task';
 import {
     InlineResponse202TaskFromJSON,
@@ -37,10 +37,8 @@ export interface InlineResponse202 {
 /**
  * Check if a given object implements the InlineResponse202 interface.
  */
-export function instanceOfInlineResponse202(value: object): boolean {
-    let isInstance = true;
-
-    return isInstance;
+export function instanceOfInlineResponse202(value: object): value is InlineResponse202 {
+    return true;
 }
 
 export function InlineResponse202FromJSON(json: any): InlineResponse202 {
@@ -48,25 +46,22 @@ export function InlineResponse202FromJSON(json: any): InlineResponse202 {
 }
 
 export function InlineResponse202FromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineResponse202 {
-    if ((json === undefined) || (json === null)) {
+    if (json == null) {
         return json;
     }
     return {
         
-        'task': !exists(json, 'task') ? undefined : InlineResponse202TaskFromJSON(json['task']),
+        'task': json['task'] == null ? undefined : InlineResponse202TaskFromJSON(json['task']),
     };
 }
 
 export function InlineResponse202ToJSON(value?: InlineResponse202 | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
+    if (value == null) {
+        return value;
     }
     return {
         
-        'task': InlineResponse202TaskToJSON(value.task),
+        'task': InlineResponse202TaskToJSON(value['task']),
     };
 }
 
diff --git a/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts b/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts
index b35eab4d..733e4058 100644
--- a/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts
+++ b/applications/samples/frontend/src/rest/models/InlineResponse202Task.ts
@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
+import { mapValues } from '../runtime';
 /**
  * 
  * @export
@@ -36,10 +36,8 @@ export interface InlineResponse202Task {
 /**
  * Check if a given object implements the InlineResponse202Task interface.
  */
-export function instanceOfInlineResponse202Task(value: object): boolean {
-    let isInstance = true;
-
-    return isInstance;
+export function instanceOfInlineResponse202Task(value: object): value is InlineResponse202Task {
+    return true;
 }
 
 export function InlineResponse202TaskFromJSON(json: any): InlineResponse202Task {
@@ -47,27 +45,24 @@ export function InlineResponse202TaskFromJSON(json: any): InlineResponse202Task
 }
 
 export function InlineResponse202TaskFromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineResponse202Task {
-    if ((json === undefined) || (json === null)) {
+    if (json == null) {
         return json;
     }
     return {
         
-        'href': !exists(json, 'href') ? undefined : json['href'],
-        'name': !exists(json, 'name') ? undefined : json['name'],
+        'href': json['href'] == null ? undefined : json['href'],
+        'name': json['name'] == null ? undefined : json['name'],
     };
 }
 
 export function InlineResponse202TaskToJSON(value?: InlineResponse202Task | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
+    if (value == null) {
+        return value;
     }
     return {
         
-        'href': value.href,
-        'name': value.name,
+        'href': value['href'],
+        'name': value['name'],
     };
 }
 
diff --git a/applications/samples/frontend/src/rest/models/SampleResource.ts b/applications/samples/frontend/src/rest/models/SampleResource.ts
index b6da584d..a124300b 100644
--- a/applications/samples/frontend/src/rest/models/SampleResource.ts
+++ b/applications/samples/frontend/src/rest/models/SampleResource.ts
@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 
-import { exists, mapValues } from '../runtime';
+import { mapValues } from '../runtime';
 /**
  * 
  * @export
@@ -42,11 +42,9 @@ export interface SampleResource {
 /**
  * Check if a given object implements the SampleResource interface.
  */
-export function instanceOfSampleResource(value: object): boolean {
-    let isInstance = true;
-    isInstance = isInstance && "a" in value;
-
-    return isInstance;
+export function instanceOfSampleResource(value: object): value is SampleResource {
+    if (!('a' in value) || value['a'] === undefined) return false;
+    return true;
 }
 
 export function SampleResourceFromJSON(json: any): SampleResource {
@@ -54,29 +52,26 @@ export function SampleResourceFromJSON(json: any): SampleResource {
 }
 
 export function SampleResourceFromJSONTyped(json: any, ignoreDiscriminator: boolean): SampleResource {
-    if ((json === undefined) || (json === null)) {
+    if (json == null) {
         return json;
     }
     return {
         
         'a': json['a'],
-        'b': !exists(json, 'b') ? undefined : json['b'],
-        'id': !exists(json, 'id') ? undefined : json['id'],
+        'b': json['b'] == null ? undefined : json['b'],
+        'id': json['id'] == null ? undefined : json['id'],
     };
 }
 
 export function SampleResourceToJSON(value?: SampleResource | null): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (value === null) {
-        return null;
+    if (value == null) {
+        return value;
     }
     return {
         
-        'a': value.a,
-        'b': value.b,
-        'id': value.id,
+        'a': value['a'],
+        'b': value['b'],
+        'id': value['id'],
     };
 }
 
diff --git a/applications/samples/frontend/src/rest/runtime.ts b/applications/samples/frontend/src/rest/runtime.ts
index 8544aaca..44b60af4 100644
--- a/applications/samples/frontend/src/rest/runtime.ts
+++ b/applications/samples/frontend/src/rest/runtime.ts
@@ -22,7 +22,7 @@ export interface ConfigurationParameters {
     queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
-    apiKey?: string | ((name: string) => string); // parameter for apiKey security
+    apiKey?: string | Promise<string> | ((name: string) => string | Promise<string>); // parameter for apiKey security
     accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security
     headers?: HTTPHeaders; //header params we want to use on every request
     credentials?: RequestCredentials; //value for the credentials param we want to use on each request
@@ -59,7 +59,7 @@ export class Configuration {
         return this.configuration.password;
     }
 
-    get apiKey(): ((name: string) => string) | undefined {
+    get apiKey(): ((name: string) => string | Promise<string>) | undefined {
         const apiKey = this.configuration.apiKey;
         if (apiKey) {
             return typeof apiKey === 'function' ? apiKey : () => apiKey;
@@ -310,11 +310,6 @@ export interface RequestOpts {
     body?: HTTPBody;
 }
 
-export function exists(json: any, key: string) {
-    const value = json[key];
-    return value !== null && value !== undefined;
-}
-
 export function querystring(params: HTTPQuery, prefix: string = ''): string {
     return Object.keys(params)
         .map(key => querystringSingleKey(key, params[key], prefix))
diff --git a/libraries/client/cloudharness_cli/README.md b/libraries/client/cloudharness_cli/README.md
new file mode 100644
index 00000000..2ad75ad5
--- /dev/null
+++ b/libraries/client/cloudharness_cli/README.md
@@ -0,0 +1,480 @@
+# cloudharness-cli.common
+Cloud Harness Platform - Reference CH service API
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 0.1.0
+- Package version: 1.0.0
+- Generator version: 7.7.0
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
+
+## Requirements.
+
+Python 3.7+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+```sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+
+Then import the package:
+```python
+import cloudharness_cli.common
+```
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install --user
+```
+(or `sudo python setup.py install` to install the package for all users)
+
+Then import the package:
+```python
+import cloudharness_cli.common
+```
+
+### Tests
+
+Execute `pytest` to run the tests.
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```python
+
+import cloudharness_cli.common
+from cloudharness_cli.common.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.common.Configuration(
+    host = "/api"
+)
+
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.common.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.common.AccountsApi(api_client)
+
+    try:
+        # Gets the config for logging in into accounts
+        api_response = api_instance.get_config()
+        print("The response of AccountsApi->get_config:\n")
+        pprint(api_response)
+    except ApiException as e:
+        print("Exception when calling AccountsApi->get_config: %s\n" % e)
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to */api*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AccountsApi* | [**get_config**](docs/common/AccountsApi.md#get_config) | **GET** /accounts/config | Gets the config for logging in into accounts
+*SentryApi* | [**getdsn**](docs/common/SentryApi.md#getdsn) | **GET** /sentry/getdsn/{appname} | Gets the Sentry DSN for a given application
+*ConfigApi* | [**get_version**](docs/common/ConfigApi.md#get_version) | **GET** /version | 
+
+
+## Documentation For Models
+
+ - [AppVersion](docs/common/AppVersion.md)
+ - [GetConfig200Response](docs/common/GetConfig200Response.md)
+
+
+<a id="documentation-for-authorization"></a>
+## Documentation For Authorization
+
+Endpoints do not require authorization.
+
+
+## Author
+
+
+
+
+# cloudharness-cli.volumemanager
+CloudHarness Volumes manager API
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 0.1.0
+- Package version: 1.0.0
+- Generator version: 7.7.0
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
+
+## Requirements.
+
+Python 3.7+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+```sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+
+Then import the package:
+```python
+import cloudharness_cli.volumemanager
+```
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install --user
+```
+(or `sudo python setup.py install` to install the package for all users)
+
+Then import the package:
+```python
+import cloudharness_cli.volumemanager
+```
+
+### Tests
+
+Execute `pytest` to run the tests.
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```python
+
+import cloudharness_cli.volumemanager
+from cloudharness_cli.volumemanager.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.volumemanager.Configuration(
+    host = "/api"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure Bearer authorization (JWT): bearerAuth
+configuration = cloudharness_cli.volumemanager.Configuration(
+    access_token = os.environ["BEARER_TOKEN"]
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.volumemanager.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.volumemanager.RestApi(api_client)
+    name = 'name_example' # str | The name of the Persistent Volume Claim to be retrieved
+
+    try:
+        # Retrieve a Persistent Volume Claim from the Kubernetes repository.
+        api_response = api_instance.pvc_name_get(name)
+        print("The response of RestApi->pvc_name_get:\n")
+        pprint(api_response)
+    except ApiException as e:
+        print("Exception when calling RestApi->pvc_name_get: %s\n" % e)
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to */api*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*RestApi* | [**pvc_name_get**](docs/volumemanager/RestApi.md#pvc_name_get) | **GET** /pvc/{name} | Retrieve a Persistent Volume Claim from the Kubernetes repository.
+*RestApi* | [**pvc_post**](docs/volumemanager/RestApi.md#pvc_post) | **POST** /pvc | Create a Persistent Volume Claim in Kubernetes
+
+
+## Documentation For Models
+
+ - [PersistentVolumeClaim](docs/volumemanager/PersistentVolumeClaim.md)
+ - [PersistentVolumeClaimCreate](docs/volumemanager/PersistentVolumeClaimCreate.md)
+
+
+<a id="documentation-for-authorization"></a>
+## Documentation For Authorization
+
+
+Authentication schemes defined for the API:
+<a id="bearerAuth"></a>
+### bearerAuth
+
+- **Type**: Bearer authentication (JWT)
+
+
+## Author
+
+
+
+
+# cloudharness-cli.workflows
+Workflows API
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 0.1.0
+- Package version: 1.0.0
+- Generator version: 7.7.0
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
+
+## Requirements.
+
+Python 3.7+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+```sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+
+Then import the package:
+```python
+import cloudharness_cli.workflows
+```
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install --user
+```
+(or `sudo python setup.py install` to install the package for all users)
+
+Then import the package:
+```python
+import cloudharness_cli.workflows
+```
+
+### Tests
+
+Execute `pytest` to run the tests.
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```python
+
+import cloudharness_cli.workflows
+from cloudharness_cli.workflows.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.workflows.Configuration(
+    host = "/api"
+)
+
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.workflows.CreateAndAccessApi(api_client)
+    name = 'my-workflow' # str | 
+
+    try:
+        # deletes operation by name
+        api_instance.delete_operation(name)
+    except ApiException as e:
+        print("Exception when calling CreateAndAccessApi->delete_operation: %s\n" % e)
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to */api*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*CreateAndAccessApi* | [**delete_operation**](docs/workflows/CreateAndAccessApi.md#delete_operation) | **DELETE** /operations/{name} | deletes operation by name
+*CreateAndAccessApi* | [**get_operation**](docs/workflows/CreateAndAccessApi.md#get_operation) | **GET** /operations/{name} | get operation by name
+*CreateAndAccessApi* | [**list_operations**](docs/workflows/CreateAndAccessApi.md#list_operations) | **GET** /operations | lists operations
+*CreateAndAccessApi* | [**log_operation**](docs/workflows/CreateAndAccessApi.md#log_operation) | **GET** /operations/{name}/logs | get operation by name
+
+
+## Documentation For Models
+
+ - [Operation](docs/workflows/Operation.md)
+ - [OperationSearchResult](docs/workflows/OperationSearchResult.md)
+ - [OperationStatus](docs/workflows/OperationStatus.md)
+ - [SearchResultData](docs/workflows/SearchResultData.md)
+
+
+<a id="documentation-for-authorization"></a>
+## Documentation For Authorization
+
+Endpoints do not require authorization.
+
+
+## Author
+
+cloudharness@metacell.us
+
+
+# cloudharness-cli.samples
+CloudHarness Sample api
+
+This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 0.1.0
+- Package version: 1.0.0
+- Generator version: 7.7.0
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
+
+## Requirements.
+
+Python 3.7+
+
+## Installation & Usage
+### pip install
+
+If the python package is hosted on a repository, you can install directly using:
+
+```sh
+pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+```
+(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/GIT_USER_ID/GIT_REPO_ID.git`)
+
+Then import the package:
+```python
+import cloudharness_cli.samples
+```
+
+### Setuptools
+
+Install via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install --user
+```
+(or `sudo python setup.py install` to install the package for all users)
+
+Then import the package:
+```python
+import cloudharness_cli.samples
+```
+
+### Tests
+
+Execute `pytest` to run the tests.
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```python
+
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: cookieAuth
+configuration.api_key['cookieAuth'] = os.environ["API_KEY"]
+
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['cookieAuth'] = 'Bearer'
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.AuthApi(api_client)
+
+    try:
+        # Check if the token is valid. Get a token by logging into the base url
+        api_response = api_instance.valid_cookie()
+        print("The response of AuthApi->valid_cookie:\n")
+        pprint(api_response)
+    except ApiException as e:
+        print("Exception when calling AuthApi->valid_cookie: %s\n" % e)
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to */api*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AuthApi* | [**valid_cookie**](docs/samples/AuthApi.md#valid_cookie) | **GET** /valid-cookie | Check if the token is valid. Get a token by logging into the base url
+*AuthApi* | [**valid_token**](docs/samples/AuthApi.md#valid_token) | **GET** /valid | Check if the token is valid. Get a token by logging into the base url
+*ResourceApi* | [**create_sample_resource**](docs/samples/ResourceApi.md#create_sample_resource) | **POST** /sampleresources | Create a SampleResource
+*ResourceApi* | [**delete_sample_resource**](docs/samples/ResourceApi.md#delete_sample_resource) | **DELETE** /sampleresources/{sampleresourceId} | Delete a SampleResource
+*ResourceApi* | [**get_sample_resource**](docs/samples/ResourceApi.md#get_sample_resource) | **GET** /sampleresources/{sampleresourceId} | Get a SampleResource
+*ResourceApi* | [**get_sample_resources**](docs/samples/ResourceApi.md#get_sample_resources) | **GET** /sampleresources | List All SampleResources
+*ResourceApi* | [**update_sample_resource**](docs/samples/ResourceApi.md#update_sample_resource) | **PUT** /sampleresources/{sampleresourceId} | Update a SampleResource
+*TestApi* | [**error**](docs/samples/TestApi.md#error) | **GET** /error | test sentry is working
+*TestApi* | [**ping**](docs/samples/TestApi.md#ping) | **GET** /ping | test the application is up
+*WorkflowsApi* | [**submit_async**](docs/samples/WorkflowsApi.md#submit_async) | **GET** /operation_async | Send an asynchronous operation
+*WorkflowsApi* | [**submit_sync**](docs/samples/WorkflowsApi.md#submit_sync) | **GET** /operation_sync | Send a synchronous operation
+*WorkflowsApi* | [**submit_sync_with_results**](docs/samples/WorkflowsApi.md#submit_sync_with_results) | **GET** /operation_sync_results | Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+
+
+## Documentation For Models
+
+ - [InlineResponse202](docs/samples/InlineResponse202.md)
+ - [InlineResponse202Task](docs/samples/InlineResponse202Task.md)
+ - [SampleResource](docs/samples/SampleResource.md)
+
+
+<a id="documentation-for-authorization"></a>
+## Documentation For Authorization
+
+
+Authentication schemes defined for the API:
+<a id="bearerAuth"></a>
+### bearerAuth
+
+- **Type**: Bearer authentication (JWT)
+
+<a id="cookieAuth"></a>
+### cookieAuth
+
+- **Type**: API key
+- **API key parameter name**: kc-access
+- **Location**: 
+
+
+## Author
+
+cloudharness@metacell.us
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/__init__.py
index 06ad679d..cd51d191 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/__init__.py
@@ -5,24 +5,33 @@
 """
     CH common service API
 
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
+    Cloud Harness Platform - Reference CH service API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 __version__ = "1.0.0"
 
+# import apis into sdk package
+from cloudharness_cli.common.api.accounts_api import AccountsApi
+from cloudharness_cli.common.api.sentry_api import SentryApi
+from cloudharness_cli.common.api.config_api import ConfigApi
+
 # import ApiClient
+from cloudharness_cli.common.api_response import ApiResponse
 from cloudharness_cli.common.api_client import ApiClient
-
-# import Configuration
 from cloudharness_cli.common.configuration import Configuration
-
-# import exceptions
 from cloudharness_cli.common.exceptions import OpenApiException
-from cloudharness_cli.common.exceptions import ApiAttributeError
 from cloudharness_cli.common.exceptions import ApiTypeError
 from cloudharness_cli.common.exceptions import ApiValueError
 from cloudharness_cli.common.exceptions import ApiKeyError
+from cloudharness_cli.common.exceptions import ApiAttributeError
 from cloudharness_cli.common.exceptions import ApiException
+
+# import models into sdk package
+from cloudharness_cli.common.models.app_version import AppVersion
+from cloudharness_cli.common.models.get_config200_response import GetConfig200Response
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/api/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/__init__.py
new file mode 100644
index 00000000..89380390
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/__init__.py
@@ -0,0 +1,7 @@
+# flake8: noqa
+
+# import apis into api package
+from cloudharness_cli.common.api.accounts_api import AccountsApi
+from cloudharness_cli.common.api.sentry_api import SentryApi
+from cloudharness_cli.common.api.config_api import ConfigApi
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/api/accounts_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/accounts_api.py
new file mode 100644
index 00000000..ac12f862
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/accounts_api.py
@@ -0,0 +1,279 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from cloudharness_cli.common.models.get_config200_response import GetConfig200Response
+
+from cloudharness_cli.common.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.common.api_response import ApiResponse
+from cloudharness_cli.common.rest import RESTResponseType
+
+
+class AccountsApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def get_config(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> GetConfig200Response:
+        """Gets the config for logging in into accounts
+
+        Gets the config for logging in into accounts
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_config_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "GetConfig200Response",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def get_config_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[GetConfig200Response]:
+        """Gets the config for logging in into accounts
+
+        Gets the config for logging in into accounts
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_config_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "GetConfig200Response",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def get_config_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Gets the config for logging in into accounts
+
+        Gets the config for logging in into accounts
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_config_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "GetConfig200Response",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _get_config_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/accounts/config',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/api/config_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/config_api.py
new file mode 100644
index 00000000..a5926968
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/config_api.py
@@ -0,0 +1,276 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from cloudharness_cli.common.models.app_version import AppVersion
+
+from cloudharness_cli.common.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.common.api_response import ApiResponse
+from cloudharness_cli.common.rest import RESTResponseType
+
+
+class ConfigApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def get_version(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> AppVersion:
+        """get_version
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_version_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "AppVersion",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def get_version_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[AppVersion]:
+        """get_version
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_version_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "AppVersion",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def get_version_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """get_version
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_version_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "AppVersion",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _get_version_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/version',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/api/sentry_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/sentry_api.py
new file mode 100644
index 00000000..bad110e6
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/api/sentry_api.py
@@ -0,0 +1,303 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import StrictStr
+from typing import Any, Dict
+
+from cloudharness_cli.common.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.common.api_response import ApiResponse
+from cloudharness_cli.common.rest import RESTResponseType
+
+
+class SentryApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def getdsn(
+        self,
+        appname: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> object:
+        """Gets the Sentry DSN for a given application
+
+        Gets the Sentry DSN for a given application
+
+        :param appname: (required)
+        :type appname: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._getdsn_serialize(
+            appname=appname,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "object",
+            '400': "object",
+            '404': "object",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def getdsn_with_http_info(
+        self,
+        appname: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[object]:
+        """Gets the Sentry DSN for a given application
+
+        Gets the Sentry DSN for a given application
+
+        :param appname: (required)
+        :type appname: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._getdsn_serialize(
+            appname=appname,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "object",
+            '400': "object",
+            '404': "object",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def getdsn_without_preload_content(
+        self,
+        appname: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Gets the Sentry DSN for a given application
+
+        Gets the Sentry DSN for a given application
+
+        :param appname: (required)
+        :type appname: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._getdsn_serialize(
+            appname=appname,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "object",
+            '400': "object",
+            '404': "object",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _getdsn_serialize(
+        self,
+        appname,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if appname is not None:
+            _path_params['appname'] = appname
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json', 
+                    'text/html', 
+                    'application/problem+json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/sentry/getdsn/{appname}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/api_client.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/api_client.py
index dc2f32ff..d0a683dc 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/api_client.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/api_client.py
@@ -1,1499 +1,781 @@
 # coding: utf-8
+
 """
     CH common service API
 
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
+    Cloud Harness Platform - Reference CH service API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
-from dataclasses import dataclass
-from decimal import Decimal
-import enum
-import email
+import datetime
+from dateutil.parser import parse
+from enum import Enum
 import json
+import mimetypes
 import os
-import io
-import atexit
-from multiprocessing.pool import ThreadPool
 import re
 import tempfile
-import typing
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-from urllib.parse import urlparse, quote
-from urllib3.fields import RequestField as RequestFieldBase
 
-import frozendict
+from urllib.parse import quote
+from typing import Tuple, Optional, List, Dict, Union
+from pydantic import SecretStr
 
-from cloudharness_cli.common import rest
 from cloudharness_cli.common.configuration import Configuration
-from cloudharness_cli.common.exceptions import ApiTypeError, ApiValueError
-from cloudharness_cli.common.schemas import (
-    NoneClass,
-    BoolClass,
-    Schema,
-    FileIO,
-    BinarySchema,
-    date,
-    datetime,
-    none_type,
-    Unset,
-    unset,
+from cloudharness_cli.common.api_response import ApiResponse, T as ApiResponseT
+import cloudharness_cli.common.models
+from cloudharness_cli.common import rest
+from cloudharness_cli.common.exceptions import (
+    ApiValueError,
+    ApiException,
+    BadRequestException,
+    UnauthorizedException,
+    ForbiddenException,
+    NotFoundException,
+    ServiceException
 )
 
+RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]
 
-class RequestField(RequestFieldBase):
-    def __eq__(self, other):
-        if not isinstance(other, RequestField):
-            return False
-        return self.__dict__ == other.__dict__
-
-
-class JSONEncoder(json.JSONEncoder):
-    compact_separators = (',', ':')
-
-    def default(self, obj):
-        if isinstance(obj, str):
-            return str(obj)
-        elif isinstance(obj, float):
-            return float(obj)
-        elif isinstance(obj, int):
-            return int(obj)
-        elif isinstance(obj, Decimal):
-            if obj.as_tuple().exponent >= 0:
-                return int(obj)
-            return float(obj)
-        elif isinstance(obj, NoneClass):
-            return None
-        elif isinstance(obj, BoolClass):
-            return bool(obj)
-        elif isinstance(obj, (dict, frozendict.frozendict)):
-            return {key: self.default(val) for key, val in obj.items()}
-        elif isinstance(obj, (list, tuple)):
-            return [self.default(item) for item in obj]
-        raise ApiValueError('Unable to prepare type {} for serialization'.format(obj.__class__.__name__))
-
-
-class ParameterInType(enum.Enum):
-    QUERY = 'query'
-    HEADER = 'header'
-    PATH = 'path'
-    COOKIE = 'cookie'
-
-
-class ParameterStyle(enum.Enum):
-    MATRIX = 'matrix'
-    LABEL = 'label'
-    FORM = 'form'
-    SIMPLE = 'simple'
-    SPACE_DELIMITED = 'spaceDelimited'
-    PIPE_DELIMITED = 'pipeDelimited'
-    DEEP_OBJECT = 'deepObject'
-
-
-class PrefixSeparatorIterator:
-    # A class to store prefixes and separators for rfc6570 expansions
-
-    def __init__(self, prefix: str, separator: str):
-        self.prefix = prefix
-        self.separator = separator
-        self.first = True
-        if separator in {'.', '|', '%20'}:
-            item_separator = separator
-        else:
-            item_separator = ','
-        self.item_separator = item_separator
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.first:
-            self.first = False
-            return self.prefix
-        return self.separator
-
-
-class ParameterSerializerBase:
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        return False
-
-    @staticmethod
-    def __ref6570_item_value(in_data: typing.Any, percent_encode: bool):
-        """
-        Get representation if str/float/int/None/items in list/ values in dict
-        None is returned if an item is undefined, use cases are value=
-        - None
-        - []
-        - {}
-        - [None, None None]
-        - {'a': None, 'b': None}
-        """
-        if type(in_data) in {str, float, int}:
-            if percent_encode:
-                return quote(str(in_data))
-            return str(in_data)
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, list) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, dict) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        raise ApiValueError('Unable to generate a ref6570 item representation of {}'.format(in_data))
-
-    @staticmethod
-    def _to_dict(name: str, value: str):
-        return {name: value}
-
-    @classmethod
-    def __ref6570_str_float_int_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_value = cls.__ref6570_item_value(in_data, percent_encode)
-        if item_value is None or (item_value == '' and prefix_separator_iterator.separator == ';'):
-            return next(prefix_separator_iterator) + var_name_piece
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        return next(prefix_separator_iterator) + var_name_piece + value_pair_equals + item_value
+class ApiClient:
+    """Generic API client for OpenAPI client library builds.
 
-    @classmethod
-    def __ref6570_list_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_values = [cls.__ref6570_item_value(v, percent_encode) for v in in_data]
-        item_values = [v for v in item_values if v is not None]
-        if not item_values:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece +
-                value_pair_equals +
-                prefix_separator_iterator.item_separator.join(item_values)
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [var_name_piece + value_pair_equals + val for val in item_values]
-        )
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
 
-    @classmethod
-    def __ref6570_dict_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        in_data_transformed = {key: cls.__ref6570_item_value(val, percent_encode) for key, val in in_data.items()}
-        in_data_transformed = {key: val for key, val in in_data_transformed.items() if val is not None}
-        if not in_data_transformed:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece + value_pair_equals +
-                prefix_separator_iterator.item_separator.join(
-                    prefix_separator_iterator.item_separator.join(
-                        item_pair
-                    ) for item_pair in in_data_transformed.items()
-                )
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [key + '=' + val for key, val in in_data_transformed.items()]
-        )
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    """
 
-    @classmethod
-    def _ref6570_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator
-    ) -> str:
-        """
-        Separator is for separate variables like dict with explode true, not for array item separation
-        """
-        named_parameter_expansion = prefix_separator_iterator.separator in {'&', ';'}
-        var_name_piece = variable_name if named_parameter_expansion else ''
-        if type(in_data) in {str, float, int}:
-            return cls.__ref6570_str_float_int_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        elif isinstance(in_data, list):
-            return cls.__ref6570_list_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, dict):
-            return cls.__ref6570_dict_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        # bool, bytes, etc
-        raise ApiValueError('Unable to generate a ref6570 representation of {}'.format(in_data))
+    PRIMITIVE_TYPES = (float, bool, bytes, str, int)
+    NATIVE_TYPES_MAPPING = {
+        'int': int,
+        'long': int, # TODO remove as only py3 is supported?
+        'float': float,
+        'str': str,
+        'bool': bool,
+        'date': datetime.date,
+        'datetime': datetime.datetime,
+        'object': object,
+    }
+    _pool = None
 
+    def __init__(
+        self,
+        configuration=None,
+        header_name=None,
+        header_value=None,
+        cookie=None
+    ) -> None:
+        # use default configuration if none is provided
+        if configuration is None:
+            configuration = Configuration.get_default()
+        self.configuration = configuration
 
-class StyleFormSerializer(ParameterSerializerBase):
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        if style is ParameterStyle.FORM:
-            return True
-        return super()._get_default_explode(style)
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+        self.client_side_validation = configuration.client_side_validation
 
-    def _serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> str:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    def __enter__(self):
+        return self
 
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass
 
-class StyleSimpleSerializer(ParameterSerializerBase):
+    @property
+    def user_agent(self):
+        """User agent for this API client"""
+        return self.default_headers['User-Agent']
 
-    def _serialize_simple(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool
-    ) -> str:
-        prefix_separator_iterator = PrefixSeparatorIterator('', ',')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
 
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
 
-class JSONDetector:
-    """
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    """
-    __json_content_type_pattern = re.compile("application/[^+]*[+]?(json);?.*")
 
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
-@dataclass
-class ParameterBase(JSONDetector):
-    name: str
-    in_type: ParameterInType
-    required: bool
-    style: typing.Optional[ParameterStyle]
-    explode: typing.Optional[bool]
-    allow_reserved: typing.Optional[bool]
-    schema: typing.Optional[typing.Type[Schema]]
-    content: typing.Optional[typing.Dict[str, typing.Type[Schema]]]
-
-    __style_to_in_type = {
-        ParameterStyle.MATRIX: {ParameterInType.PATH},
-        ParameterStyle.LABEL: {ParameterInType.PATH},
-        ParameterStyle.FORM: {ParameterInType.QUERY, ParameterInType.COOKIE},
-        ParameterStyle.SIMPLE: {ParameterInType.PATH, ParameterInType.HEADER},
-        ParameterStyle.SPACE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.PIPE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.DEEP_OBJECT: {ParameterInType.QUERY},
-    }
-    __in_type_to_default_style = {
-        ParameterInType.QUERY: ParameterStyle.FORM,
-        ParameterInType.PATH: ParameterStyle.SIMPLE,
-        ParameterInType.HEADER: ParameterStyle.SIMPLE,
-        ParameterInType.COOKIE: ParameterStyle.FORM,
-    }
-    __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
-    _json_encoder = JSONEncoder()
+    _default = None
 
     @classmethod
-    def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
-        if style is None:
-            return
-        in_type_set = cls.__style_to_in_type[style]
-        if in_type not in in_type_set:
-            raise ValueError(
-                'Invalid style and in_type combination. For style={} only in_type={} are allowed'.format(
-                    style, in_type_set
-                )
-            )
-
-    def __init__(
-        self,
-        name: str,
-        in_type: ParameterInType,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        if schema is None and content is None:
-            raise ValueError('Value missing; Pass in either schema or content')
-        if schema and content:
-            raise ValueError('Too many values provided. Both schema and content were provided. Only one may be input')
-        if name in self.__disallowed_header_names and in_type is ParameterInType.HEADER:
-            raise ValueError('Invalid name, name may not be one of {}'.format(self.__disallowed_header_names))
-        self.__verify_style_to_in_type(style, in_type)
-        if content is None and style is None:
-            style = self.__in_type_to_default_style[in_type]
-        if content is not None and in_type in self.__in_type_to_default_style and len(content) != 1:
-            raise ValueError('Invalid content length, content length must equal 1')
-        self.in_type = in_type
-        self.name = name
-        self.required = required
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-        self.schema = schema
-        self.content = content
-
-    def _serialize_json(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        eliminate_whitespace: bool = False
-    ) -> str:
-        if eliminate_whitespace:
-            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
-        return json.dumps(in_data)
+    def get_default(cls):
+        """Return new instance of ApiClient.
 
+        This method returns newly created, based on default constructor,
+        object of ApiClient class or returns a copy of default
+        ApiClient.
 
-class PathParameter(ParameterBase, StyleSimpleSerializer):
+        :return: The ApiClient object.
+        """
+        if cls._default is None:
+            cls._default = ApiClient()
+        return cls._default
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.PATH,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of ApiClient.
 
-    def __serialize_label(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator('.', '.')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        It stores default ApiClient.
 
-    def __serialize_matrix(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator(';', ';')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        :param default: object of ApiClient.
+        """
+        cls._default = default
 
-    def __serialize_simple(
+    def param_serialize(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-    ) -> typing.Dict[str, str]:
-        value = self._serialize_simple(
-            in_data=in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True
-        )
-        return self._to_dict(self.name, value)
+        method,
+        resource_path,
+        path_params=None,
+        query_params=None,
+        header_params=None,
+        body=None,
+        post_params=None,
+        files=None, auth_settings=None,
+        collection_formats=None,
+        _host=None,
+        _request_auth=None
+    ) -> RequestSerialized:
+
+        """Builds the HTTP request params needed by the request.
+        :param method: Method to call.
+        :param resource_path: Path to method endpoint.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param files dict: key -> filename, value -> filepath,
+            for `multipart/form-data`.
+        :param collection_formats: dict of collection formats for path, query,
+            header, and post parameters.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :return: tuple of form (path, http_method, query_params, header_params,
+            body, post_params, files)
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> path
-                path:
-                    returns path_params: dict
-            label -> path
-                returns path_params
-            matrix -> path
-                returns path_params
-            """
-            if self.style:
-                if self.style is ParameterStyle.SIMPLE:
-                    return self.__serialize_simple(cast_in_data)
-                elif self.style is ParameterStyle.LABEL:
-                    return self.__serialize_label(cast_in_data)
-                elif self.style is ParameterStyle.MATRIX:
-                    return self.__serialize_matrix(cast_in_data)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class QueryParameter(ParameterBase, StyleFormSerializer):
+        config = self.configuration
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.QUERY,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+        # header parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+            header_params = dict(
+                self.parameters_to_tuples(header_params,collection_formats)
+            )
 
-    def __serialize_space_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            path_params = self.parameters_to_tuples(
+                path_params,
+                collection_formats
+            )
+            for k, v in path_params:
+                # specified safe chars, encode everything
+                resource_path = resource_path.replace(
+                    '{%s}' % k,
+                    quote(str(v), safe=config.safe_chars_for_path_param)
+                )
 
-    def __serialize_pipe_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # post parameters
+        if post_params or files:
+            post_params = post_params if post_params else []
+            post_params = self.sanitize_for_serialization(post_params)
+            post_params = self.parameters_to_tuples(
+                post_params,
+                collection_formats
+            )
+            if files:
+                post_params.extend(self.files_parameters(files))
 
-    def __serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._serialize_form(
-            in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
+        # auth setting
+        self.update_params_for_auth(
+            header_params,
+            query_params,
+            auth_settings,
+            resource_path,
+            method,
+            body,
+            request_auth=_request_auth
         )
-        return self._to_dict(self.name, value)
 
-    def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if self.style is ParameterStyle.FORM:
-            return PrefixSeparatorIterator('?', '&')
-        elif self.style is ParameterStyle.SPACE_DELIMITED:
-            return PrefixSeparatorIterator('', '%20')
-        elif self.style is ParameterStyle.PIPE_DELIMITED:
-            return PrefixSeparatorIterator('', '|')
-
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> query
-                query:
-                    - GET/HEAD/DELETE: could use fields
-                    - PUT/POST: must use urlencode to send parameters
-                    returns fields: tuple
-            spaceDelimited -> query
-                returns fields
-            pipeDelimited -> query
-                returns fields
-            deepObject -> query, https://github.com/OAI/OpenAPI-Specification/issues/1706
-                returns fields
-            """
-            if self.style:
-                # TODO update query ones to omit setting values when [] {} or None is input
-                if self.style is ParameterStyle.FORM:
-                    return self.__serialize_form(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.SPACE_DELIMITED:
-                    return self.__serialize_space_delimited(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.PIPE_DELIMITED:
-                    return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
-        # self.content will be length one
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
-                return self._to_dict(
-                    self.name,
-                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
-                )
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
 
+        # request url
+        if _host is None or self.configuration.ignore_operation_servers:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = _host + resource_path
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            url_query = self.parameters_to_url_query(
+                query_params,
+                collection_formats
+            )
+            url += "?" + url_query
 
-class CookieParameter(ParameterBase, StyleFormSerializer):
+        return method, url, header_params, body, post_params
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.COOKIE,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> cookie
-                returns fields: tuple
-            """
-            if self.style:
-                """
-                TODO add escaping of comma, space, equals
-                or turn encoding on
-                """
-                value = self._serialize_form(
-                    cast_in_data,
-                    explode=self.explode,
-                    name=self.name,
-                    percent_encode=False,
-                    prefix_separator_iterator=PrefixSeparatorIterator('', '&')
-                )
-                return self._to_dict(self.name, value)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class HeaderParameter(ParameterBase, StyleSimpleSerializer):
-    def __init__(
+    def call_api(
         self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.HEADER,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
-
-    @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
-        data = tuple(t for t in in_data if t)
-        headers = HTTPHeaderDict()
-        if not data:
-            return headers
-        headers.extend(data)
-        return headers
+        method,
+        url,
+        header_params=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ) -> rest.RESTResponse:
+        """Makes the HTTP request (synchronous)
+        :param method: Method to call.
+        :param url: Path to method endpoint.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param _request_timeout: timeout setting for this request.
+        :return: RESTResponse
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> header
-                headers: PoolManager needs a mapping, tuple is close
-                    returns headers: dict
-            """
-            if self.style:
-                value = self._serialize_simple(cast_in_data, self.name, self.explode, False)
-                return self.__to_headers(((self.name, value),))
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self.__to_headers(((self.name, value),))
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class Encoding:
-    def __init__(
-        self,
-        content_type: str,
-        headers: typing.Optional[typing.Dict[str, HeaderParameter]] = None,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: bool = False,
-    ):
-        self.content_type = content_type
-        self.headers = headers
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-
-
-@dataclass
-class MediaType:
-    """
-    Used to store request and response body schema information
-    encoding:
-        A map between a property name and its encoding information.
-        The key, being the property name, MUST exist in the schema as a property.
-        The encoding object SHALL only apply to requestBody objects when the media type is
-        multipart or application/x-www-form-urlencoded.
-    """
-    schema: typing.Optional[typing.Type[Schema]] = None
-    encoding: typing.Optional[typing.Dict[str, Encoding]] = None
+        try:
+            # perform request and return response
+            response_data = self.rest_client.request(
+                method, url,
+                headers=header_params,
+                body=body, post_params=post_params,
+                _request_timeout=_request_timeout
+            )
 
+        except ApiException as e:
+            raise e
 
-@dataclass
-class ApiResponse:
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        return response_data
 
-    def __init__(
+    def response_deserialize(
         self,
-        response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
-    ):
-        """
-        pycharm needs this to prevent 'Unexpected argument' warnings
+        response_data: rest.RESTResponse,
+        response_types_map: Optional[Dict[str, ApiResponseT]]=None
+    ) -> ApiResponse[ApiResponseT]:
+        """Deserializes response into an object.
+        :param response_data: RESTResponse object to be deserialized.
+        :param response_types_map: dict of response types.
+        :return: ApiResponse
         """
-        self.response = response
-        self.body = body
-        self.headers = headers
 
+        msg = "RESTResponse.read() must be called before passing it to response_deserialize()"
+        assert response_data.data is not None, msg
 
-@dataclass
-class ApiResponseWithoutDeserialization(ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]] = unset
-    headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
+        response_type = response_types_map.get(str(response_data.status), None)
+        if not response_type and isinstance(response_data.status, int) and 100 <= response_data.status <= 599:
+            # if not found, look for '1XX', '2XX', etc.
+            response_type = response_types_map.get(str(response_data.status)[0] + "XX", None)
 
+        # deserialize response data
+        response_text = None
+        return_data = None
+        try:
+            if response_type == "bytearray":
+                return_data = response_data.data
+            elif response_type == "file":
+                return_data = self.__deserialize_file(response_data)
+            elif response_type is not None:
+                match = None
+                content_type = response_data.getheader('content-type')
+                if content_type is not None:
+                    match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
+                encoding = match.group(1) if match else "utf-8"
+                response_text = response_data.data.decode(encoding)
+                return_data = self.deserialize(response_text, response_type, content_type)
+        finally:
+            if not 200 <= response_data.status <= 299:
+                raise ApiException.from_response(
+                    http_resp=response_data,
+                    body=response_text,
+                    data=return_data,
+                )
 
-class OpenApiResponse(JSONDetector):
-    __filename_content_disposition_pattern = re.compile('filename="(.+?)"')
+        return ApiResponse(
+            status_code = response_data.status,
+            data = return_data,
+            headers = response_data.getheaders(),
+            raw_data = response_data.data
+        )
 
-    def __init__(
-        self,
-        response_cls: typing.Type[ApiResponse] = ApiResponse,
-        content: typing.Optional[typing.Dict[str, MediaType]] = None,
-        headers: typing.Optional[typing.List[HeaderParameter]] = None,
-    ):
-        self.headers = headers
-        if content is not None and len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-        self.response_cls = response_cls
-
-    @staticmethod
-    def __deserialize_json(response: urllib3.HTTPResponse) -> typing.Any:
-        # python must be >= 3.9 so we can pass in bytes into json.loads
-        return json.loads(response.data)
-
-    @staticmethod
-    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
-        if response_url is None:
-            return None
-        url_path = urlparse(response_url).path
-        if url_path:
-            path_basename = os.path.basename(url_path)
-            if path_basename:
-                _filename, ext = os.path.splitext(path_basename)
-                if ext:
-                    return path_basename
-        return None
+    def sanitize_for_serialization(self, obj):
+        """Builds a JSON POST object.
 
-    @classmethod
-    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
-        if content_disposition is None:
-            return None
-        match = cls.__filename_content_disposition_pattern.search(content_disposition)
-        if not match:
-            return None
-        return match.group(1)
+        If obj is None, return None.
+        If obj is SecretStr, return obj.get_secret_value()
+        If obj is str, int, long, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, sanitize each element in the list.
+        If obj is dict, return the dict.
+        If obj is OpenAPI model, return the properties dict.
 
-    def __deserialize_application_octet_stream(
-        self, response: urllib3.HTTPResponse
-    ) -> typing.Union[bytes, io.BufferedReader]:
-        """
-        urllib3 use cases:
-        1. when preload_content=True (stream=False) then supports_chunked_reads is False and bytes are returned
-        2. when preload_content=False (stream=True) then supports_chunked_reads is True and
-            a file will be written and returned
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
         """
-        if response.supports_chunked_reads():
-            file_name = (
-                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
-                or self.__file_name_from_response_url(response.geturl())
+        if obj is None:
+            return None
+        elif isinstance(obj, Enum):
+            return obj.value
+        elif isinstance(obj, SecretStr):
+            return obj.get_secret_value()
+        elif isinstance(obj, self.PRIMITIVE_TYPES):
+            return obj
+        elif isinstance(obj, list):
+            return [
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
+            ]
+        elif isinstance(obj, tuple):
+            return tuple(
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
             )
+        elif isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
 
-            if file_name is None:
-                _fd, path = tempfile.mkstemp()
-            else:
-                path = os.path.join(tempfile.gettempdir(), file_name)
-
-            with open(path, 'wb') as new_file:
-                chunk_size = 1024
-                while True:
-                    data = response.read(chunk_size)
-                    if not data:
-                        break
-                    new_file.write(data)
-            # release_conn is needed for streaming connections only
-            response.release_conn()
-            new_file = open(path, 'rb')
-            return new_file
+        elif isinstance(obj, dict):
+            obj_dict = obj
         else:
-            return response.data
+            # Convert model obj to dict except
+            # attributes `openapi_types`, `attribute_map`
+            # and attributes which value is not None.
+            # Convert attribute name to json key in
+            # model definition for request.
+            if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj.__dict__
 
-    @staticmethod
-    def __deserialize_multipart_form_data(
-        response: urllib3.HTTPResponse
-    ) -> typing.Dict[str, typing.Any]:
-        msg = email.message_from_bytes(response.data)
         return {
-            part.get_param("name", header="Content-Disposition"): part.get_payload(
-                decode=True
-            ).decode(part.get_content_charset())
-            if part.get_content_charset()
-            else part.get_payload()
-            for part in msg.get_payload()
+            key: self.sanitize_for_serialization(val)
+            for key, val in obj_dict.items()
         }
 
-    def deserialize(self, response: urllib3.HTTPResponse, configuration: Configuration) -> ApiResponse:
-        content_type = response.getheader('content-type')
-        deserialized_body = unset
-        streamed = response.supports_chunked_reads()
-
-        deserialized_headers = unset
-        if self.headers is not None:
-            # TODO add header deserialiation here
-            pass
-
-        if self.content is not None:
-            if content_type not in self.content:
-                raise ApiValueError(
-                    f"Invalid content_type returned. Content_type='{content_type}' was returned "
-                    f"when only {str(set(self.content))} are defined for status_code={str(response.status)}"
-                )
-            body_schema = self.content[content_type].schema
-            if body_schema is None:
-                # some specs do not define response content media type schemas
-                return self.response_cls(
-                    response=response,
-                    headers=deserialized_headers,
-                    body=unset
-                )
+    def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
+        """Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: class literal for
+            deserialized object, or string of class name.
+        :param content_type: content type of response.
+
+        :return: deserialized object.
+        """
 
-            if self._content_type_is_json(content_type):
-                body_data = self.__deserialize_json(response)
-            elif content_type == 'application/octet-stream':
-                body_data = self.__deserialize_application_octet_stream(response)
-            elif content_type.startswith('multipart/form-data'):
-                body_data = self.__deserialize_multipart_form_data(response)
-                content_type = 'multipart/form-data'
+        # fetch data from response object
+        if content_type is None:
+            try:
+                data = json.loads(response_text)
+            except ValueError:
+                data = response_text
+        elif content_type.startswith("application/json"):
+            if response_text == "":
+                data = ""
             else:
-                raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
-        elif streamed:
-            response.release_conn()
-
-        return self.response_cls(
-            response=response,
-            headers=deserialized_headers,
-            body=deserialized_body
-        )
+                data = json.loads(response_text)
+        elif content_type.startswith("text/plain"):
+            data = response_text
+        else:
+            raise ApiException(
+                status=0,
+                reason="Unsupported content type: {0}".format(content_type)
+            )
 
+        return self.__deserialize(data, response_type)
 
-class ApiClient:
-    """Generic API client for OpenAPI client library builds.
+    def __deserialize(self, data, klass):
+        """Deserializes dict, list, str into an object.
 
-    OpenAPI generic API client. This client handles the client-
-    server communication, and is invariant across implementations. Specifics of
-    the methods and models for each application are generated from the OpenAPI
-    templates.
+        :param data: dict, list or str.
+        :param klass: class literal, or string of class name.
 
-    NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
+        :return: object.
+        """
+        if data is None:
+            return None
 
-    :param configuration: .Configuration object for this client
-    :param header_name: a header to pass when making calls to the API.
-    :param header_value: a header value to pass when making calls to
-        the API.
-    :param cookie: a cookie to include in the header when making calls
-        to the API
-    :param pool_threads: The number of threads to use for async requests
-        to the API. More threads means more concurrent API requests.
-    """
+        if isinstance(klass, str):
+            if klass.startswith('List['):
+                m = re.match(r'List\[(.*)]', klass)
+                assert m is not None, "Malformed List type definition"
+                sub_kls = m.group(1)
+                return [self.__deserialize(sub_data, sub_kls)
+                        for sub_data in data]
+
+            if klass.startswith('Dict['):
+                m = re.match(r'Dict\[([^,]*), (.*)]', klass)
+                assert m is not None, "Malformed Dict type definition"
+                sub_kls = m.group(2)
+                return {k: self.__deserialize(v, sub_kls)
+                        for k, v in data.items()}
+
+            # convert str to class
+            if klass in self.NATIVE_TYPES_MAPPING:
+                klass = self.NATIVE_TYPES_MAPPING[klass]
+            else:
+                klass = getattr(cloudharness_cli.common.models, klass)
+
+        if klass in self.PRIMITIVE_TYPES:
+            return self.__deserialize_primitive(data, klass)
+        elif klass == object:
+            return self.__deserialize_object(data)
+        elif klass == datetime.date:
+            return self.__deserialize_date(data)
+        elif klass == datetime.datetime:
+            return self.__deserialize_datetime(data)
+        elif issubclass(klass, Enum):
+            return self.__deserialize_enum(data, klass)
+        else:
+            return self.__deserialize_model(data, klass)
 
-    _pool = None
+    def parameters_to_tuples(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __init__(
-        self,
-        configuration: typing.Optional[Configuration] = None,
-        header_name: typing.Optional[str] = None,
-        header_value: typing.Optional[str] = None,
-        cookie: typing.Optional[str] = None,
-        pool_threads: int = 1
-    ):
-        if configuration is None:
-            configuration = Configuration()
-        self.configuration = configuration
-        self.pool_threads = pool_threads
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: Parameters as list of tuples, collections formatted
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, value) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(str(value) for value in v)))
+            else:
+                new_params.append((k, v))
+        return new_params
 
-        self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = HTTPHeaderDict()
-        if header_name is not None:
-            self.default_headers[header_name] = header_value
-        self.cookie = cookie
-        # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+    def parameters_to_url_query(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __enter__(self):
-        return self
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: URL query string (e.g. a=Hello%20World&b=123)
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if isinstance(v, bool):
+                v = str(v).lower()
+            if isinstance(v, (int, float)):
+                v = str(v)
+            if isinstance(v, dict):
+                v = json.dumps(v)
+
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, str(value)) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(quote(str(value)) for value in v))
+                    )
+            else:
+                new_params.append((k, quote(str(v))))
 
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
+        return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def close(self):
-        if self._pool:
-            self._pool.close()
-            self._pool.join()
-            self._pool = None
-            if hasattr(atexit, 'unregister'):
-                atexit.unregister(self.close)
+    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
+        """Builds form parameters.
 
-    @property
-    def pool(self):
-        """Create thread pool on first request
-         avoids instantiating unused threadpool for blocking clients.
+        :param files: File parameters.
+        :return: Form parameters with files.
         """
-        if self._pool is None:
-            atexit.register(self.close)
-            self._pool = ThreadPool(self.pool_threads)
-        return self._pool
-
-    @property
-    def user_agent(self):
-        """User agent for this API client"""
-        return self.default_headers['User-Agent']
+        params = []
+        for k, v in files.items():
+            if isinstance(v, str):
+                with open(v, 'rb') as f:
+                    filename = os.path.basename(f.name)
+                    filedata = f.read()
+            elif isinstance(v, bytes):
+                filename = k
+                filedata = v
+            else:
+                raise ValueError("Unsupported file value")
+            mimetype = (
+                mimetypes.guess_type(filename)[0]
+                or 'application/octet-stream'
+            )
+            params.append(
+                tuple([k, tuple([filename, filedata, mimetype])])
+            )
+        return params
 
-    @user_agent.setter
-    def user_agent(self, value):
-        self.default_headers['User-Agent'] = value
+    def select_header_accept(self, accepts: List[str]) -> Optional[str]:
+        """Returns `Accept` based on an array of accepts provided.
 
-    def set_default_header(self, header_name, header_value):
-        self.default_headers[header_name] = header_value
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return None
 
-    def __call_api(
-        self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
+        for accept in accepts:
+            if re.search('json', accept, re.IGNORECASE):
+                return accept
 
-        # header parameters
-        used_headers = HTTPHeaderDict(self.default_headers)
-        if self.cookie:
-            headers['Cookie'] = self.cookie
+        return accepts[0]
 
-        # auth setting
-        self.update_params_for_auth(used_headers,
-                                    auth_settings, resource_path, method, body)
+    def select_header_content_type(self, content_types):
+        """Returns `Content-Type` based on an array of content_types provided.
 
-        # must happen after cookie setting and auth setting in case user is overriding those
-        if headers:
-            used_headers.update(headers)
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return None
 
-        # request url
-        if host is None:
-            url = self.configuration.host + resource_path
-        else:
-            # use server/host defined in path or operation instead
-            url = host + resource_path
+        for content_type in content_types:
+            if re.search('json', content_type, re.IGNORECASE):
+                return content_type
 
-        # perform request and return response
-        response = self.request(
-            method,
-            url,
-            headers=used_headers,
-            fields=fields,
-            body=body,
-            stream=stream,
-            timeout=timeout,
-        )
-        return response
+        return content_types[0]
 
-    def call_api(
+    def update_params_for_auth(
         self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        async_req: typing.Optional[bool] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request (synchronous) and returns deserialized data.
-
-        To make an async_req request, set the async_req parameter.
+        headers,
+        queries,
+        auth_settings,
+        resource_path,
+        method,
+        body,
+        request_auth=None
+    ) -> None:
+        """Updates header and query params based on authentication setting.
 
-        :param resource_path: Path to method endpoint.
-        :param method: Method to call.
-        :param headers: Header parameters to be
-            placed in the request header.
-        :param body: Request body.
-        :param fields: Request post form parameters,
-            for `application/x-www-form-urlencoded`, `multipart/form-data`.
-        :param auth_settings: Auth Settings names for the request.
-        :param async_req: execute request asynchronously
-        :type async_req: bool, optional TODO remove, unused
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                 be returned without reading/decoding response
-                                 data. Also when True, if the openapi spec describes a file download,
-                                 the data will be written to a local filesystme file and the BinarySchema
-                                 instance will also inherit from FileSchema and FileIO
-                                 Default is False.
-        :type stream: bool, optional
-        :param timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param host: api endpoint host
-        :return:
-            If async_req parameter is True,
-            the request will be called asynchronously.
-            The method will return the request thread.
-            If parameter async_req is False or missing,
-            then the method will return the response directly.
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
+        if not auth_settings:
+            return
 
-        if not async_req:
-            return self.__call_api(
-                resource_path,
-                method,
+        if request_auth:
+            self._apply_auth_params(
                 headers,
-                body,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
-            )
-
-        return self.pool.apply_async(
-            self.__call_api,
-            (
+                queries,
                 resource_path,
                 method,
-                headers,
                 body,
-                json,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
+                request_auth
             )
-        )
-
-    def request(
+        else:
+            for auth in auth_settings:
+                auth_setting = self.configuration.auth_settings().get(auth)
+                if auth_setting:
+                    self._apply_auth_params(
+                        headers,
+                        queries,
+                        resource_path,
+                        method,
+                        body,
+                        auth_setting
+                    )
+
+    def _apply_auth_params(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request using RESTClient."""
-        if method == "GET":
-            return self.rest_client.GET(url,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        headers=headers)
-        elif method == "HEAD":
-            return self.rest_client.HEAD(url,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         headers=headers)
-        elif method == "OPTIONS":
-            return self.rest_client.OPTIONS(url,
-                                            headers=headers,
-                                            fields=fields,
-                                            stream=stream,
-                                            timeout=timeout,
-                                            body=body)
-        elif method == "POST":
-            return self.rest_client.POST(url,
-                                         headers=headers,
-                                         fields=fields,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         body=body)
-        elif method == "PUT":
-            return self.rest_client.PUT(url,
-                                        headers=headers,
-                                        fields=fields,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        body=body)
-        elif method == "PATCH":
-            return self.rest_client.PATCH(url,
-                                          headers=headers,
-                                          fields=fields,
-                                          stream=stream,
-                                          timeout=timeout,
-                                          body=body)
-        elif method == "DELETE":
-            return self.rest_client.DELETE(url,
-                                           headers=headers,
-                                           stream=stream,
-                                           timeout=timeout,
-                                           body=body)
+        headers,
+        queries,
+        resource_path,
+        method,
+        body,
+        auth_setting
+    ) -> None:
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            if auth_setting['type'] != 'http-signature':
+                headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            queries.append((auth_setting['key'], auth_setting['value']))
         else:
             raise ApiValueError(
-                "http method must be `GET`, `HEAD`, `OPTIONS`,"
-                " `POST`, `PATCH`, `PUT` or `DELETE`."
+                'Authentication token must be in `query` or `header`'
             )
 
-    def update_params_for_auth(self, headers, auth_settings,
-                               resource_path, method, body):
-        """Updates header and query params based on authentication setting.
+    def __deserialize_file(self, response):
+        """Deserializes body to file
 
-        :param headers: Header parameters dict to be updated.
-        :param auth_settings: Authentication setting identifiers list.
-        :param resource_path: A string representation of the HTTP request resource path.
-        :param method: A string representation of the HTTP request method.
-        :param body: A object representing the body of the HTTP request.
-            The object type is the return value of _encoder.default().
-        """
-        if not auth_settings:
-            return
+        Saves response body into a file in a temporary folder,
+        using the filename from the `Content-Disposition` header if provided.
 
-        for auth in auth_settings:
-            auth_setting = self.configuration.auth_settings().get(auth)
-            if not auth_setting:
-                continue
-            if auth_setting['in'] == 'cookie':
-                headers.add('Cookie', auth_setting['value'])
-            elif auth_setting['in'] == 'header':
-                if auth_setting['type'] != 'http-signature':
-                    headers.add(auth_setting['key'], auth_setting['value'])
-            elif auth_setting['in'] == 'query':
-                """ TODO implement auth in query
-                need to pass in prefix_separator_iterator
-                and need to output resource_path with query params added
-                """
-                raise ApiValueError("Auth in query not yet implemented")
-            else:
-                raise ApiValueError(
-                    'Authentication token must be in `query` or `header`'
-                )
+        handle file downloading
+        save response body into a tmp file and return the instance
 
+        :param response:  RESTResponse.
+        :return: file path.
+        """
+        fd, path = tempfile.mkstemp(dir=self.configuration.temp_folder_path)
+        os.close(fd)
+        os.remove(path)
+
+        content_disposition = response.getheader("Content-Disposition")
+        if content_disposition:
+            m = re.search(
+                r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                content_disposition
+            )
+            assert m is not None, "Unexpected 'content-disposition' header value"
+            filename = m.group(1)
+            path = os.path.join(os.path.dirname(path), filename)
 
-class Api:
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
+        with open(path, "wb") as f:
+            f.write(response.data)
 
-    Do not edit the class manually.
-    """
+        return path
+
+    def __deserialize_primitive(self, data, klass):
+        """Deserializes string to primitive type.
 
-    def __init__(self, api_client: typing.Optional[ApiClient] = None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
+        :param data: str.
+        :param klass: class literal.
 
-    @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+        :return: int, long, float, str, bool.
         """
-        Ensures that:
-        - required keys are present
-        - additional properties are not input
-        - value stored under required keys do not have the value unset
-        Note: detailed value checking is done in schema classes
+        try:
+            return klass(data)
+        except UnicodeEncodeError:
+            return str(data)
+        except TypeError:
+            return data
+
+    def __deserialize_object(self, value):
+        """Return an original value.
+
+        :return: object.
         """
-        missing_required_keys = []
-        required_keys_with_unset_values = []
-        for required_key in cls.__required_keys__:
-            if required_key not in data:
-                missing_required_keys.append(required_key)
-                continue
-            value = data[required_key]
-            if value is unset:
-                required_keys_with_unset_values.append(required_key)
-        if missing_required_keys:
-            raise ApiTypeError(
-                '{} missing {} required arguments: {}'.format(
-                    cls.__name__, len(missing_required_keys), missing_required_keys
-                 )
-             )
-        if required_keys_with_unset_values:
-            raise ApiValueError(
-                '{} contains invalid unset values for {} required keys: {}'.format(
-                    cls.__name__, len(required_keys_with_unset_values), required_keys_with_unset_values
-                )
-            )
+        return value
 
-        disallowed_additional_keys = []
-        for key in data:
-            if key in cls.__required_keys__ or key in cls.__optional_keys__:
-                continue
-            disallowed_additional_keys.append(key)
-        if disallowed_additional_keys:
-            raise ApiTypeError(
-                '{} got {} unexpected keyword arguments: {}'.format(
-                    cls.__name__, len(disallowed_additional_keys), disallowed_additional_keys
-                )
-            )
+    def __deserialize_date(self, string):
+        """Deserializes string to date.
 
-    def _get_host_oapg(
-        self,
-        operation_id: str,
-        servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
-        host_index: typing.Optional[int] = None
-    ) -> typing.Optional[str]:
-        configuration = self.api_client.configuration
+        :param string: str.
+        :return: date.
+        """
         try:
-            if host_index is None:
-                index = configuration.server_operation_index.get(
-                    operation_id, configuration.server_index
-                )
-            else:
-                index = host_index
-            server_variables = configuration.server_operation_variables.get(
-                operation_id, configuration.server_variables
-            )
-            host = configuration.get_host_from_settings(
-                index, variables=server_variables, servers=servers
+            return parse(string).date()
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason="Failed to parse `{0}` as date object".format(string)
             )
-        except IndexError:
-            if servers:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(servers)
-                )
-            host = None
-        return host
-
-
-class SerializedRequestBody(typing_extensions.TypedDict, total=False):
-    body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
+    def __deserialize_datetime(self, string):
+        """Deserializes string to datetime.
 
-class RequestBody(StyleFormSerializer, JSONDetector):
-    """
-    A request body parameter
-    content: content_type to MediaType Schema info
-    """
-    __json_encoder = JSONEncoder()
+        The string should be in iso8601 datetime format.
 
-    def __init__(
-        self,
-        content: typing.Dict[str, MediaType],
-        required: bool = False,
-    ):
-        self.required = required
-        if len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-
-    def __serialize_json(
-        self,
-        in_data: typing.Any
-    ) -> typing.Dict[str, bytes]:
-        in_data = self.__json_encoder.default(in_data)
-        json_str = json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode(
-            "utf-8"
-        )
-        return dict(body=json_str)
-
-    @staticmethod
-    def __serialize_text_plain(in_data: typing.Any) -> typing.Dict[str, str]:
-        if isinstance(in_data, frozendict.frozendict):
-            raise ValueError('Unable to serialize type frozendict.frozendict to text/plain')
-        elif isinstance(in_data, tuple):
-            raise ValueError('Unable to serialize type tuple to text/plain')
-        elif isinstance(in_data, NoneClass):
-            raise ValueError('Unable to serialize type NoneClass to text/plain')
-        elif isinstance(in_data, BoolClass):
-            raise ValueError('Unable to serialize type BoolClass to text/plain')
-        return dict(body=str(in_data))
-
-    def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
-        json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
-
-    def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
-        if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
-        elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
-        elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
+        :param string: str.
+        :return: datetime.
+        """
+        try:
+            return parse(string)
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as datetime object"
+                    .format(string)
+                )
             )
-            value.close()
-            return request_field
-        else:
-            return self.__multipart_json_item(key=key, value=value)
 
-    def __serialize_multipart_form_data(
-        self, in_data: Schema
-    ) -> typing.Dict[str, typing.Tuple[RequestField, ...]]:
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(f'Unable to serialize {in_data} to multipart/form-data because it is not a dict of data')
+    def __deserialize_enum(self, data, klass):
+        """Deserializes primitive type to enum.
+
+        :param data: primitive type.
+        :param klass: class literal.
+        :return: enum value.
         """
-        In a multipart/form-data request body, each schema property, or each element of a schema array property,
-        takes a section in the payload with an internal header as defined by RFC7578. The serialization strategy
-        for each property of a multipart/form-data request body can be specified in an associated Encoding Object.
+        try:
+            return klass(data)
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as `{1}`"
+                    .format(data, klass)
+                )
+            )
 
-        When passing in multipart types, boundaries MAY be used to separate sections of the content being
-        transferred – thus, the following default Content-Types are defined for multipart:
+    def __deserialize_model(self, data, klass):
+        """Deserializes list or dict to model.
 
-        If the (object) property is a primitive, or an array of primitive values, the default Content-Type is text/plain
-        If the property is complex, or an array of complex values, the default Content-Type is application/json
-            Question: how is the array of primitives encoded?
-        If the property is a type: string with a contentEncoding, the default Content-Type is application/octet-stream
-        """
-        fields = []
-        for key, value in in_data.items():
-            if isinstance(value, tuple):
-                if value:
-                    # values use explode = True, so the code makes a RequestField for each item with name=key
-                    for item in value:
-                        request_field = self.__multipart_form_item(key=key, value=item)
-                        fields.append(request_field)
-                else:
-                    # send an empty array as json because exploding will not send it
-                    request_field = self.__multipart_json_item(key=key, value=value)
-                    fields.append(request_field)
-            else:
-                request_field = self.__multipart_form_item(key=key, value=value)
-                fields.append(request_field)
-
-        return dict(fields=tuple(fields))
-
-    def __serialize_application_octet_stream(self, in_data: BinarySchema) -> typing.Dict[str, bytes]:
-        if isinstance(in_data, bytes):
-            return dict(body=in_data)
-        # FileIO type
-        result = dict(body=in_data.read())
-        in_data.close()
-        return result
-
-    def __serialize_application_x_www_form_data(
-        self, in_data: typing.Any
-    ) -> SerializedRequestBody:
+        :param data: dict, list.
+        :param klass: class literal.
+        :return: model object.
         """
-        POST submission of form data in body
-        """
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(
-                f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
-        cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
-        return dict(body=value)
-
-    def serialize(
-        self, in_data: typing.Any, content_type: str
-    ) -> SerializedRequestBody:
-        """
-        If a str is returned then the result will be assigned to data when making the request
-        If a tuple is returned then the result will be used as fields input in encode_multipart_formdata
-        Return a tuple of
 
-        The key of the return dict is
-        - body for application/json
-        - encode_multipart and fields for multipart/form-data
-        """
-        media_type = self.content[content_type]
-        if isinstance(in_data, media_type.schema):
-            cast_in_data = in_data
-        elif isinstance(in_data, (dict, frozendict.frozendict)) and in_data:
-            cast_in_data = media_type.schema(**in_data)
-        else:
-            cast_in_data = media_type.schema(in_data)
-        # TODO check for and use encoding if it exists
-        # and content_type is multipart or application/x-www-form-urlencoded
-        if self._content_type_is_json(content_type):
-            return self.__serialize_json(cast_in_data)
-        elif content_type == 'text/plain':
-            return self.__serialize_text_plain(cast_in_data)
-        elif content_type == 'multipart/form-data':
-            return self.__serialize_multipart_form_data(cast_in_data)
-        elif content_type == 'application/x-www-form-urlencoded':
-            return self.__serialize_application_x_www_form_data(cast_in_data)
-        elif content_type == 'application/octet-stream':
-            return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
+        return klass.from_dict(data)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/api_response.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/api_response.py
new file mode 100644
index 00000000..9bc7c11f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/api_response.py
@@ -0,0 +1,21 @@
+"""API response object."""
+
+from __future__ import annotations
+from typing import Optional, Generic, Mapping, TypeVar
+from pydantic import Field, StrictInt, StrictBytes, BaseModel
+
+T = TypeVar("T")
+
+class ApiResponse(BaseModel, Generic[T]):
+    """
+    API response object
+    """
+
+    status_code: StrictInt = Field(description="HTTP status code")
+    headers: Optional[Mapping[str, str]] = Field(None, description="HTTP headers")
+    data: T = Field(description="Deserialized data given the data type")
+    raw_data: StrictBytes = Field(description="Raw data (HTTP response body)")
+
+    model_config = {
+        "arbitrary_types_allowed": True
+    }
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/__init__.py
deleted file mode 100644
index 7840f772..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints then import them from
-# tags, paths, or path_to_api, or tag_to_api
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/path_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/path_to_api.py
deleted file mode 100644
index 7488ae06..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/path_to_api.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.common.paths import PathValues
-from cloudharness_cli.common.apis.paths.sentry_getdsn_appname import SentryGetdsnAppname
-from cloudharness_cli.common.apis.paths.accounts_config import AccountsConfig
-
-PathToApi = typing_extensions.TypedDict(
-    'PathToApi',
-    {
-        PathValues.SENTRY_GETDSN_APPNAME: SentryGetdsnAppname,
-        PathValues.ACCOUNTS_CONFIG: AccountsConfig,
-    }
-)
-
-path_to_api = PathToApi(
-    {
-        PathValues.SENTRY_GETDSN_APPNAME: SentryGetdsnAppname,
-        PathValues.ACCOUNTS_CONFIG: AccountsConfig,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/__init__.py
deleted file mode 100644
index 585cfa24..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.common.apis.path_to_api import path_to_api
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/accounts_config.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/accounts_config.py
deleted file mode 100644
index b70c3dbd..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/accounts_config.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.common.paths.accounts_config.get import ApiForget
-
-
-class AccountsConfig(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/sentry_getdsn_appname.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/sentry_getdsn_appname.py
deleted file mode 100644
index 857659e2..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/paths/sentry_getdsn_appname.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.common.paths.sentry_getdsn_appname.get import ApiForget
-
-
-class SentryGetdsnAppname(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tag_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tag_to_api.py
deleted file mode 100644
index 89eb78ba..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tag_to_api.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.common.apis.tags import TagValues
-from cloudharness_cli.common.apis.tags.sentry_api import SentryApi
-from cloudharness_cli.common.apis.tags.accounts_api import AccountsApi
-
-TagToApi = typing_extensions.TypedDict(
-    'TagToApi',
-    {
-        TagValues.SENTRY: SentryApi,
-        TagValues.ACCOUNTS: AccountsApi,
-    }
-)
-
-tag_to_api = TagToApi(
-    {
-        TagValues.SENTRY: SentryApi,
-        TagValues.ACCOUNTS: AccountsApi,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/__init__.py
deleted file mode 100644
index 402054b7..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.common.apis.tag_to_api import tag_to_api
-
-import enum
-
-
-class TagValues(str, enum.Enum):
-    SENTRY = "Sentry"
-    ACCOUNTS = "Accounts"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/accounts_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/accounts_api.py
deleted file mode 100644
index e7a2a814..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/accounts_api.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# coding: utf-8
-
-"""
-    CH common service API
-
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.common.paths.accounts_config.get import GetConfig
-
-
-class AccountsApi(
-    GetConfig,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/sentry_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/sentry_api.py
deleted file mode 100644
index 06d9a982..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/apis/tags/sentry_api.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# coding: utf-8
-
-"""
-    CH common service API
-
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.common.paths.sentry_getdsn_appname.get import Getdsn
-
-
-class SentryApi(
-    Getdsn,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/configuration.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/configuration.py
index 663a0f53..e95302f8 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/configuration.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/configuration.py
@@ -3,69 +3,48 @@
 """
     CH common service API
 
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
+    Cloud Harness Platform - Reference CH service API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 import copy
 import logging
+from logging import FileHandler
 import multiprocessing
 import sys
+from typing import Optional
 import urllib3
 
-from http import client as http_client
-from cloudharness_cli.common.exceptions import ApiValueError
-
+import http.client as httplib
 
 JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'multipleOf', 'maximum', 'exclusiveMaximum',
     'minimum', 'exclusiveMinimum', 'maxLength',
-    'minLength', 'pattern', 'maxItems', 'minItems',
-    'uniqueItems', 'maxProperties', 'minProperties',
+    'minLength', 'pattern', 'maxItems', 'minItems'
 }
 
-class Configuration(object):
-    """NOTE: This class is auto generated by OpenAPI Generator
+class Configuration:
+    """This class contains various settings of the API client.
 
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
-
-    :param host: Base url
+    :param host: Base url.
+    :param ignore_operation_servers
+      Boolean to ignore operation servers for the API client.
+      Config will use `host` as the base url regardless of the operation servers.
     :param api_key: Dict to store API key(s).
       Each entry in the dict specifies an API key.
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is the API key secret.
-    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer).
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is an API key prefix when generating the auth data.
-    :param username: Username for HTTP basic authentication
-    :param password: Password for HTTP basic authentication
-    :param discard_unknown_keys: Boolean value indicating whether to discard
-      unknown properties. A server may send a response that includes additional
-      properties that are not known by the client in the following scenarios:
-      1. The OpenAPI document is incomplete, i.e. it does not match the server
-         implementation.
-      2. The client was generated using an older version of the OpenAPI document
-         and the server has been upgraded since then.
-      If a schema in the OpenAPI document defines the additionalProperties attribute,
-      then all undeclared properties received by the server are injected into the
-      additional properties map. In that case, there are undeclared properties, and
-      nothing to discard.
-    :param disabled_client_side_validations (string): Comma-separated list of
-      JSON schema validation keywords to disable JSON schema structural validation
-      rules. The following keywords may be specified: multipleOf, maximum,
-      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
-      maxItems, minItems.
-      By default, the validation is performed for data generated locally by the client
-      and data received from the server, independent of any validation performed by
-      the server side. If the input data does not satisfy the JSON schema validation
-      rules specified in the OpenAPI document, an exception is raised.
-      If disabled_client_side_validations is set, structural validation is
-      disabled. This can be useful to troubleshoot data validation problem, such as
-      when the OpenAPI document validation rules do not match the actual API data
-      received by the server.
+    :param username: Username for HTTP basic authentication.
+    :param password: Password for HTTP basic authentication.
+    :param access_token: Access token.
     :param server_index: Index to servers configuration.
     :param server_variables: Mapping with string values to replace variables in
       templated server configuration. The validation of enums is performed for
@@ -74,7 +53,11 @@ class Configuration(object):
       configuration.
     :param server_operation_variables: Mapping from operation ID to a mapping with
       string values to replace variables in templated server configuration.
-      The validation of enums is performed for variables with defined enum values before.
+      The validation of enums is performed for variables with defined enum
+      values before.
+    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
+      in PEM format.
+    :param retries: Number of retries for API requests.
 
     """
 
@@ -83,11 +66,15 @@ class Configuration(object):
     def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations="",
+                 access_token=None,
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
-                 ):
+                 ignore_operation_servers=False,
+                 ssl_ca_cert=None,
+                 retries=None,
+                 *,
+                 debug: Optional[bool] = None
+                 ) -> None:
         """Constructor
         """
         self._base_path = "/api" if host is None else host
@@ -101,6 +88,9 @@ def __init__(self, host=None,
         self.server_operation_variables = server_operation_variables or {}
         """Default server variables
         """
+        self.ignore_operation_servers = ignore_operation_servers
+        """Ignore operation servers
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -124,8 +114,9 @@ def __init__(self, host=None,
         self.password = password
         """Password for HTTP basic authentication
         """
-        self.discard_unknown_keys = discard_unknown_keys
-        self.disabled_client_side_validations = disabled_client_side_validations
+        self.access_token = access_token
+        """Access token
+        """
         self.logger = {}
         """Logging Settings
         """
@@ -137,13 +128,16 @@ def __init__(self, host=None,
         self.logger_stream_handler = None
         """Log stream handler
         """
-        self.logger_file_handler = None
+        self.logger_file_handler: Optional[FileHandler] = None
         """Log file handler
         """
         self.logger_file = None
         """Debug file location
         """
-        self.debug = False
+        if debug is not None:
+            self.debug = debug
+        else:
+            self.__debug = False
         """Debug switch
         """
 
@@ -152,7 +146,7 @@ def __init__(self, host=None,
            Set this to false to skip verifying SSL certificate when calling API
            from https server.
         """
-        self.ssl_ca_cert = None
+        self.ssl_ca_cert = ssl_ca_cert
         """Set this to customize the certificate file to verify the peer.
         """
         self.cert_file = None
@@ -164,6 +158,10 @@ def __init__(self, host=None,
         self.assert_hostname = None
         """Set this to True/False to enable/disable SSL hostname verification.
         """
+        self.tls_server_name = None
+        """SSL/TLS Server Name Indication (SNI)
+           Set this to the SNI value expected by the server.
+        """
 
         self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
         """urllib3 connection pool's maximum number of connections saved
@@ -173,7 +171,7 @@ def __init__(self, host=None,
            cpu_count * 5 is used as default value to increase performance.
         """
 
-        self.proxy = None
+        self.proxy: Optional[str] = None
         """Proxy URL
         """
         self.proxy_headers = None
@@ -182,14 +180,23 @@ def __init__(self, host=None,
         self.safe_chars_for_path_param = ''
         """Safe chars for path_param
         """
-        self.retries = None
+        self.retries = retries
         """Adding retries to override urllib3 default value 3
         """
         # Enable client side validation
         self.client_side_validation = True
 
-        # Options to pass down to the underlying urllib3 socket
         self.socket_options = None
+        """Options to pass down to the underlying urllib3 socket
+        """
+
+        self.datetime_format = "%Y-%m-%dT%H:%M:%S.%f%z"
+        """datetime format
+        """
+
+        self.date_format = "%Y-%m-%d"
+        """date format
+        """
 
     def __deepcopy__(self, memo):
         cls = self.__class__
@@ -207,13 +214,6 @@ def __deepcopy__(self, memo):
 
     def __setattr__(self, name, value):
         object.__setattr__(self, name, value)
-        if name == 'disabled_client_side_validations':
-            s = set(filter(None, value.split(',')))
-            for v in s:
-                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
-                    raise ApiValueError(
-                        "Invalid keyword: '{0}''".format(v))
-            self._disabled_client_side_validations = s
 
     @classmethod
     def set_default(cls, default):
@@ -224,21 +224,31 @@ def set_default(cls, default):
 
         :param default: object of Configuration
         """
-        cls._default = copy.deepcopy(default)
+        cls._default = default
 
     @classmethod
     def get_default_copy(cls):
-        """Return new instance of configuration.
+        """Deprecated. Please use `get_default` instead.
+
+        Deprecated. Please use `get_default` instead.
+
+        :return: The configuration object.
+        """
+        return cls.get_default()
+
+    @classmethod
+    def get_default(cls):
+        """Return the default configuration.
 
         This method returns newly created, based on default constructor,
         object of Configuration class or returns a copy of default
-        configuration passed by the set_default method.
+        configuration.
 
         :return: The configuration object.
         """
-        if cls._default is not None:
-            return copy.deepcopy(cls._default)
-        return Configuration()
+        if cls._default is None:
+            cls._default = Configuration()
+        return cls._default
 
     @property
     def logger_file(self):
@@ -292,15 +302,15 @@ def debug(self, value):
             # if debug status is True, turn on debug logging
             for _, logger in self.logger.items():
                 logger.setLevel(logging.DEBUG)
-            # turn on http_client debug
-            http_client.HTTPConnection.debuglevel = 1
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
         else:
             # if debug status is False, turn off debug logging,
             # setting log level to default `logging.WARNING`
             for _, logger in self.logger.items():
                 logger.setLevel(logging.WARNING)
-            # turn off http_client debug
-            http_client.HTTPConnection.debuglevel = 0
+            # turn off httplib debug
+            httplib.HTTPConnection.debuglevel = 0
 
     @property
     def logger_format(self):
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/exceptions.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/exceptions.py
index e0d9c24a..921d7be4 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/exceptions.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/exceptions.py
@@ -3,12 +3,16 @@
 """
     CH common service API
 
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
+    Cloud Harness Platform - Reference CH service API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
+from typing import Any, Optional
+from typing_extensions import Self
 
 class OpenApiException(Exception):
     """The base exception class for all OpenAPIExceptions"""
@@ -16,7 +20,7 @@ class OpenApiException(Exception):
 
 class ApiTypeError(OpenApiException, TypeError):
     def __init__(self, msg, path_to_item=None, valid_classes=None,
-                 key_type=None):
+                 key_type=None) -> None:
         """ Raises an exception for TypeErrors
 
         Args:
@@ -44,7 +48,7 @@ def __init__(self, msg, path_to_item=None, valid_classes=None,
 
 
 class ApiValueError(OpenApiException, ValueError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -62,7 +66,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiAttributeError(OpenApiException, AttributeError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Raised when an attribute reference or assignment fails.
 
@@ -81,7 +85,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiKeyError(OpenApiException, KeyError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -99,17 +103,56 @@ def __init__(self, msg, path_to_item=None):
 
 class ApiException(OpenApiException):
 
-    def __init__(self, status=None, reason=None, api_response: 'cloudharness_cli.common.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+    def __init__(
+        self, 
+        status=None, 
+        reason=None, 
+        http_resp=None,
+        *,
+        body: Optional[str] = None,
+        data: Optional[Any] = None,
+    ) -> None:
+        self.status = status
+        self.reason = reason
+        self.body = body
+        self.data = data
+        self.headers = None
+
+        if http_resp:
+            if self.status is None:
+                self.status = http_resp.status
+            if self.reason is None:
+                self.reason = http_resp.reason
+            if self.body is None:
+                try:
+                    self.body = http_resp.data.decode('utf-8')
+                except Exception:
+                    pass
+            self.headers = http_resp.getheaders()
+
+    @classmethod
+    def from_response(
+        cls, 
+        *, 
+        http_resp, 
+        body: Optional[str], 
+        data: Optional[Any],
+    ) -> Self:
+        if http_resp.status == 400:
+            raise BadRequestException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 401:
+            raise UnauthorizedException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 403:
+            raise ForbiddenException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 404:
+            raise NotFoundException(http_resp=http_resp, body=body, data=data)
+
+        if 500 <= http_resp.status <= 599:
+            raise ServiceException(http_resp=http_resp, body=body, data=data)
+        raise ApiException(http_resp=http_resp, body=body, data=data)
 
     def __str__(self):
         """Custom error messages for exception"""
@@ -119,12 +162,32 @@ def __str__(self):
             error_message += "HTTP response headers: {0}\n".format(
                 self.headers)
 
-        if self.body:
-            error_message += "HTTP response body: {0}\n".format(self.body)
+        if self.data or self.body:
+            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
 
         return error_message
 
 
+class BadRequestException(ApiException):
+    pass
+
+
+class NotFoundException(ApiException):
+    pass
+
+
+class UnauthorizedException(ApiException):
+    pass
+
+
+class ForbiddenException(ApiException):
+    pass
+
+
+class ServiceException(ApiException):
+    pass
+
+
 def render_path(path_to_item):
     """Returns a string representation of a path"""
     result = ""
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/model/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/model/__init__.py
deleted file mode 100644
index 43d3a937..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/model/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# we can not import model classes here because that would create a circular
-# reference which would not work in python2
-# do not import all models into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all models from one package, import them with
-# from cloudharness_cli.common.models import ModelA, ModelB
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/models/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/models/__init__.py
index 181123a3..c7a30be1 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/models/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/models/__init__.py
@@ -1,13 +1,18 @@
 # coding: utf-8
 
 # flake8: noqa
+"""
+    CH common service API
 
-# import all models into this package
-# if you have many models here with many references from one model to another this may
-# raise a RecursionError
-# to avoid this, import only the models that you directly need like:
-# from from cloudharness_cli.common.model.pet import Pet
-# or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
+    Cloud Harness Platform - Reference CH service API
 
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+# import models into model package
+from cloudharness_cli.common.models.app_version import AppVersion
+from cloudharness_cli.common.models.get_config200_response import GetConfig200Response
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/models/app_version.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/models/app_version.py
new file mode 100644
index 00000000..1ab39844
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/models/app_version.py
@@ -0,0 +1,89 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class AppVersion(BaseModel):
+    """
+    
+    """ # noqa: E501
+    build: Optional[StrictStr] = None
+    tag: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["build", "tag"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of AppVersion from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of AppVersion from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "build": obj.get("build"),
+            "tag": obj.get("tag")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/models/get_config200_response.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/models/get_config200_response.py
new file mode 100644
index 00000000..25277ad2
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/models/get_config200_response.py
@@ -0,0 +1,91 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class GetConfig200Response(BaseModel):
+    """
+    GetConfig200Response
+    """ # noqa: E501
+    url: Optional[StrictStr] = Field(default=None, description="The auth URL.")
+    realm: Optional[StrictStr] = Field(default=None, description="The realm.")
+    client_id: Optional[StrictStr] = Field(default=None, description="The clientID.", alias="clientId")
+    __properties: ClassVar[List[str]] = ["url", "realm", "clientId"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of GetConfig200Response from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of GetConfig200Response from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "url": obj.get("url"),
+            "realm": obj.get("realm"),
+            "clientId": obj.get("clientId")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/__init__.py
deleted file mode 100644
index 4efcd37e..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.common.apis.path_to_api import path_to_api
-
-import enum
-
-
-class PathValues(str, enum.Enum):
-    SENTRY_GETDSN_APPNAME = "/sentry/getdsn/{appname}"
-    ACCOUNTS_CONFIG = "/accounts/config"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/__init__.py
deleted file mode 100644
index 62417d82..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.common.paths.accounts_config import Api
-
-from cloudharness_cli.common.paths import PathValues
-
-path = PathValues.ACCOUNTS_CONFIG
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.py
deleted file mode 100644
index 65b8b3bb..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.py
+++ /dev/null
@@ -1,302 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.common import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.common import schemas  # noqa: F401
-
-from . import path
-
-
-
-class SchemaFor200ResponseBodyApplicationJson(
-    schemas.DictSchema
-):
-
-
-    class MetaOapg:
-        
-        class properties:
-            url = schemas.StrSchema
-            realm = schemas.StrSchema
-            clientId = schemas.StrSchema
-            __annotations__ = {
-                "url": url,
-                "realm": realm,
-                "clientId": clientId,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["url"]) -> MetaOapg.properties.url: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["realm"]) -> MetaOapg.properties.realm: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["clientId"]) -> MetaOapg.properties.clientId: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["url", "realm", "clientId", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["url"]) -> typing.Union[MetaOapg.properties.url, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["realm"]) -> typing.Union[MetaOapg.properties.realm, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["clientId"]) -> typing.Union[MetaOapg.properties.clientId, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["url", "realm", "clientId", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        url: typing.Union[MetaOapg.properties.url, str, schemas.Unset] = schemas.unset,
-        realm: typing.Union[MetaOapg.properties.realm, str, schemas.Unset] = schemas.unset,
-        clientId: typing.Union[MetaOapg.properties.clientId, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'SchemaFor200ResponseBodyApplicationJson':
-        return super().__new__(
-            cls,
-            *args,
-            url=url,
-            realm=realm,
-            clientId=clientId,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_config_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_config_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_config_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_config_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Gets the config for logging in into accounts
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetConfig(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_config(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_config(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_config(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_config(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_config_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_config_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.pyi
deleted file mode 100644
index 6ebea5ea..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/accounts_config/get.pyi
+++ /dev/null
@@ -1,297 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.common import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.common import schemas  # noqa: F401
-
-
-
-class SchemaFor200ResponseBodyApplicationJson(
-    schemas.DictSchema
-):
-
-
-    class MetaOapg:
-        
-        class properties:
-            url = schemas.StrSchema
-            realm = schemas.StrSchema
-            clientId = schemas.StrSchema
-            __annotations__ = {
-                "url": url,
-                "realm": realm,
-                "clientId": clientId,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["url"]) -> MetaOapg.properties.url: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["realm"]) -> MetaOapg.properties.realm: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["clientId"]) -> MetaOapg.properties.clientId: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["url", "realm", "clientId", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["url"]) -> typing.Union[MetaOapg.properties.url, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["realm"]) -> typing.Union[MetaOapg.properties.realm, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["clientId"]) -> typing.Union[MetaOapg.properties.clientId, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["url", "realm", "clientId", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        url: typing.Union[MetaOapg.properties.url, str, schemas.Unset] = schemas.unset,
-        realm: typing.Union[MetaOapg.properties.realm, str, schemas.Unset] = schemas.unset,
-        clientId: typing.Union[MetaOapg.properties.clientId, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'SchemaFor200ResponseBodyApplicationJson':
-        return super().__new__(
-            cls,
-            *args,
-            url=url,
-            realm=realm,
-            clientId=clientId,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_config_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_config_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_config_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_config_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Gets the config for logging in into accounts
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetConfig(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_config(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_config(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_config(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_config(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_config_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_config_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/__init__.py
deleted file mode 100644
index e4d361b9..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.common.paths.sentry_getdsn_appname import Api
-
-from cloudharness_cli.common.paths import PathValues
-
-path = PathValues.SENTRY_GETDSN_APPNAME
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.py
deleted file mode 100644
index b063200e..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.py
+++ /dev/null
@@ -1,287 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.common import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.common import schemas  # noqa: F401
-
-from . import path
-
-# Path params
-AppnameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'appname': typing.Union[AppnameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_appname = api_client.PathParameter(
-    name="appname",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=AppnameSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _getdsn_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _getdsn_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _getdsn_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _getdsn_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Gets the Sentry DSN for a given application
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_appname,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class Getdsn(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def getdsn(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def getdsn(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def getdsn(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def getdsn(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._getdsn_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._getdsn_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.pyi
deleted file mode 100644
index e7655b5c..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/paths/sentry_getdsn_appname/get.pyi
+++ /dev/null
@@ -1,282 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.common import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.common import schemas  # noqa: F401
-
-# Path params
-AppnameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'appname': typing.Union[AppnameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_appname = api_client.PathParameter(
-    name="appname",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=AppnameSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _getdsn_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _getdsn_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _getdsn_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _getdsn_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Gets the Sentry DSN for a given application
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_appname,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class Getdsn(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def getdsn(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def getdsn(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def getdsn(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def getdsn(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._getdsn_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._getdsn_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/test/common/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/py.typed
similarity index 100%
rename from libraries/client/cloudharness_cli/test/common/__init__.py
rename to libraries/client/cloudharness_cli/cloudharness_cli/common/py.typed
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/rest.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/rest.py
index 198f23c6..13170ca4 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/rest.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/common/rest.py
@@ -3,34 +3,66 @@
 """
     CH common service API
 
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
+    Cloud Harness Platform - Reference CH service API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
-import logging
+import io
+import json
+import re
 import ssl
-from urllib.parse import urlencode
-import typing
 
-import certifi
 import urllib3
-from urllib3._collections import HTTPHeaderDict
 
 from cloudharness_cli.common.exceptions import ApiException, ApiValueError
 
+SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"}
+RESTResponseType = urllib3.HTTPResponse
+
+
+def is_socks_proxy_url(url):
+    if url is None:
+        return False
+    split_section = url.split("://")
+    if len(split_section) < 2:
+        return False
+    else:
+        return split_section[0].lower() in SUPPORTED_SOCKS_PROXIES
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp) -> None:
+        self.response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = None
+
+    def read(self):
+        if self.data is None:
+            self.data = self.response.data
+        return self.data
+
+    def getheaders(self):
+        """Returns a dictionary of the response headers."""
+        return self.response.headers
 
-logger = logging.getLogger(__name__)
+    def getheader(self, name, default=None):
+        """Returns a given response header."""
+        return self.response.headers.get(name, default)
 
 
-class RESTClientObject(object):
+class RESTClientObject:
 
-    def __init__(self, configuration, pools_size=4, maxsize=None):
+    def __init__(self, configuration) -> None:
         # urllib3.PoolManager will pass all kw parameters to connectionpool
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
-        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
         # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
 
         # cert_reqs
@@ -39,140 +71,167 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         else:
             cert_reqs = ssl.CERT_NONE
 
-        # ca_certs
-        if configuration.ssl_ca_cert:
-            ca_certs = configuration.ssl_ca_cert
-        else:
-            # if not set certificate file, use Mozilla's root certificates.
-            ca_certs = certifi.where()
-
-        addition_pool_args = {}
+        pool_args = {
+            "cert_reqs": cert_reqs,
+            "ca_certs": configuration.ssl_ca_cert,
+            "cert_file": configuration.cert_file,
+            "key_file": configuration.key_file,
+        }
         if configuration.assert_hostname is not None:
-            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+            pool_args['assert_hostname'] = (
+                configuration.assert_hostname
+            )
 
         if configuration.retries is not None:
-            addition_pool_args['retries'] = configuration.retries
+            pool_args['retries'] = configuration.retries
+
+        if configuration.tls_server_name:
+            pool_args['server_hostname'] = configuration.tls_server_name
+
 
         if configuration.socket_options is not None:
-            addition_pool_args['socket_options'] = configuration.socket_options
+            pool_args['socket_options'] = configuration.socket_options
 
-        if maxsize is None:
-            if configuration.connection_pool_maxsize is not None:
-                maxsize = configuration.connection_pool_maxsize
-            else:
-                maxsize = 4
+        if configuration.connection_pool_maxsize is not None:
+            pool_args['maxsize'] = configuration.connection_pool_maxsize
 
         # https pool manager
+        self.pool_manager: urllib3.PoolManager
+
         if configuration.proxy:
-            self.pool_manager = urllib3.ProxyManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                proxy_url=configuration.proxy,
-                proxy_headers=configuration.proxy_headers,
-                **addition_pool_args
-            )
+            if is_socks_proxy_url(configuration.proxy):
+                from urllib3.contrib.socks import SOCKSProxyManager
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["headers"] = configuration.proxy_headers
+                self.pool_manager = SOCKSProxyManager(**pool_args)
+            else:
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["proxy_headers"] = configuration.proxy_headers
+                self.pool_manager = urllib3.ProxyManager(**pool_args)
         else:
-            self.pool_manager = urllib3.PoolManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                **addition_pool_args
-            )
+            self.pool_manager = urllib3.PoolManager(**pool_args)
 
     def request(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, typing.Any], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
+        method,
+        url,
+        headers=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ):
         """Perform requests.
 
         :param method: http request method
         :param url: http request url
         :param headers: http request headers
-        :param body: request body, for other types
-        :param fields: request parameters for
-                                `application/x-www-form-urlencoded`
-                                or `multipart/form-data`
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                be returned without reading/decoding response
-                                data. Default is False.
-        :param timeout: timeout setting for this request. If one
-                                number provided, it will be total request
-                                timeout. It can also be a pair (tuple) of
-                                (connection, read) timeouts.
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencoded`
+                            and `multipart/form-data`
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
-                          'PATCH', 'OPTIONS']
-
-        if fields and body:
+        assert method in [
+            'GET',
+            'HEAD',
+            'DELETE',
+            'POST',
+            'PUT',
+            'PATCH',
+            'OPTIONS'
+        ]
+
+        if post_params and body:
             raise ApiValueError(
-                "body parameter cannot be used with fields parameter."
+                "body parameter cannot be used with post_params parameter."
             )
 
-        fields = fields or {}
+        post_params = post_params or {}
         headers = headers or {}
 
-        if timeout:
-            if isinstance(timeout, (int, float)):  # noqa: E501,F821
-                timeout = urllib3.Timeout(total=timeout)
-            elif (isinstance(timeout, tuple) and
-                  len(timeout) == 2):
-                timeout = urllib3.Timeout(connect=timeout[0], read=timeout[1])
+        timeout = None
+        if _request_timeout:
+            if isinstance(_request_timeout, (int, float)):
+                timeout = urllib3.Timeout(total=_request_timeout)
+            elif (
+                    isinstance(_request_timeout, tuple)
+                    and len(_request_timeout) == 2
+                ):
+                timeout = urllib3.Timeout(
+                    connect=_request_timeout[0],
+                    read=_request_timeout[1]
+                )
 
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
             if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
-                if 'Content-Type' not in headers and body is None:
+
+                # no content type provided or payload is json
+                content_type = headers.get('Content-Type')
+                if (
+                    not content_type
+                    or re.search('json', content_type, re.IGNORECASE)
+                ):
+                    request_body = None
+                    if body is not None:
+                        request_body = json.dumps(body)
                     r = self.pool_manager.request(
                         method,
                         url,
-                        preload_content=not stream,
+                        body=request_body,
                         timeout=timeout,
-                        headers=headers
+                        headers=headers,
+                        preload_content=False
                     )
-                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                elif content_type == 'application/x-www-form-urlencoded':
                     r = self.pool_manager.request(
-                        method, url,
-                        body=body,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=False,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
-                elif headers['Content-Type'] == 'multipart/form-data':
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif content_type == 'multipart/form-data':
                     # must del headers['Content-Type'], or the correct
                     # Content-Type which generated by urllib3 will be
                     # overwritten.
                     del headers['Content-Type']
+                    # Ensures that dict objects are serialized
+                    post_params = [(a, json.dumps(b)) if isinstance(b, dict) else (a,b) for a, b in post_params]
                     r = self.pool_manager.request(
-                        method, url,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=True,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
+                        headers=headers,
+                        preload_content=False
+                    )
                 # Pass a `string` parameter directly in the body to support
-                # other content types than Json when `body` argument is
-                # provided in serialized form
+                # other content types than JSON when `body` argument is
+                # provided in serialized form.
                 elif isinstance(body, str) or isinstance(body, bytes):
-                    request_body = body
                     r = self.pool_manager.request(
-                        method, url,
+                        method,
+                        url,
+                        body=body,
+                        timeout=timeout,
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif headers['Content-Type'] == 'text/plain' and isinstance(body, bool):
+                    request_body = "true" if body else "false"
+                    r = self.pool_manager.request(
+                        method,
+                        url,
                         body=request_body,
-                        preload_content=not stream,
+                        preload_content=False,
                         timeout=timeout,
                         headers=headers)
                 else:
@@ -183,72 +242,16 @@ def request(
                     raise ApiException(status=0, reason=msg)
             # For `GET`, `HEAD`
             else:
-                r = self.pool_manager.request(method, url,
-                                              preload_content=not stream,
-                                              timeout=timeout,
-                                              headers=headers)
+                r = self.pool_manager.request(
+                    method,
+                    url,
+                    fields={},
+                    timeout=timeout,
+                    headers=headers,
+                    preload_content=False
+                )
         except urllib3.exceptions.SSLError as e:
-            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            msg = "\n".join([type(e).__name__, str(e)])
             raise ApiException(status=0, reason=msg)
 
-        if not stream:
-            # log response body
-            logger.debug("response body: %s", r.data)
-
-        return r
-
-    def GET(self, url, headers=None, stream=False,
-            timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("GET", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def HEAD(self, url, headers=None, stream=False,
-             timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("HEAD", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def OPTIONS(self, url, headers=None,
-                body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("OPTIONS", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def DELETE(self, url, headers=None, body=None,
-               stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("DELETE", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def POST(self, url, headers=None,
-             body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("POST", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PUT(self, url, headers=None,
-            body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PUT", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PATCH(self, url, headers=None,
-              body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PATCH", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
+        return RESTResponse(r)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/common/schemas.py b/libraries/client/cloudharness_cli/cloudharness_cli/common/schemas.py
deleted file mode 100644
index 18c6f8f2..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/common/schemas.py
+++ /dev/null
@@ -1,2462 +0,0 @@
-# coding: utf-8
-
-"""
-    CH common service API
-
-    Cloud Harness Platform - Reference CH service API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from collections import defaultdict
-from datetime import date, datetime, timedelta  # noqa: F401
-import functools
-import decimal
-import io
-import re
-import types
-import typing
-import uuid
-
-from dateutil.parser.isoparser import isoparser, _takes_ascii
-import frozendict
-
-from cloudharness_cli.common.exceptions import (
-    ApiTypeError,
-    ApiValueError,
-)
-from cloudharness_cli.common.configuration import (
-    Configuration,
-)
-
-
-class Unset(object):
-    """
-    An instance of this class is set as the default value for object type(dict) properties that are optional
-    When a property has an unset value, that property will not be assigned in the dict
-    """
-    pass
-
-unset = Unset()
-
-none_type = type(None)
-file_type = io.IOBase
-
-
-class FileIO(io.FileIO):
-    """
-    A class for storing files
-    Note: this class is not immutable
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
-                raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
-            return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
-
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        pass
-
-
-def update(d: dict, u: dict):
-    """
-    Adds u to d
-    Where each dict is defaultdict(set)
-    """
-    if not u:
-        return d
-    for k, v in u.items():
-        if k not in d:
-            d[k] = v
-        else:
-            d[k] = d[k] | v
-
-
-class ValidationMetadata(frozendict.frozendict):
-    """
-    A class storing metadata that is needed to validate OpenApi Schema payloads
-    """
-    def __new__(
-        cls,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-        from_server: bool = False,
-        configuration: typing.Optional[Configuration] = None,
-        seen_classes: typing.FrozenSet[typing.Type] = frozenset(),
-        validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]] = frozendict.frozendict()
-    ):
-        """
-        Args:
-            path_to_item: the path to the current data being instantiated.
-                For {'a': [1]} if the code is handling, 1, then the path is ('args[0]', 'a', 0)
-                This changes from location to location
-            from_server: whether or not this data came form the server
-                True when receiving server data
-                False when instantiating model with client side data not form the server
-                This does not change from location to location
-            configuration: the Configuration instance to use
-                This is needed because in Configuration:
-                - one can disable validation checking
-                This does not change from location to location
-            seen_classes: when deserializing data that matches multiple schemas, this is used to store
-                the schemas that have been traversed. This is used to stop processing when a cycle is seen.
-                This changes from location to location
-            validated_path_to_schemas: stores the already validated schema classes for a given path location
-                This does not change from location to location
-        """
-        return super().__new__(
-            cls,
-            path_to_item=path_to_item,
-            from_server=from_server,
-            configuration=configuration,
-            seen_classes=seen_classes,
-            validated_path_to_schemas=validated_path_to_schemas
-        )
-
-    def validation_ran_earlier(self, cls: type) -> bool:
-        validated_schemas = self.validated_path_to_schemas.get(self.path_to_item, set())
-        validation_ran_earlier = validated_schemas and cls in validated_schemas
-        if validation_ran_earlier:
-            return True
-        if cls in self.seen_classes:
-            return True
-        return False
-
-    @property
-    def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]:
-        return self.get('path_to_item')
-
-    @property
-    def from_server(self) -> bool:
-        return self.get('from_server')
-
-    @property
-    def configuration(self) -> typing.Optional[Configuration]:
-        return self.get('configuration')
-
-    @property
-    def seen_classes(self) -> typing.FrozenSet[typing.Type]:
-        return self.get('seen_classes')
-
-    @property
-    def validated_path_to_schemas(self) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]]:
-        return self.get('validated_path_to_schemas')
-
-
-class Singleton:
-    """
-    Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
-    """
-    _instances = {}
-
-    def __new__(cls, arg: typing.Any, **kwargs):
-        """
-        cls base classes: BoolClass, NoneClass, str, decimal.Decimal
-        The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
-        However 1.0  can also be ingested into that enum schema because 1.0 == 1 and
-        Decimal('1.0') == Decimal('1')
-        But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
-        and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
-        """
-        key = (cls, arg, str(arg))
-        if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
-                inst = super().__new__(cls)
-                cls._instances[key] = inst
-            else:
-                cls._instances[key] = super().__new__(cls, arg)
-        return cls._instances[key]
-
-    def __repr__(self):
-        if isinstance(self, NoneClass):
-            return f'<{self.__class__.__name__}: None>'
-        elif isinstance(self, BoolClass):
-            if bool(self):
-                return f'<{self.__class__.__name__}: True>'
-            return f'<{self.__class__.__name__}: False>'
-        return f'<{self.__class__.__name__}: {super().__repr__()}>'
-
-
-class classproperty:
-
-    def __init__(self, fget):
-        self.fget = fget
-
-    def __get__(self, owner_self, owner_cls):
-        return self.fget(owner_cls)
-
-
-class NoneClass(Singleton):
-    @classproperty
-    def NONE(cls):
-        return cls(None)
-
-    def __bool__(self) -> bool:
-        return False
-
-
-class BoolClass(Singleton):
-    @classproperty
-    def TRUE(cls):
-        return cls(True)
-
-    @classproperty
-    def FALSE(cls):
-        return cls(False)
-
-    @functools.lru_cache()
-    def __bool__(self) -> bool:
-        for key, instance in self._instances.items():
-            if self is instance:
-                return bool(key[1])
-        raise ValueError('Unable to find the boolean value of this instance')
-
-
-class MetaOapgTyped:
-    exclusive_maximum: typing.Union[int, float]
-    inclusive_maximum: typing.Union[int, float]
-    exclusive_minimum: typing.Union[int, float]
-    inclusive_minimum: typing.Union[int, float]
-    max_items: int
-    min_items: int
-    discriminator: typing.Dict[str, typing.Dict[str, typing.Type['Schema']]]
-
-
-    class properties:
-        # to hold object properties
-        pass
-
-    additional_properties: typing.Optional[typing.Type['Schema']]
-    max_properties: int
-    min_properties: int
-    all_of: typing.List[typing.Type['Schema']]
-    one_of: typing.List[typing.Type['Schema']]
-    any_of: typing.List[typing.Type['Schema']]
-    not_schema: typing.Type['Schema']
-    max_length: int
-    min_length: int
-    items: typing.Type['Schema']
-
-
-class Schema:
-    """
-    the base class of all swagger/openapi schemas/models
-    """
-    __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    _types: typing.Set[typing.Type]
-    MetaOapg = MetaOapgTyped
-
-    @staticmethod
-    def __get_valid_classes_phrase(input_classes):
-        """Returns a string phrase describing what types are allowed"""
-        all_classes = list(input_classes)
-        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-        all_class_names = [cls.__name__ for cls in all_classes]
-        if len(all_class_names) == 1:
-            return "is {0}".format(all_class_names[0])
-        return "is one of [{0}]".format(", ".join(all_class_names))
-
-    @staticmethod
-    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
-        if isinstance(item_cls, types.FunctionType):
-            # referenced schema
-            return item_cls()
-        elif isinstance(item_cls, staticmethod):
-            # referenced schema
-            return item_cls.__func__()
-        return item_cls
-
-    @classmethod
-    def __type_error_message(
-        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-    ):
-        """
-        Keyword Args:
-            var_value (any): the variable which has the type_error
-            var_name (str): the name of the variable which has the typ error
-            valid_classes (tuple): the accepted classes for current_item's
-                                      value
-            key_type (bool): False if our value is a value in a dict
-                             True if it is a key in a dict
-                             False if our item is an item in a tuple
-        """
-        key_or_value = "value"
-        if key_type:
-            key_or_value = "key"
-        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-        msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
-            var_name,
-            key_or_value,
-            valid_classes_phrase,
-            type(var_value).__name__,
-        )
-        return msg
-
-    @classmethod
-    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-        error_msg = cls.__type_error_message(
-            var_name=path_to_item[-1],
-            var_value=var_value,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-        return ApiTypeError(
-            error_msg,
-            path_to_item=path_to_item,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        Schema _validate_oapg
-        All keyword validation except for type checking was done in calling stack frames
-        If those validations passed, the validated classes are collected in path_to_schemas
-
-        Returns:
-            path_to_schemas: a map of path to schemas
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        base_class = type(arg)
-        if base_class not in cls._types:
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                cls._types,
-                key_type=False,
-            )
-
-        path_to_schemas = {validation_metadata.path_to_item: set()}
-        path_to_schemas[validation_metadata.path_to_item].add(cls)
-        path_to_schemas[validation_metadata.path_to_item].add(base_class)
-        return path_to_schemas
-
-    @staticmethod
-    def _process_schema_classes_oapg(
-        schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
-    ):
-        """
-        Processes and mutates schema_classes
-        If a SomeSchema is a subclass of DictSchema then remove DictSchema because it is already included
-        """
-        if len(schema_classes) < 2:
-            return
-        if len(schema_classes) > 2 and UnsetAnyTypeSchema in schema_classes:
-            schema_classes.remove(UnsetAnyTypeSchema)
-        x_schema = schema_type_classes & schema_classes
-        if not x_schema:
-            return
-        x_schema = x_schema.pop()
-        if any(c is not x_schema and issubclass(c, x_schema) for c in schema_classes):
-            # needed to not have a mro error in get_new_class
-            schema_classes.remove(x_schema)
-
-    @classmethod
-    def __get_new_cls(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]:
-        """
-        Make a new dynamic class and return an instance of that class
-        We are making an instance of cls, but instead of making cls
-        make a new class, new_cls
-        which includes dynamic bases including cls
-        return an instance of that new class
-
-        Dict property + List Item Assignment Use cases:
-        1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
-            where the key is the path to the item, and the value will be the required manufactured class
-            made out of the matching schemas
-        2. value is an instance of the the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
-            because value is of the correct type, and validation was run earlier when the instance was created
-        """
-        _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(_path_to_schemas, other_path_to_schemas)
-        # loop through it make a new class for each entry
-        # do not modify the returned result because it is cached and we would be modifying the cached value
-        path_to_schemas = {}
-        for path, schema_classes in _path_to_schemas.items():
-            """
-            Use cases
-            1. N number of schema classes + enum + type != bool/None, classes in path_to_schemas: tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-                needs Singleton added
-            2. N number of schema classes + enum + type == bool/None, classes in path_to_schemas: BoolClass/NoneClass
-                Singleton already added
-            3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-            """
-            cls._process_schema_classes_oapg(schema_classes)
-            enum_schema = any(
-                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
-            inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
-            chosen_schema_classes = schema_classes - inheritable_primitive_type
-            suffix = tuple(inheritable_primitive_type)
-            if enum_schema and suffix[0] not in {NoneClass, BoolClass}:
-                suffix = (Singleton,) + suffix
-
-            used_classes = tuple(sorted(chosen_schema_classes, key=lambda a_cls: a_cls.__name__)) + suffix
-            mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes)
-            path_to_schemas[path] = mfg_cls
-
-        return path_to_schemas
-
-    @classmethod
-    def _get_new_instance_without_conversion_oapg(
-        cls,
-        arg: typing.Any,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        # We have a Dynamic class and we are making an instance of it
-        if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, properties)
-        elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, items)
-        """
-        str = openapi str, date, and datetime
-        decimal.Decimal = openapi int and float
-        FileIO = openapi binary type and the user inputs a file
-        bytes = openapi binary type and the user inputs bytes
-        """
-        return super(Schema, cls).__new__(cls, arg)
-
-    @classmethod
-    def from_openapi_data_oapg(
-        cls,
-        arg: typing.Union[
-            str,
-            date,
-            datetime,
-            int,
-            float,
-            decimal.Decimal,
-            bool,
-            None,
-            'Schema',
-            dict,
-            frozendict.frozendict,
-            tuple,
-            list,
-            io.FileIO,
-            io.BufferedReader,
-            bytes
-        ],
-        _configuration: typing.Optional[Configuration]
-    ):
-        """
-        Schema from_openapi_data_oapg
-        """
-        from_server = True
-        validated_path_to_schemas = {}
-        arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas)
-        validation_metadata = ValidationMetadata(
-            from_server=from_server, configuration=_configuration, validated_path_to_schemas=validated_path_to_schemas)
-        path_to_schemas = cls.__get_new_cls(arg, validation_metadata)
-        new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
-            arg,
-            validation_metadata.path_to_item,
-            path_to_schemas
-        )
-        return new_inst
-
-    @staticmethod
-    def __get_input_dict(*args, **kwargs) -> frozendict.frozendict:
-        input_dict = {}
-        if args and isinstance(args[0], (dict, frozendict.frozendict)):
-            input_dict.update(args[0])
-        if kwargs:
-            input_dict.update(kwargs)
-        return frozendict.frozendict(input_dict)
-
-    @staticmethod
-    def __remove_unsets(kwargs):
-        return {key: val for key, val in kwargs.items() if val is not unset}
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
-        """
-        Schema __new__
-
-        Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
-            kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the Configuration that enables json schema validation keywords
-                like minItems, minLength etc
-
-        Note: double underscores are used here because pycharm thinks that these variables
-        are instance properties if they are named normally :(
-        """
-        __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
-            raise TypeError(
-                'No input given. args or kwargs must be given.'
-            )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
-        else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
-        __from_server = False
-        __validated_path_to_schemas = {}
-        __arg = cast_to_allowed_types(
-            __arg, __from_server, __validated_path_to_schemas)
-        __validation_metadata = ValidationMetadata(
-            configuration=_configuration, from_server=__from_server, validated_path_to_schemas=__validated_path_to_schemas)
-        __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata)
-        __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
-            __arg,
-            __validation_metadata.path_to_item,
-            __path_to_schemas
-        )
-
-    def __init__(
-        self,
-        *args: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[Configuration] = None,
-        **kwargs: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
-        ]
-    ):
-        """
-        this is needed to fix 'Unexpected argument' warning in pycharm
-        this code does nothing because all Schema instances are immutable
-        this means that all input data is passed into and used in new, and after the new instance is made
-        no new attributes are assigned and init is not used
-        """
-        pass
-
-"""
-import itertools
-data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-type_to_cls = {
-    'None': 'NoneClass',
-    'FrozenDict': 'frozendict.frozendict',
-    'Tuple': 'tuple',
-    'Str': 'str',
-    'Decimal': 'decimal.Decimal',
-    'Bool': 'BoolClass'
-}
-cls_tuples = [v for v in itertools.combinations(data_types, 5)]
-typed_classes = [f"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\n    pass" for cls_tuple in cls_tuples]
-for cls in typed_classes:
-    print(cls)
-object_classes = [f"{''.join(cls_tuple)}Mixin = object" for cls_tuple in cls_tuples]
-for cls in object_classes:
-    print(cls)
-"""
-if typing.TYPE_CHECKING:
-    # qty 1
-    NoneMixin = NoneClass
-    FrozenDictMixin = frozendict.frozendict
-    TupleMixin = tuple
-    StrMixin = str
-    DecimalMixin = decimal.Decimal
-    BoolMixin = BoolClass
-    BytesMixin = bytes
-    FileMixin = FileIO
-    # qty 2
-    class BinaryMixin(bytes, FileIO):
-        pass
-    class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
-        pass
-    class NoneTupleMixin(NoneClass, tuple):
-        pass
-    class NoneStrMixin(NoneClass, str):
-        pass
-    class NoneDecimalMixin(NoneClass, decimal.Decimal):
-        pass
-    class NoneBoolMixin(NoneClass, BoolClass):
-        pass
-    class FrozenDictTupleMixin(frozendict.frozendict, tuple):
-        pass
-    class FrozenDictStrMixin(frozendict.frozendict, str):
-        pass
-    class FrozenDictDecimalMixin(frozendict.frozendict, decimal.Decimal):
-        pass
-    class FrozenDictBoolMixin(frozendict.frozendict, BoolClass):
-        pass
-    class TupleStrMixin(tuple, str):
-        pass
-    class TupleDecimalMixin(tuple, decimal.Decimal):
-        pass
-    class TupleBoolMixin(tuple, BoolClass):
-        pass
-    class StrDecimalMixin(str, decimal.Decimal):
-        pass
-    class StrBoolMixin(str, BoolClass):
-        pass
-    class DecimalBoolMixin(decimal.Decimal, BoolClass):
-        pass
-    # qty 3
-    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
-        pass
-    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
-        pass
-    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
-        pass
-    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
-        pass
-    class NoneTupleStrMixin(NoneClass, tuple, str):
-        pass
-    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
-        pass
-    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
-        pass
-    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
-        pass
-    class NoneStrBoolMixin(NoneClass, str, BoolClass):
-        pass
-    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
-        pass
-    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
-        pass
-    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
-        pass
-    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
-        pass
-    class TupleStrBoolMixin(tuple, str, BoolClass):
-        pass
-    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
-        pass
-    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
-        pass
-    # qty 4
-    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
-        pass
-    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
-        pass
-    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
-        pass
-    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
-        pass
-    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
-        pass
-else:
-    # qty 1
-    class NoneMixin:
-        _types = {NoneClass}
-    class FrozenDictMixin:
-        _types = {frozendict.frozendict}
-    class TupleMixin:
-        _types = {tuple}
-    class StrMixin:
-        _types = {str}
-    class DecimalMixin:
-        _types = {decimal.Decimal}
-    class BoolMixin:
-        _types = {BoolClass}
-    class BytesMixin:
-        _types = {bytes}
-    class FileMixin:
-        _types = {FileIO}
-    # qty 2
-    class BinaryMixin:
-        _types = {bytes, FileIO}
-    class NoneFrozenDictMixin:
-        _types = {NoneClass, frozendict.frozendict}
-    class NoneTupleMixin:
-        _types = {NoneClass, tuple}
-    class NoneStrMixin:
-        _types = {NoneClass, str}
-    class NoneDecimalMixin:
-        _types = {NoneClass, decimal.Decimal}
-    class NoneBoolMixin:
-        _types = {NoneClass, BoolClass}
-    class FrozenDictTupleMixin:
-        _types = {frozendict.frozendict, tuple}
-    class FrozenDictStrMixin:
-        _types = {frozendict.frozendict, str}
-    class FrozenDictDecimalMixin:
-        _types = {frozendict.frozendict, decimal.Decimal}
-    class FrozenDictBoolMixin:
-        _types = {frozendict.frozendict, BoolClass}
-    class TupleStrMixin:
-        _types = {tuple, str}
-    class TupleDecimalMixin:
-        _types = {tuple, decimal.Decimal}
-    class TupleBoolMixin:
-        _types = {tuple, BoolClass}
-    class StrDecimalMixin:
-        _types = {str, decimal.Decimal}
-    class StrBoolMixin:
-        _types = {str, BoolClass}
-    class DecimalBoolMixin:
-        _types = {decimal.Decimal, BoolClass}
-    # qty 3
-    class NoneFrozenDictTupleMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple}
-    class NoneFrozenDictStrMixin:
-        _types = {NoneClass, frozendict.frozendict, str}
-    class NoneFrozenDictDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
-    class NoneFrozenDictBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, BoolClass}
-    class NoneTupleStrMixin:
-        _types = {NoneClass, tuple, str}
-    class NoneTupleDecimalMixin:
-        _types = {NoneClass, tuple, decimal.Decimal}
-    class NoneTupleBoolMixin:
-        _types = {NoneClass, tuple, BoolClass}
-    class NoneStrDecimalMixin:
-        _types = {NoneClass, str, decimal.Decimal}
-    class NoneStrBoolMixin:
-        _types = {NoneClass, str, BoolClass}
-    class NoneDecimalBoolMixin:
-        _types = {NoneClass, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrMixin:
-        _types = {frozendict.frozendict, tuple, str}
-    class FrozenDictTupleDecimalMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal}
-    class FrozenDictTupleBoolMixin:
-        _types = {frozendict.frozendict, tuple, BoolClass}
-    class FrozenDictStrDecimalMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal}
-    class FrozenDictStrBoolMixin:
-        _types = {frozendict.frozendict, str, BoolClass}
-    class FrozenDictDecimalBoolMixin:
-        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
-    class TupleStrDecimalMixin:
-        _types = {tuple, str, decimal.Decimal}
-    class TupleStrBoolMixin:
-        _types = {tuple, str, BoolClass}
-    class TupleDecimalBoolMixin:
-        _types = {tuple, decimal.Decimal, BoolClass}
-    class StrDecimalBoolMixin:
-        _types = {str, decimal.Decimal, BoolClass}
-    # qty 4
-    class NoneFrozenDictTupleStrMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str}
-    class NoneFrozenDictTupleDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
-    class NoneFrozenDictTupleBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
-    class NoneFrozenDictStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
-    class NoneFrozenDictStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
-    class NoneFrozenDictDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal}
-    class NoneTupleStrBoolMixin:
-        _types = {NoneClass, tuple, str, BoolClass}
-    class NoneTupleDecimalBoolMixin:
-        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
-    class NoneStrDecimalBoolMixin:
-        _types = {NoneClass, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
-    class FrozenDictTupleStrBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, BoolClass}
-    class FrozenDictTupleDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class FrozenDictStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class TupleStrDecimalBoolMixin:
-        _types = {tuple, str, decimal.Decimal, BoolClass}
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
-    class NoneFrozenDictTupleStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
-    class NoneFrozenDictTupleDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class NoneFrozenDictStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalBoolMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
-
-
-class ValidatorBase:
-    @staticmethod
-    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
-        """Returns true if JSON schema validation is enabled for the specified
-        validation keyword. This can be used to skip JSON schema structural validation
-        as requested in the configuration.
-        Note: the suffix _oapg stands for openapi python (experimental) generator and
-        it has been added to prevent collisions with other methods and properties
-
-        Args:
-            schema_keyword (string): the name of a JSON schema validation keyword.
-            configuration (Configuration): the configuration class.
-        """
-
-        return (configuration is None or
-            not hasattr(configuration, '_disabled_client_side_validations') or
-            schema_keyword not in configuration._disabled_client_side_validations)
-
-    @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
-        raise ApiValueError(
-            "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
-                value=value,
-                constraint_msg=constraint_msg,
-                constraint_value=constraint_value,
-                additional_txt=additional_txt,
-                path_to_item=path_to_item,
-            )
-        )
-
-
-class EnumBase:
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        EnumBase _validate_oapg
-        Validates that arg is in the enum's allowed values
-        """
-        try:
-            cls.MetaOapg.enum_value_to_name[arg]
-        except KeyError:
-            raise ApiValueError("Invalid value {} passed in to {}, allowed_values={}".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class BoolBase:
-    def is_true_oapg(self) -> bool:
-        """
-        A replacement for x is True
-        True if the instance is a BoolClass True Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self)
-
-    def is_false_oapg(self) -> bool:
-        """
-        A replacement for x is False
-        True if the instance is a BoolClass False Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self) is False
-
-
-class NoneBase:
-    def is_none_oapg(self) -> bool:
-        """
-        A replacement for x is None
-        True if the instance is a NoneClass None Singleton
-        """
-        if issubclass(self.__class__, NoneClass):
-            return True
-        return False
-
-
-class StrBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_str_oapg(self) -> str:
-        return self
-
-    @property
-    def as_date_oapg(self) -> date:
-        raise Exception('not implemented')
-
-    @property
-    def as_datetime_oapg(self) -> datetime:
-        raise Exception('not implemented')
-
-    @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        raise Exception('not implemented')
-
-    @property
-    def as_uuid_oapg(self) -> uuid.UUID:
-        raise Exception('not implemented')
-
-    @classmethod
-    def __check_str_validations(
-        cls,
-        arg: str,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_length') and
-                len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_length') and
-                len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('pattern', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'regex')):
-            for regex_dict in cls.MetaOapg.regex:
-                flags = regex_dict.get('flags', 0)
-                if not re.search(regex_dict['pattern'], arg, flags=flags):
-                    if flags != 0:
-                        # Don't print the regex flags if the flags are not
-                        # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
-                            value=arg,
-                            constraint_msg="must match regular expression",
-                            constraint_value=regex_dict['pattern'],
-                            path_to_item=validation_metadata.path_to_item,
-                            additional_txt=" with flags=`{}`".format(flags)
-                        )
-                    cls._raise_validation_errror_message_oapg(
-                        value=arg,
-                        constraint_msg="must match regular expression",
-                        constraint_value=regex_dict['pattern'],
-                        path_to_item=validation_metadata.path_to_item
-                    )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        StrBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, str):
-            cls.__check_str_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class UUIDBase:
-    @property
-    @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
-        return uuid.UUID(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                uuid.UUID(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Invalid value '{}' for type UUID at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        UUIDBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class CustomIsoparser(isoparser):
-
-    @_takes_ascii
-    def parse_isodatetime(self, dt_str):
-        components, pos = self._parse_isodate(dt_str)
-        if len(dt_str) > pos:
-            if self._sep is None or dt_str[pos:pos + 1] == self._sep:
-                components += self._parse_isotime(dt_str[pos + 1:])
-            else:
-                raise ValueError('String contains unknown ISO components')
-
-        if len(components) > 3 and components[3] == 24:
-            components[3] = 0
-            return datetime(*components) + timedelta(days=1)
-
-        if len(components) <= 3:
-            raise ValueError('Value is not a datetime')
-
-        return datetime(*components)
-
-    @_takes_ascii
-    def parse_isodate(self, datestr):
-        components, pos = self._parse_isodate(datestr)
-
-        if len(datestr) > pos:
-            raise ValueError('String contains invalid time components')
-
-        if len(components) > 3:
-            raise ValueError('String contains invalid time components')
-
-        return date(*components)
-
-
-DEFAULT_ISOPARSER = CustomIsoparser()
-
-
-class DateBase:
-    @property
-    @functools.lru_cache()
-    def as_date_oapg(self) -> date:
-        return DEFAULT_ISOPARSER.parse_isodate(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodate(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 date format. "
-                    "Invalid value '{}' for type date at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        DateBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DateTimeBase:
-    @property
-    @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime:
-        return DEFAULT_ISOPARSER.parse_isodatetime(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodatetime(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 datetime format. "
-                    "Invalid value '{}' for type datetime at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DateTimeBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DecimalBase:
-    """
-    A class for storing decimals that are sent over the wire as strings
-    These schemas must remain based on StrBase rather than NumberBase
-    because picking base classes must be deterministic
-    """
-
-    @property
-    @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        return decimal.Decimal(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                decimal.Decimal(arg)
-                return True
-            except decimal.InvalidOperation:
-                raise ApiValueError(
-                    "Value cannot be converted to a decimal. "
-                    "Invalid value '{}' for type decimal at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DecimalBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class NumberBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            """
-            Note: for some numbers like 9.0 they could be represented as an
-            integer but our code chooses to store them as
-            >>> Decimal('9.0').as_tuple()
-            DecimalTuple(sign=0, digits=(9, 0), exponent=-1)
-            so we can tell that the value came from a float and convert it back to a float
-            during later serialization
-            """
-            if self.as_tuple().exponent < 0:
-                # this could be represented as an integer but should be represented as a float
-                # because that's what it was serialized from
-                raise ApiValueError(f'{self} is not an integer')
-            self._as_int = int(self)
-            return self._as_int
-
-    @property
-    def as_float_oapg(self) -> float:
-        try:
-            return self._as_float
-        except AttributeError:
-            if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
-            self._as_float = float(self)
-            return self._as_float
-
-    @classmethod
-    def __check_numeric_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if cls._is_json_validation_enabled_oapg('multipleOf',
-                                      validation_metadata.configuration) and hasattr(cls.MetaOapg, 'multiple_of'):
-            multiple_of_value = cls.MetaOapg.multiple_of
-            if (not (float(arg) / multiple_of_value).is_integer()):
-                # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="value must be a multiple of",
-                    constraint_value=multiple_of_value,
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-        checking_max_or_min_values = any(
-            hasattr(cls.MetaOapg, validation_key) for validation_key in {
-                'exclusive_maximum',
-                'inclusive_maximum',
-                'exclusive_minimum',
-                'inclusive_minimum',
-            }
-        )
-        if not checking_max_or_min_values:
-            return
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_maximum') and
-                arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_maximum') and
-                arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_minimum') and
-                arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_minimum') and
-                arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_minimum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        NumberBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, decimal.Decimal):
-            cls.__check_numeric_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class ListBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def __validate_items(cls, list_items, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for items are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            list_items: the input list of items
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-
-        # if we have definitions for an items schema, use it
-        # otherwise accept anything
-        item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
-        item_cls = cls._get_class_oapg(item_cls)
-        path_to_schemas = {}
-        for i, value in enumerate(list_items):
-            item_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=validation_metadata.path_to_item+(i,),
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if item_validation_metadata.validation_ran_earlier(item_cls):
-                continue
-            other_path_to_schemas = item_cls._validate_oapg(
-                value, validation_metadata=item_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_tuple_validations(
-            cls, arg,
-            validation_metadata: ValidationMetadata):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_items') and
-                len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_items') and
-                len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('uniqueItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
-            unique_items = set(arg)
-            if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
-                    constraint_value='unique_items==True',
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        ListBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, tuple):
-            cls.__check_tuple_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, tuple):
-            return _path_to_schemas
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        other_path_to_schemas = cls.__validate_items(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_items_oapg(
-        cls: 'Schema',
-        arg: typing.List[typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        '''
-        ListBase _get_items_oapg
-        '''
-        cast_items = []
-
-        for i, value in enumerate(arg):
-            item_path_to_item = path_to_item + (i,)
-            item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
-                value,
-                item_path_to_item,
-                path_to_schemas
-            )
-            cast_items.append(new_value)
-
-        return cast_items
-
-
-class Discriminable:
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def _ensure_discriminator_value_present_oapg(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args):
-        if not args or args and disc_property_name not in args[0]:
-            # The input data does not contain the discriminator property
-            raise ApiValueError(
-                "Cannot deserialize input data due to missing discriminator. "
-                "The discriminator property '{}' is missing at path: {}".format(disc_property_name, validation_metadata.path_to_item)
-            )
-
-    @classmethod
-    def get_discriminated_class_oapg(cls, disc_property_name: str, disc_payload_value: str):
-        """
-        Used in schemas with discriminators
-        """
-        if not hasattr(cls.MetaOapg, 'discriminator'):
-            return None
-        disc = cls.MetaOapg.discriminator()
-        if disc_property_name not in disc:
-            return None
-        discriminated_cls = disc[disc_property_name].get(disc_payload_value)
-        if discriminated_cls is not None:
-            return discriminated_cls
-        if not hasattr(cls, 'MetaOapg'):
-            return None
-        elif not (
-            hasattr(cls.MetaOapg, 'all_of') or
-            hasattr(cls.MetaOapg, 'one_of') or
-            hasattr(cls.MetaOapg, 'any_of')
-        ):
-            return None
-        # TODO stop traveling if a cycle is hit
-        if hasattr(cls.MetaOapg, 'all_of'):
-            for allof_cls in cls.MetaOapg.all_of():
-                discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'one_of'):
-            for oneof_cls in cls.MetaOapg.one_of():
-                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'any_of'):
-            for anyof_cls in cls.MetaOapg.any_of():
-                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        return None
-
-
-class DictBase(Discriminable, ValidatorBase):
-
-    @classmethod
-    def __validate_arg_presence(cls, arg):
-        """
-        Ensures that:
-        - all required arguments are passed in
-        - the input variable names are valid
-            - present in properties or
-            - accepted because additionalProperties exists
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-            - a var_name is invalid if additional_properties == NotAnyTypeSchema
-            and var_name not in properties.__annotations__
-        - required properties were not passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        seen_required_properties = set()
-        invalid_arguments = []
-        required_property_names = getattr(cls.MetaOapg, 'required', set())
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name in arg:
-            if property_name in required_property_names:
-                seen_required_properties.add(property_name)
-            elif property_name in property_annotations:
-                continue
-            elif additional_properties is not NotAnyTypeSchema:
-                continue
-            else:
-                invalid_arguments.append(property_name)
-        missing_required_arguments = list(required_property_names - seen_required_properties)
-        if missing_required_arguments:
-            missing_required_arguments.sort()
-            raise ApiTypeError(
-                "{} is missing {} required argument{}: {}".format(
-                    cls.__name__,
-                    len(missing_required_arguments),
-                    "s" if len(missing_required_arguments) > 1 else "",
-                    missing_required_arguments
-                )
-            )
-        if invalid_arguments:
-            invalid_arguments.sort()
-            raise ApiTypeError(
-                "{} was passed {} invalid argument{}: {}".format(
-                    cls.__name__,
-                    len(invalid_arguments),
-                    "s" if len(invalid_arguments) > 1 else "",
-                    invalid_arguments
-                )
-            )
-
-    @classmethod
-    def __validate_args(cls, arg, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for properties are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        path_to_schemas = {}
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name, value in arg.items():
-            path_to_item = validation_metadata.path_to_item+(property_name,)
-            if property_name in property_annotations:
-                schema = property_annotations[property_name]
-            elif additional_properties is not NotAnyTypeSchema:
-                if additional_properties is UnsetAnyTypeSchema:
-                    """
-                    If additionalProperties is unset and this path_to_item does not yet have
-                    any validations on it, validate it.
-                    If it already has validations on it, skip this validation.
-                    """
-                    if path_to_item in path_to_schemas:
-                        continue
-                schema = additional_properties
-            else:
-                raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
-                    value, cls, validation_metadata.path_to_item+(property_name,)
-                ))
-            schema = cls._get_class_oapg(schema)
-            arg_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=path_to_item,
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if arg_validation_metadata.validation_ran_earlier(schema):
-                continue
-            other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_dict_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_properties') and
-                len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_properties') and
-                len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DictBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, frozendict.frozendict):
-            cls.__check_dict_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, frozendict.frozendict):
-            return _path_to_schemas
-        cls.__validate_arg_presence(arg)
-        other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
-        update(_path_to_schemas, other_path_to_schemas)
-        try:
-            discriminator = cls.MetaOapg.discriminator()
-        except AttributeError:
-            return _path_to_schemas
-        # discriminator exists
-        disc_prop_name = list(discriminator.keys())[0]
-        cls._ensure_discriminator_value_present_oapg(disc_prop_name, validation_metadata, arg)
-        discriminated_cls = cls.get_discriminated_class_oapg(
-            disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name])
-        if discriminated_cls is None:
-            raise ApiValueError(
-                "Invalid discriminator value was passed in to {}.{} Only the values {} are allowed at {}".format(
-                    cls.__name__,
-                    disc_prop_name,
-                    list(discriminator[disc_prop_name].keys()),
-                    validation_metadata.path_to_item + (disc_prop_name,)
-                )
-            )
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        if updated_vm.validation_ran_earlier(discriminated_cls):
-            return _path_to_schemas
-        other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_properties_oapg(
-        cls,
-        arg: typing.Dict[str, typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        """
-        DictBase _get_properties_oapg, this is how properties are set
-        These values already passed validation
-        """
-        dict_items = {}
-
-        for property_name_js, value in arg.items():
-            property_path_to_item = path_to_item + (property_name_js,)
-            property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
-                value,
-                property_path_to_item,
-                path_to_schemas
-            )
-            dict_items[property_name_js] = new_value
-
-        return dict_items
-
-    def __setattr__(self, name: str, value: typing.Any):
-        if not isinstance(self, FileIO):
-            raise AttributeError('property setting not supported on immutable instances')
-
-    def __getattr__(self, name: str):
-        """
-        for instance.name access
-        Properties are only type hinted for required properties
-        so that hasattr(instance, 'optionalProp') is False when that key is not present
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        if name not in self.__class__.__annotations__:
-            raise AttributeError(f"{self} has no attribute '{name}'")
-        try:
-            value = self[name]
-            return value
-        except KeyError as ex:
-            raise AttributeError(str(ex))
-
-    def __getitem__(self, name: str):
-        """
-        dict_instance[name] accessor
-        key errors thrown
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        return super().__getitem__(name)
-
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
-        # dict_instance[name] accessor
-        if not isinstance(self, frozendict.frozendict):
-            raise NotImplementedError()
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return unset
-
-
-def cast_to_allowed_types(
-    arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict.frozendict, list, tuple, bytes, Schema, io.FileIO, io.BufferedReader],
-    from_server: bool,
-    validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]],
-    path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-) -> typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO]:
-    """
-    Casts the input payload arg into the allowed types
-    The input validated_path_to_schemas is mutated by running this function
-
-    When from_server is False then
-    - date/datetime is cast to str
-    - int/float is cast to Decimal
-
-    If a Schema instance is passed in it is converted back to a primitive instance because
-    One may need to validate that data to the original Schema class AND additional different classes
-    those additional classes will need to be added to the new manufactured class for that payload
-    If the code didn't do this and kept the payload as a Schema instance it would fail to validate to other
-    Schema classes and the code wouldn't be able to mfg a new class that includes all valid schemas
-    TODO: store the validated schema classes in validation_metadata
-
-    Args:
-        arg: the payload
-        from_server: whether this payload came from the server or not
-        validated_path_to_schemas: a dict that stores the validated classes at any path location in the payload
-    """
-    if isinstance(arg, Schema):
-        # store the already run validations
-        schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            """
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            """
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
-        validated_path_to_schemas[path_to_item] = schema_classes
-
-    type_error = ApiTypeError(f"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}")
-    if isinstance(arg, str):
-        return str(arg)
-    elif isinstance(arg, (dict, frozendict.frozendict)):
-        return frozendict.frozendict({key: cast_to_allowed_types(val, from_server, validated_path_to_schemas, path_to_item + (key,)) for key, val in arg.items()})
-    elif isinstance(arg, (bool, BoolClass)):
-        """
-        this check must come before isinstance(arg, (int, float))
-        because isinstance(True, int) is True
-        """
-        if arg:
-            return BoolClass.TRUE
-        return BoolClass.FALSE
-    elif isinstance(arg, int):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, float):
-        decimal_from_float = decimal.Decimal(arg)
-        if decimal_from_float.as_integer_ratio()[1] == 1:
-            # 9.0 -> Decimal('9.0')
-            # 3.4028234663852886e+38 -> Decimal('340282346638528859811704183484516925440.0')
-            return decimal.Decimal(str(decimal_from_float)+'.0')
-        return decimal_from_float
-    elif isinstance(arg, (tuple, list)):
-        return tuple([cast_to_allowed_types(item, from_server, validated_path_to_schemas, path_to_item + (i,)) for i, item in enumerate(arg)])
-    elif isinstance(arg, (none_type, NoneClass)):
-        return NoneClass.NONE
-    elif isinstance(arg, (date, datetime)):
-        if not from_server:
-            return arg.isoformat()
-        raise type_error
-    elif isinstance(arg, uuid.UUID):
-        if not from_server:
-            return str(arg)
-        raise type_error
-    elif isinstance(arg, decimal.Decimal):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, bytes):
-        return bytes(arg)
-    elif isinstance(arg, (io.FileIO, io.BufferedReader)):
-        return FileIO(arg)
-    raise ValueError('Invalid type passed in got input={} type={}'.format(arg, type(arg)))
-
-
-class ComposedBase(Discriminable):
-
-    @classmethod
-    def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
-        path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of():
-            if validation_metadata.validation_ran_earlier(allof_cls):
-                continue
-            other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __get_oneof_class(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata,
-    ):
-        oneof_classes = []
-        path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of():
-            if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
-                oneof_classes.append(oneof_cls)
-                continue
-            if validation_metadata.validation_ran_earlier(oneof_cls):
-                oneof_classes.append(oneof_cls)
-                continue
-            try:
-                path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and oneof_cls is discriminated_cls:
-                    raise ex
-                continue
-            oneof_classes.append(oneof_cls)
-        if not oneof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the oneOf schemas matched the input data.".format(cls)
-            )
-        elif len(oneof_classes) > 1:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. Multiple "
-                "oneOf schemas {} matched the inputs, but a max of one is allowed.".format(cls, oneof_classes)
-            )
-        # exactly one class matches
-        return path_to_schemas
-
-    @classmethod
-    def __get_anyof_classes(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata
-    ):
-        anyof_classes = []
-        path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of():
-            if validation_metadata.validation_ran_earlier(anyof_cls):
-                anyof_classes.append(anyof_cls)
-                continue
-
-            try:
-                other_path_to_schemas = anyof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and anyof_cls is discriminated_cls:
-                    raise ex
-                continue
-            anyof_classes.append(anyof_cls)
-            update(path_to_schemas, other_path_to_schemas)
-        if not anyof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the anyOf schemas matched the input data.".format(cls)
-            )
-        return path_to_schemas
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        ComposedBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        # validation checking on types, validations, and enums
-        path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-
-        # process composed schema
-        discriminator = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
-            discriminator = cls.MetaOapg.discriminator()
-        discriminated_cls = None
-        if discriminator and arg and isinstance(arg, frozendict.frozendict):
-            disc_property_name = list(discriminator.keys())[0]
-            cls._ensure_discriminator_value_present_oapg(disc_property_name, updated_vm, arg)
-            # get discriminated_cls by looking at the dict in the current class
-            discriminated_cls = cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name])
-            if discriminated_cls is None:
-                raise ApiValueError(
-                    "Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}".format(
-                        arg[disc_property_name],
-                        cls.__name__,
-                        disc_property_name,
-                        list(discriminator[disc_property_name].keys()),
-                        updated_vm.path_to_item + (disc_property_name,)
-                    )
-                )
-
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'all_of'):
-            other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm)
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'one_of'):
-            other_path_to_schemas = cls.__get_oneof_class(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'any_of'):
-            other_path_to_schemas = cls.__get_anyof_classes(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        not_cls = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
-            not_cls = cls.MetaOapg.not_schema
-            not_cls = cls._get_class_oapg(not_cls)
-        if not_cls:
-            other_path_to_schemas = None
-            not_exception = ApiValueError(
-                "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
-                    arg,
-                    cls.__name__,
-                    not_cls.__name__,
-                )
-            )
-            if updated_vm.validation_ran_earlier(not_cls):
-                raise not_exception
-
-            try:
-                other_path_to_schemas = not_cls._validate_oapg(arg, validation_metadata=updated_vm)
-            except (ApiValueError, ApiTypeError):
-                pass
-            if other_path_to_schemas:
-                raise not_exception
-
-        if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
-            # TODO use an exception from this package here
-            assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
-        return path_to_schemas
-
-
-# DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
-class ComposedSchema(
-    ComposedBase,
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
-        if not args:
-            if not kwargs:
-                raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__))
-            args = (kwargs, )
-        return super().from_openapi_data_oapg(args[0], _configuration=_configuration)
-
-
-class ListSchema(
-    ListBase,
-    Schema,
-    TupleMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NoneSchema(
-    NoneBase,
-    Schema,
-    NoneMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NumberSchema(
-    NumberBase,
-    Schema,
-    DecimalMixin
-):
-    """
-    This is used for type: number with no format
-    Both integers AND floats are accepted
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class IntBase:
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            self._as_int = int(self)
-            return self._as_int
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-
-            denominator = arg.as_integer_ratio()[-1]
-            if denominator != 1:
-                raise ApiValueError(
-                    "Invalid value '{}' for type integer at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        IntBase _validate_oapg
-        TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class IntSchema(IntBase, NumberSchema):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class Int32Base:
-    __inclusive_minimum = decimal.Decimal(-2147483648)
-    __inclusive_maximum = decimal.Decimal(2147483647)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int32 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int32Schema(
-    Int32Base,
-    IntSchema
-):
-    pass
-
-
-class Int64Base:
-    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
-    __inclusive_maximum = decimal.Decimal(9223372036854775807)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int64 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int64Schema(
-    Int64Base,
-    IntSchema
-):
-    pass
-
-
-class Float32Base:
-    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type float at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Float32Schema(
-    Float32Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class Float64Base:
-    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type double at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-class Float64Schema(
-    Float64Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        # todo check format
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class StrSchema(
-    StrBase,
-    Schema,
-    StrMixin
-):
-    """
-    date + datetime string types must inherit from this class
-    That is because one can validate a str payload as both:
-    - type: string (format unset)
-    - type: string, format: date
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class UUIDSchema(UUIDBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateSchema(DateBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateTimeSchema(DateTimeBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DecimalSchema(DecimalBase, StrSchema):
-
-    def __new__(cls, arg: str, **kwargs: Configuration):
-        """
-        Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
-        which can be simple (str) or complex (dicts or lists with nested values)
-        Because casting is only done once and recursively casts all values prior to validation then for a potential
-        client side Decimal input if Decimal was accepted as an input in DecimalSchema then one would not know
-        if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
-        where it should stay as Decimal.
-        """
-        return super().__new__(cls, arg, **kwargs)
-
-
-class BytesSchema(
-    Schema,
-    BytesMixin
-):
-    """
-    this class will subclass bytes and is immutable
-    """
-    def __new__(cls, arg: bytes, **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class FileSchema(
-    Schema,
-    FileMixin
-):
-    """
-    This class is NOT immutable
-    Dynamic classes are built using it for example when AnyType allows in binary data
-    Al other schema classes ARE immutable
-    If one wanted to make this immutable one could make this a DictSchema with required properties:
-    - data = BytesSchema (which would be an immutable bytes based schema)
-    - file_name = StrSchema
-    and cast_to_allowed_types would convert bytes and file instances into dicts containing data + file_name
-    The downside would be that data would be stored in memory which one may not want to do for very large files
-
-    The developer is responsible for closing this file and deleting it
-
-    This class was kept as mutable:
-    - to allow file reading and writing to disk
-    - to be able to preserve file name info
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class BinaryBase:
-    pass
-
-
-class BinarySchema(
-    ComposedBase,
-    BinaryBase,
-    Schema,
-    BinaryMixin
-):
-    class MetaOapg:
-        @staticmethod
-        def one_of():
-            return [
-                BytesSchema,
-                FileSchema,
-            ]
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
-
-
-class BoolSchema(
-    BoolBase,
-    Schema,
-    BoolMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class AnyTypeSchema(
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
-):
-    # Python representation of a schema defined as true or {}
-    pass
-
-
-class UnsetAnyTypeSchema(AnyTypeSchema):
-    # Used when additionalProperties/items was not explicitly defined and a defining schema is needed
-    pass
-
-
-class NotAnyTypeSchema(
-    ComposedSchema,
-):
-    """
-    Python representation of a schema defined as false or {'not': {}}
-    Does not allow inputs in of AnyType
-    Note: validations on this class are never run because the code knows that no inputs will ever validate
-    """
-
-    class MetaOapg:
-        not_schema = AnyTypeSchema
-
-    def __new__(
-        cls,
-        *args,
-        _configuration: typing.Optional[Configuration] = None,
-    ) -> 'NotAnyTypeSchema':
-        return super().__new__(
-            cls,
-            *args,
-            _configuration=_configuration,
-        )
-
-
-class DictSchema(
-    DictBase,
-    Schema,
-    FrozenDictMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *args, **kwargs)
-
-
-schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
-
-
-@functools.lru_cache()
-def get_new_class(
-    class_name: str,
-    bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
-) -> typing.Type[Schema]:
-    """
-    Returns a new class that is made with the subclass bases
-    """
-    new_cls: typing.Type[Schema] = type(class_name, bases, {})
-    return new_cls
-
-
-LOG_CACHE_USAGE = False
-
-
-def log_cache_usage(cache_fn):
-    if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/__init__.py
index d6e814b4..e3d40f9e 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/__init__.py
@@ -5,25 +5,36 @@
 """
     CloudHarness Sample API
 
-    CloudHarness Sample api  # noqa: E501
+    CloudHarness Sample api
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 __version__ = "1.0.0"
 
+# import apis into sdk package
+from cloudharness_cli.samples.api.auth_api import AuthApi
+from cloudharness_cli.samples.api.resource_api import ResourceApi
+from cloudharness_cli.samples.api.test_api import TestApi
+from cloudharness_cli.samples.api.workflows_api import WorkflowsApi
+
 # import ApiClient
+from cloudharness_cli.samples.api_response import ApiResponse
 from cloudharness_cli.samples.api_client import ApiClient
-
-# import Configuration
 from cloudharness_cli.samples.configuration import Configuration
-
-# import exceptions
 from cloudharness_cli.samples.exceptions import OpenApiException
-from cloudharness_cli.samples.exceptions import ApiAttributeError
 from cloudharness_cli.samples.exceptions import ApiTypeError
 from cloudharness_cli.samples.exceptions import ApiValueError
 from cloudharness_cli.samples.exceptions import ApiKeyError
+from cloudharness_cli.samples.exceptions import ApiAttributeError
 from cloudharness_cli.samples.exceptions import ApiException
+
+# import models into sdk package
+from cloudharness_cli.samples.models.inline_response202 import InlineResponse202
+from cloudharness_cli.samples.models.inline_response202_task import InlineResponse202Task
+from cloudharness_cli.samples.models.sample_resource import SampleResource
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/__init__.py
new file mode 100644
index 00000000..bfa2acc1
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/__init__.py
@@ -0,0 +1,8 @@
+# flake8: noqa
+
+# import apis into api package
+from cloudharness_cli.samples.api.auth_api import AuthApi
+from cloudharness_cli.samples.api.resource_api import ResourceApi
+from cloudharness_cli.samples.api.test_api import TestApi
+from cloudharness_cli.samples.api.workflows_api import WorkflowsApi
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/auth_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/auth_api.py
new file mode 100644
index 00000000..a0cdfc34
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/auth_api.py
@@ -0,0 +1,531 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import StrictStr
+
+from cloudharness_cli.samples.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.samples.api_response import ApiResponse
+from cloudharness_cli.samples.rest import RESTResponseType
+
+
+class AuthApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def valid_cookie(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> str:
+        """Check if the token is valid. Get a token by logging into the base url
+
+        Check if the token is valid 
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._valid_cookie_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '401': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def valid_cookie_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[str]:
+        """Check if the token is valid. Get a token by logging into the base url
+
+        Check if the token is valid 
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._valid_cookie_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '401': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def valid_cookie_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Check if the token is valid. Get a token by logging into the base url
+
+        Check if the token is valid 
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._valid_cookie_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '401': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _valid_cookie_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'cookieAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/valid-cookie',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def valid_token(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> str:
+        """Check if the token is valid. Get a token by logging into the base url
+
+        Check if the token is valid 
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._valid_token_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '401': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def valid_token_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[str]:
+        """Check if the token is valid. Get a token by logging into the base url
+
+        Check if the token is valid 
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._valid_token_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '401': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def valid_token_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Check if the token is valid. Get a token by logging into the base url
+
+        Check if the token is valid 
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._valid_token_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '401': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _valid_token_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'bearerAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/valid',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/resource_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/resource_api.py
new file mode 100644
index 00000000..247b0b58
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/resource_api.py
@@ -0,0 +1,1356 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import Field, StrictStr
+from typing import List
+from typing_extensions import Annotated
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+
+from cloudharness_cli.samples.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.samples.api_response import ApiResponse
+from cloudharness_cli.samples.rest import RESTResponseType
+
+
+class ResourceApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def create_sample_resource(
+        self,
+        sample_resource: Annotated[SampleResource, Field(description="A new `SampleResource` to be created.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> None:
+        """Create a SampleResource
+
+        Creates a new instance of a `SampleResource`.
+
+        :param sample_resource: A new `SampleResource` to be created. (required)
+        :type sample_resource: SampleResource
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._create_sample_resource_serialize(
+            sample_resource=sample_resource,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '201': None,
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def create_sample_resource_with_http_info(
+        self,
+        sample_resource: Annotated[SampleResource, Field(description="A new `SampleResource` to be created.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[None]:
+        """Create a SampleResource
+
+        Creates a new instance of a `SampleResource`.
+
+        :param sample_resource: A new `SampleResource` to be created. (required)
+        :type sample_resource: SampleResource
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._create_sample_resource_serialize(
+            sample_resource=sample_resource,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '201': None,
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def create_sample_resource_without_preload_content(
+        self,
+        sample_resource: Annotated[SampleResource, Field(description="A new `SampleResource` to be created.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Create a SampleResource
+
+        Creates a new instance of a `SampleResource`.
+
+        :param sample_resource: A new `SampleResource` to be created. (required)
+        :type sample_resource: SampleResource
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._create_sample_resource_serialize(
+            sample_resource=sample_resource,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '201': None,
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _create_sample_resource_serialize(
+        self,
+        sample_resource,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+        if sample_resource is not None:
+            _body_params = sample_resource
+
+
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/sampleresources',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def delete_sample_resource(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> None:
+        """Delete a SampleResource
+
+        Deletes an existing `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._delete_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '204': None,
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def delete_sample_resource_with_http_info(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[None]:
+        """Delete a SampleResource
+
+        Deletes an existing `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._delete_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '204': None,
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def delete_sample_resource_without_preload_content(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Delete a SampleResource
+
+        Deletes an existing `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._delete_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '204': None,
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _delete_sample_resource_serialize(
+        self,
+        sampleresource_id,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if sampleresource_id is not None:
+            _path_params['sampleresourceId'] = sampleresource_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='DELETE',
+            resource_path='/sampleresources/{sampleresourceId}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def get_sample_resource(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> SampleResource:
+        """Get a SampleResource
+
+        Gets the details of a single instance of a `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "SampleResource",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def get_sample_resource_with_http_info(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[SampleResource]:
+        """Get a SampleResource
+
+        Gets the details of a single instance of a `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "SampleResource",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def get_sample_resource_without_preload_content(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Get a SampleResource
+
+        Gets the details of a single instance of a `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "SampleResource",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _get_sample_resource_serialize(
+        self,
+        sampleresource_id,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if sampleresource_id is not None:
+            _path_params['sampleresourceId'] = sampleresource_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/sampleresources/{sampleresourceId}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def get_sample_resources(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> List[SampleResource]:
+        """List All SampleResources
+
+        Gets a list of all `SampleResource` entities.
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_sample_resources_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "List[SampleResource]",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def get_sample_resources_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[List[SampleResource]]:
+        """List All SampleResources
+
+        Gets a list of all `SampleResource` entities.
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_sample_resources_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "List[SampleResource]",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def get_sample_resources_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """List All SampleResources
+
+        Gets a list of all `SampleResource` entities.
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_sample_resources_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "List[SampleResource]",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _get_sample_resources_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/sampleresources',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def update_sample_resource(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        sample_resource: Annotated[SampleResource, Field(description="Updated `SampleResource` information.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> None:
+        """Update a SampleResource
+
+        Updates an existing `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param sample_resource: Updated `SampleResource` information. (required)
+        :type sample_resource: SampleResource
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._update_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            sample_resource=sample_resource,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': None,
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def update_sample_resource_with_http_info(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        sample_resource: Annotated[SampleResource, Field(description="Updated `SampleResource` information.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[None]:
+        """Update a SampleResource
+
+        Updates an existing `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param sample_resource: Updated `SampleResource` information. (required)
+        :type sample_resource: SampleResource
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._update_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            sample_resource=sample_resource,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': None,
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def update_sample_resource_without_preload_content(
+        self,
+        sampleresource_id: Annotated[StrictStr, Field(description="A unique identifier for a `SampleResource`.")],
+        sample_resource: Annotated[SampleResource, Field(description="Updated `SampleResource` information.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Update a SampleResource
+
+        Updates an existing `SampleResource`.
+
+        :param sampleresource_id: A unique identifier for a `SampleResource`. (required)
+        :type sampleresource_id: str
+        :param sample_resource: Updated `SampleResource` information. (required)
+        :type sample_resource: SampleResource
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._update_sample_resource_serialize(
+            sampleresource_id=sampleresource_id,
+            sample_resource=sample_resource,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': None,
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _update_sample_resource_serialize(
+        self,
+        sampleresource_id,
+        sample_resource,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if sampleresource_id is not None:
+            _path_params['sampleresourceId'] = sampleresource_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+        if sample_resource is not None:
+            _body_params = sample_resource
+
+
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='PUT',
+            resource_path='/sampleresources/{sampleresourceId}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/test_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/test_api.py
new file mode 100644
index 00000000..6b10cae5
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/test_api.py
@@ -0,0 +1,527 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import StrictFloat, StrictInt, StrictStr
+from typing import Union
+
+from cloudharness_cli.samples.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.samples.api_response import ApiResponse
+from cloudharness_cli.samples.rest import RESTResponseType
+
+
+class TestApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def error(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> str:
+        """(Deprecated) test sentry is working
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /error is deprecated.", DeprecationWarning)
+
+        _param = self._error_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '500': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def error_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[str]:
+        """(Deprecated) test sentry is working
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /error is deprecated.", DeprecationWarning)
+
+        _param = self._error_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '500': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def error_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """(Deprecated) test sentry is working
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /error is deprecated.", DeprecationWarning)
+
+        _param = self._error_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '500': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _error_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/error',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def ping(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> float:
+        """test the application is up
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._ping_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "float",
+            '500': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def ping_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[float]:
+        """test the application is up
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._ping_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "float",
+            '500': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def ping_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """test the application is up
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._ping_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "float",
+            '500': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _ping_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/ping',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/workflows_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/workflows_api.py
new file mode 100644
index 00000000..4256614f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api/workflows_api.py
@@ -0,0 +1,800 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import Field, StrictFloat, StrictInt, StrictStr
+from typing import Any, Dict, Union
+from typing_extensions import Annotated
+from cloudharness_cli.samples.models.inline_response202 import InlineResponse202
+
+from cloudharness_cli.samples.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.samples.api_response import ApiResponse
+from cloudharness_cli.samples.rest import RESTResponseType
+
+
+class WorkflowsApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def submit_async(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> InlineResponse202:
+        """Send an asynchronous operation
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._submit_async_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': "InlineResponse202",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def submit_async_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[InlineResponse202]:
+        """Send an asynchronous operation
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._submit_async_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': "InlineResponse202",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def submit_async_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Send an asynchronous operation
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._submit_async_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': "InlineResponse202",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _submit_async_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/operation_async',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def submit_sync(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> object:
+        """(Deprecated) Send a synchronous operation
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /operation_sync is deprecated.", DeprecationWarning)
+
+        _param = self._submit_sync_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "object",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def submit_sync_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[object]:
+        """(Deprecated) Send a synchronous operation
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /operation_sync is deprecated.", DeprecationWarning)
+
+        _param = self._submit_sync_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "object",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def submit_sync_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """(Deprecated) Send a synchronous operation
+
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /operation_sync is deprecated.", DeprecationWarning)
+
+        _param = self._submit_sync_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "object",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _submit_sync_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/operation_sync',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def submit_sync_with_results(
+        self,
+        a: Annotated[Union[StrictFloat, StrictInt], Field(description="first number to sum")],
+        b: Annotated[Union[StrictFloat, StrictInt], Field(description="second number to sum")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> str:
+        """(Deprecated) Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+
+
+        :param a: first number to sum (required)
+        :type a: float
+        :param b: second number to sum (required)
+        :type b: float
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /operation_sync_results is deprecated.", DeprecationWarning)
+
+        _param = self._submit_sync_with_results_serialize(
+            a=a,
+            b=b,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def submit_sync_with_results_with_http_info(
+        self,
+        a: Annotated[Union[StrictFloat, StrictInt], Field(description="first number to sum")],
+        b: Annotated[Union[StrictFloat, StrictInt], Field(description="second number to sum")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[str]:
+        """(Deprecated) Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+
+
+        :param a: first number to sum (required)
+        :type a: float
+        :param b: second number to sum (required)
+        :type b: float
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /operation_sync_results is deprecated.", DeprecationWarning)
+
+        _param = self._submit_sync_with_results_serialize(
+            a=a,
+            b=b,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def submit_sync_with_results_without_preload_content(
+        self,
+        a: Annotated[Union[StrictFloat, StrictInt], Field(description="first number to sum")],
+        b: Annotated[Union[StrictFloat, StrictInt], Field(description="second number to sum")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """(Deprecated) Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+
+
+        :param a: first number to sum (required)
+        :type a: float
+        :param b: second number to sum (required)
+        :type b: float
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+        warnings.warn("GET /operation_sync_results is deprecated.", DeprecationWarning)
+
+        _param = self._submit_sync_with_results_serialize(
+            a=a,
+            b=b,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _submit_sync_with_results_serialize(
+        self,
+        a,
+        b,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        if a is not None:
+            
+            _query_params.append(('a', a))
+            
+        if b is not None:
+            
+            _query_params.append(('b', b))
+            
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/operation_sync_results',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_client.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_client.py
index d2ecfb6c..3485088c 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_client.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_client.py
@@ -1,1500 +1,782 @@
 # coding: utf-8
+
 """
     CloudHarness Sample API
 
-    CloudHarness Sample api  # noqa: E501
+    CloudHarness Sample api
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
-from dataclasses import dataclass
-from decimal import Decimal
-import enum
-import email
+import datetime
+from dateutil.parser import parse
+from enum import Enum
 import json
+import mimetypes
 import os
-import io
-import atexit
-from multiprocessing.pool import ThreadPool
 import re
 import tempfile
-import typing
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-from urllib.parse import urlparse, quote
-from urllib3.fields import RequestField as RequestFieldBase
 
-import frozendict
+from urllib.parse import quote
+from typing import Tuple, Optional, List, Dict, Union
+from pydantic import SecretStr
 
-from cloudharness_cli.samples import rest
 from cloudharness_cli.samples.configuration import Configuration
-from cloudharness_cli.samples.exceptions import ApiTypeError, ApiValueError
-from cloudharness_cli.samples.schemas import (
-    NoneClass,
-    BoolClass,
-    Schema,
-    FileIO,
-    BinarySchema,
-    date,
-    datetime,
-    none_type,
-    Unset,
-    unset,
+from cloudharness_cli.samples.api_response import ApiResponse, T as ApiResponseT
+import cloudharness_cli.samples.models
+from cloudharness_cli.samples import rest
+from cloudharness_cli.samples.exceptions import (
+    ApiValueError,
+    ApiException,
+    BadRequestException,
+    UnauthorizedException,
+    ForbiddenException,
+    NotFoundException,
+    ServiceException
 )
 
+RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]
 
-class RequestField(RequestFieldBase):
-    def __eq__(self, other):
-        if not isinstance(other, RequestField):
-            return False
-        return self.__dict__ == other.__dict__
-
-
-class JSONEncoder(json.JSONEncoder):
-    compact_separators = (',', ':')
-
-    def default(self, obj):
-        if isinstance(obj, str):
-            return str(obj)
-        elif isinstance(obj, float):
-            return float(obj)
-        elif isinstance(obj, int):
-            return int(obj)
-        elif isinstance(obj, Decimal):
-            if obj.as_tuple().exponent >= 0:
-                return int(obj)
-            return float(obj)
-        elif isinstance(obj, NoneClass):
-            return None
-        elif isinstance(obj, BoolClass):
-            return bool(obj)
-        elif isinstance(obj, (dict, frozendict.frozendict)):
-            return {key: self.default(val) for key, val in obj.items()}
-        elif isinstance(obj, (list, tuple)):
-            return [self.default(item) for item in obj]
-        raise ApiValueError('Unable to prepare type {} for serialization'.format(obj.__class__.__name__))
-
-
-class ParameterInType(enum.Enum):
-    QUERY = 'query'
-    HEADER = 'header'
-    PATH = 'path'
-    COOKIE = 'cookie'
-
-
-class ParameterStyle(enum.Enum):
-    MATRIX = 'matrix'
-    LABEL = 'label'
-    FORM = 'form'
-    SIMPLE = 'simple'
-    SPACE_DELIMITED = 'spaceDelimited'
-    PIPE_DELIMITED = 'pipeDelimited'
-    DEEP_OBJECT = 'deepObject'
-
-
-class PrefixSeparatorIterator:
-    # A class to store prefixes and separators for rfc6570 expansions
-
-    def __init__(self, prefix: str, separator: str):
-        self.prefix = prefix
-        self.separator = separator
-        self.first = True
-        if separator in {'.', '|', '%20'}:
-            item_separator = separator
-        else:
-            item_separator = ','
-        self.item_separator = item_separator
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.first:
-            self.first = False
-            return self.prefix
-        return self.separator
-
-
-class ParameterSerializerBase:
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        return False
-
-    @staticmethod
-    def __ref6570_item_value(in_data: typing.Any, percent_encode: bool):
-        """
-        Get representation if str/float/int/None/items in list/ values in dict
-        None is returned if an item is undefined, use cases are value=
-        - None
-        - []
-        - {}
-        - [None, None None]
-        - {'a': None, 'b': None}
-        """
-        if type(in_data) in {str, float, int}:
-            if percent_encode:
-                return quote(str(in_data))
-            return str(in_data)
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, list) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, dict) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        raise ApiValueError('Unable to generate a ref6570 item representation of {}'.format(in_data))
-
-    @staticmethod
-    def _to_dict(name: str, value: str):
-        return {name: value}
-
-    @classmethod
-    def __ref6570_str_float_int_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_value = cls.__ref6570_item_value(in_data, percent_encode)
-        if item_value is None or (item_value == '' and prefix_separator_iterator.separator == ';'):
-            return next(prefix_separator_iterator) + var_name_piece
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        return next(prefix_separator_iterator) + var_name_piece + value_pair_equals + item_value
+class ApiClient:
+    """Generic API client for OpenAPI client library builds.
 
-    @classmethod
-    def __ref6570_list_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_values = [cls.__ref6570_item_value(v, percent_encode) for v in in_data]
-        item_values = [v for v in item_values if v is not None]
-        if not item_values:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece +
-                value_pair_equals +
-                prefix_separator_iterator.item_separator.join(item_values)
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [var_name_piece + value_pair_equals + val for val in item_values]
-        )
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
 
-    @classmethod
-    def __ref6570_dict_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        in_data_transformed = {key: cls.__ref6570_item_value(val, percent_encode) for key, val in in_data.items()}
-        in_data_transformed = {key: val for key, val in in_data_transformed.items() if val is not None}
-        if not in_data_transformed:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece + value_pair_equals +
-                prefix_separator_iterator.item_separator.join(
-                    prefix_separator_iterator.item_separator.join(
-                        item_pair
-                    ) for item_pair in in_data_transformed.items()
-                )
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [key + '=' + val for key, val in in_data_transformed.items()]
-        )
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    """
 
-    @classmethod
-    def _ref6570_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator
-    ) -> str:
-        """
-        Separator is for separate variables like dict with explode true, not for array item separation
-        """
-        named_parameter_expansion = prefix_separator_iterator.separator in {'&', ';'}
-        var_name_piece = variable_name if named_parameter_expansion else ''
-        if type(in_data) in {str, float, int}:
-            return cls.__ref6570_str_float_int_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        elif isinstance(in_data, list):
-            return cls.__ref6570_list_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, dict):
-            return cls.__ref6570_dict_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        # bool, bytes, etc
-        raise ApiValueError('Unable to generate a ref6570 representation of {}'.format(in_data))
+    PRIMITIVE_TYPES = (float, bool, bytes, str, int)
+    NATIVE_TYPES_MAPPING = {
+        'int': int,
+        'long': int, # TODO remove as only py3 is supported?
+        'float': float,
+        'str': str,
+        'bool': bool,
+        'date': datetime.date,
+        'datetime': datetime.datetime,
+        'object': object,
+    }
+    _pool = None
 
+    def __init__(
+        self,
+        configuration=None,
+        header_name=None,
+        header_value=None,
+        cookie=None
+    ) -> None:
+        # use default configuration if none is provided
+        if configuration is None:
+            configuration = Configuration.get_default()
+        self.configuration = configuration
 
-class StyleFormSerializer(ParameterSerializerBase):
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        if style is ParameterStyle.FORM:
-            return True
-        return super()._get_default_explode(style)
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+        self.client_side_validation = configuration.client_side_validation
 
-    def _serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> str:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    def __enter__(self):
+        return self
 
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass
 
-class StyleSimpleSerializer(ParameterSerializerBase):
+    @property
+    def user_agent(self):
+        """User agent for this API client"""
+        return self.default_headers['User-Agent']
 
-    def _serialize_simple(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool
-    ) -> str:
-        prefix_separator_iterator = PrefixSeparatorIterator('', ',')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
 
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
 
-class JSONDetector:
-    """
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    """
-    __json_content_type_pattern = re.compile("application/[^+]*[+]?(json);?.*")
 
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
-@dataclass
-class ParameterBase(JSONDetector):
-    name: str
-    in_type: ParameterInType
-    required: bool
-    style: typing.Optional[ParameterStyle]
-    explode: typing.Optional[bool]
-    allow_reserved: typing.Optional[bool]
-    schema: typing.Optional[typing.Type[Schema]]
-    content: typing.Optional[typing.Dict[str, typing.Type[Schema]]]
-
-    __style_to_in_type = {
-        ParameterStyle.MATRIX: {ParameterInType.PATH},
-        ParameterStyle.LABEL: {ParameterInType.PATH},
-        ParameterStyle.FORM: {ParameterInType.QUERY, ParameterInType.COOKIE},
-        ParameterStyle.SIMPLE: {ParameterInType.PATH, ParameterInType.HEADER},
-        ParameterStyle.SPACE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.PIPE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.DEEP_OBJECT: {ParameterInType.QUERY},
-    }
-    __in_type_to_default_style = {
-        ParameterInType.QUERY: ParameterStyle.FORM,
-        ParameterInType.PATH: ParameterStyle.SIMPLE,
-        ParameterInType.HEADER: ParameterStyle.SIMPLE,
-        ParameterInType.COOKIE: ParameterStyle.FORM,
-    }
-    __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
-    _json_encoder = JSONEncoder()
+    _default = None
 
     @classmethod
-    def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
-        if style is None:
-            return
-        in_type_set = cls.__style_to_in_type[style]
-        if in_type not in in_type_set:
-            raise ValueError(
-                'Invalid style and in_type combination. For style={} only in_type={} are allowed'.format(
-                    style, in_type_set
-                )
-            )
-
-    def __init__(
-        self,
-        name: str,
-        in_type: ParameterInType,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        if schema is None and content is None:
-            raise ValueError('Value missing; Pass in either schema or content')
-        if schema and content:
-            raise ValueError('Too many values provided. Both schema and content were provided. Only one may be input')
-        if name in self.__disallowed_header_names and in_type is ParameterInType.HEADER:
-            raise ValueError('Invalid name, name may not be one of {}'.format(self.__disallowed_header_names))
-        self.__verify_style_to_in_type(style, in_type)
-        if content is None and style is None:
-            style = self.__in_type_to_default_style[in_type]
-        if content is not None and in_type in self.__in_type_to_default_style and len(content) != 1:
-            raise ValueError('Invalid content length, content length must equal 1')
-        self.in_type = in_type
-        self.name = name
-        self.required = required
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-        self.schema = schema
-        self.content = content
-
-    def _serialize_json(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        eliminate_whitespace: bool = False
-    ) -> str:
-        if eliminate_whitespace:
-            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
-        return json.dumps(in_data)
+    def get_default(cls):
+        """Return new instance of ApiClient.
 
+        This method returns newly created, based on default constructor,
+        object of ApiClient class or returns a copy of default
+        ApiClient.
 
-class PathParameter(ParameterBase, StyleSimpleSerializer):
+        :return: The ApiClient object.
+        """
+        if cls._default is None:
+            cls._default = ApiClient()
+        return cls._default
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.PATH,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of ApiClient.
 
-    def __serialize_label(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator('.', '.')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        It stores default ApiClient.
 
-    def __serialize_matrix(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator(';', ';')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        :param default: object of ApiClient.
+        """
+        cls._default = default
 
-    def __serialize_simple(
+    def param_serialize(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-    ) -> typing.Dict[str, str]:
-        value = self._serialize_simple(
-            in_data=in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True
-        )
-        return self._to_dict(self.name, value)
+        method,
+        resource_path,
+        path_params=None,
+        query_params=None,
+        header_params=None,
+        body=None,
+        post_params=None,
+        files=None, auth_settings=None,
+        collection_formats=None,
+        _host=None,
+        _request_auth=None
+    ) -> RequestSerialized:
+
+        """Builds the HTTP request params needed by the request.
+        :param method: Method to call.
+        :param resource_path: Path to method endpoint.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param files dict: key -> filename, value -> filepath,
+            for `multipart/form-data`.
+        :param collection_formats: dict of collection formats for path, query,
+            header, and post parameters.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :return: tuple of form (path, http_method, query_params, header_params,
+            body, post_params, files)
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> path
-                path:
-                    returns path_params: dict
-            label -> path
-                returns path_params
-            matrix -> path
-                returns path_params
-            """
-            if self.style:
-                if self.style is ParameterStyle.SIMPLE:
-                    return self.__serialize_simple(cast_in_data)
-                elif self.style is ParameterStyle.LABEL:
-                    return self.__serialize_label(cast_in_data)
-                elif self.style is ParameterStyle.MATRIX:
-                    return self.__serialize_matrix(cast_in_data)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class QueryParameter(ParameterBase, StyleFormSerializer):
+        config = self.configuration
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.QUERY,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+        # header parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+            header_params = dict(
+                self.parameters_to_tuples(header_params,collection_formats)
+            )
 
-    def __serialize_space_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            path_params = self.parameters_to_tuples(
+                path_params,
+                collection_formats
+            )
+            for k, v in path_params:
+                # specified safe chars, encode everything
+                resource_path = resource_path.replace(
+                    '{%s}' % k,
+                    quote(str(v), safe=config.safe_chars_for_path_param)
+                )
 
-    def __serialize_pipe_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # post parameters
+        if post_params or files:
+            post_params = post_params if post_params else []
+            post_params = self.sanitize_for_serialization(post_params)
+            post_params = self.parameters_to_tuples(
+                post_params,
+                collection_formats
+            )
+            if files:
+                post_params.extend(self.files_parameters(files))
 
-    def __serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._serialize_form(
-            in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
+        # auth setting
+        self.update_params_for_auth(
+            header_params,
+            query_params,
+            auth_settings,
+            resource_path,
+            method,
+            body,
+            request_auth=_request_auth
         )
-        return self._to_dict(self.name, value)
 
-    def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if self.style is ParameterStyle.FORM:
-            return PrefixSeparatorIterator('?', '&')
-        elif self.style is ParameterStyle.SPACE_DELIMITED:
-            return PrefixSeparatorIterator('', '%20')
-        elif self.style is ParameterStyle.PIPE_DELIMITED:
-            return PrefixSeparatorIterator('', '|')
-
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> query
-                query:
-                    - GET/HEAD/DELETE: could use fields
-                    - PUT/POST: must use urlencode to send parameters
-                    returns fields: tuple
-            spaceDelimited -> query
-                returns fields
-            pipeDelimited -> query
-                returns fields
-            deepObject -> query, https://github.com/OAI/OpenAPI-Specification/issues/1706
-                returns fields
-            """
-            if self.style:
-                # TODO update query ones to omit setting values when [] {} or None is input
-                if self.style is ParameterStyle.FORM:
-                    return self.__serialize_form(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.SPACE_DELIMITED:
-                    return self.__serialize_space_delimited(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.PIPE_DELIMITED:
-                    return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
-        # self.content will be length one
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
-                return self._to_dict(
-                    self.name,
-                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
-                )
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
 
+        # request url
+        if _host is None or self.configuration.ignore_operation_servers:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = _host + resource_path
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            url_query = self.parameters_to_url_query(
+                query_params,
+                collection_formats
+            )
+            url += "?" + url_query
 
-class CookieParameter(ParameterBase, StyleFormSerializer):
+        return method, url, header_params, body, post_params
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.COOKIE,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> cookie
-                returns fields: tuple
-            """
-            if self.style:
-                """
-                TODO add escaping of comma, space, equals
-                or turn encoding on
-                """
-                value = self._serialize_form(
-                    cast_in_data,
-                    explode=self.explode,
-                    name=self.name,
-                    percent_encode=False,
-                    prefix_separator_iterator=PrefixSeparatorIterator('', '&')
-                )
-                return self._to_dict(self.name, value)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class HeaderParameter(ParameterBase, StyleSimpleSerializer):
-    def __init__(
+    def call_api(
         self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.HEADER,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
-
-    @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
-        data = tuple(t for t in in_data if t)
-        headers = HTTPHeaderDict()
-        if not data:
-            return headers
-        headers.extend(data)
-        return headers
+        method,
+        url,
+        header_params=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ) -> rest.RESTResponse:
+        """Makes the HTTP request (synchronous)
+        :param method: Method to call.
+        :param url: Path to method endpoint.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param _request_timeout: timeout setting for this request.
+        :return: RESTResponse
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> header
-                headers: PoolManager needs a mapping, tuple is close
-                    returns headers: dict
-            """
-            if self.style:
-                value = self._serialize_simple(cast_in_data, self.name, self.explode, False)
-                return self.__to_headers(((self.name, value),))
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self.__to_headers(((self.name, value),))
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class Encoding:
-    def __init__(
-        self,
-        content_type: str,
-        headers: typing.Optional[typing.Dict[str, HeaderParameter]] = None,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: bool = False,
-    ):
-        self.content_type = content_type
-        self.headers = headers
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-
-
-@dataclass
-class MediaType:
-    """
-    Used to store request and response body schema information
-    encoding:
-        A map between a property name and its encoding information.
-        The key, being the property name, MUST exist in the schema as a property.
-        The encoding object SHALL only apply to requestBody objects when the media type is
-        multipart or application/x-www-form-urlencoded.
-    """
-    schema: typing.Optional[typing.Type[Schema]] = None
-    encoding: typing.Optional[typing.Dict[str, Encoding]] = None
+        try:
+            # perform request and return response
+            response_data = self.rest_client.request(
+                method, url,
+                headers=header_params,
+                body=body, post_params=post_params,
+                _request_timeout=_request_timeout
+            )
 
+        except ApiException as e:
+            raise e
 
-@dataclass
-class ApiResponse:
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        return response_data
 
-    def __init__(
+    def response_deserialize(
         self,
-        response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
-    ):
-        """
-        pycharm needs this to prevent 'Unexpected argument' warnings
+        response_data: rest.RESTResponse,
+        response_types_map: Optional[Dict[str, ApiResponseT]]=None
+    ) -> ApiResponse[ApiResponseT]:
+        """Deserializes response into an object.
+        :param response_data: RESTResponse object to be deserialized.
+        :param response_types_map: dict of response types.
+        :return: ApiResponse
         """
-        self.response = response
-        self.body = body
-        self.headers = headers
 
+        msg = "RESTResponse.read() must be called before passing it to response_deserialize()"
+        assert response_data.data is not None, msg
 
-@dataclass
-class ApiResponseWithoutDeserialization(ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]] = unset
-    headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
+        response_type = response_types_map.get(str(response_data.status), None)
+        if not response_type and isinstance(response_data.status, int) and 100 <= response_data.status <= 599:
+            # if not found, look for '1XX', '2XX', etc.
+            response_type = response_types_map.get(str(response_data.status)[0] + "XX", None)
 
+        # deserialize response data
+        response_text = None
+        return_data = None
+        try:
+            if response_type == "bytearray":
+                return_data = response_data.data
+            elif response_type == "file":
+                return_data = self.__deserialize_file(response_data)
+            elif response_type is not None:
+                match = None
+                content_type = response_data.getheader('content-type')
+                if content_type is not None:
+                    match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
+                encoding = match.group(1) if match else "utf-8"
+                response_text = response_data.data.decode(encoding)
+                return_data = self.deserialize(response_text, response_type, content_type)
+        finally:
+            if not 200 <= response_data.status <= 299:
+                raise ApiException.from_response(
+                    http_resp=response_data,
+                    body=response_text,
+                    data=return_data,
+                )
 
-class OpenApiResponse(JSONDetector):
-    __filename_content_disposition_pattern = re.compile('filename="(.+?)"')
+        return ApiResponse(
+            status_code = response_data.status,
+            data = return_data,
+            headers = response_data.getheaders(),
+            raw_data = response_data.data
+        )
 
-    def __init__(
-        self,
-        response_cls: typing.Type[ApiResponse] = ApiResponse,
-        content: typing.Optional[typing.Dict[str, MediaType]] = None,
-        headers: typing.Optional[typing.List[HeaderParameter]] = None,
-    ):
-        self.headers = headers
-        if content is not None and len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-        self.response_cls = response_cls
-
-    @staticmethod
-    def __deserialize_json(response: urllib3.HTTPResponse) -> typing.Any:
-        # python must be >= 3.9 so we can pass in bytes into json.loads
-        return json.loads(response.data)
-
-    @staticmethod
-    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
-        if response_url is None:
-            return None
-        url_path = urlparse(response_url).path
-        if url_path:
-            path_basename = os.path.basename(url_path)
-            if path_basename:
-                _filename, ext = os.path.splitext(path_basename)
-                if ext:
-                    return path_basename
-        return None
+    def sanitize_for_serialization(self, obj):
+        """Builds a JSON POST object.
 
-    @classmethod
-    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
-        if content_disposition is None:
-            return None
-        match = cls.__filename_content_disposition_pattern.search(content_disposition)
-        if not match:
-            return None
-        return match.group(1)
+        If obj is None, return None.
+        If obj is SecretStr, return obj.get_secret_value()
+        If obj is str, int, long, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, sanitize each element in the list.
+        If obj is dict, return the dict.
+        If obj is OpenAPI model, return the properties dict.
 
-    def __deserialize_application_octet_stream(
-        self, response: urllib3.HTTPResponse
-    ) -> typing.Union[bytes, io.BufferedReader]:
-        """
-        urllib3 use cases:
-        1. when preload_content=True (stream=False) then supports_chunked_reads is False and bytes are returned
-        2. when preload_content=False (stream=True) then supports_chunked_reads is True and
-            a file will be written and returned
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
         """
-        if response.supports_chunked_reads():
-            file_name = (
-                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
-                or self.__file_name_from_response_url(response.geturl())
+        if obj is None:
+            return None
+        elif isinstance(obj, Enum):
+            return obj.value
+        elif isinstance(obj, SecretStr):
+            return obj.get_secret_value()
+        elif isinstance(obj, self.PRIMITIVE_TYPES):
+            return obj
+        elif isinstance(obj, list):
+            return [
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
+            ]
+        elif isinstance(obj, tuple):
+            return tuple(
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
             )
+        elif isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
 
-            if file_name is None:
-                _fd, path = tempfile.mkstemp()
-            else:
-                path = os.path.join(tempfile.gettempdir(), file_name)
-
-            with open(path, 'wb') as new_file:
-                chunk_size = 1024
-                while True:
-                    data = response.read(chunk_size)
-                    if not data:
-                        break
-                    new_file.write(data)
-            # release_conn is needed for streaming connections only
-            response.release_conn()
-            new_file = open(path, 'rb')
-            return new_file
+        elif isinstance(obj, dict):
+            obj_dict = obj
         else:
-            return response.data
+            # Convert model obj to dict except
+            # attributes `openapi_types`, `attribute_map`
+            # and attributes which value is not None.
+            # Convert attribute name to json key in
+            # model definition for request.
+            if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj.__dict__
 
-    @staticmethod
-    def __deserialize_multipart_form_data(
-        response: urllib3.HTTPResponse
-    ) -> typing.Dict[str, typing.Any]:
-        msg = email.message_from_bytes(response.data)
         return {
-            part.get_param("name", header="Content-Disposition"): part.get_payload(
-                decode=True
-            ).decode(part.get_content_charset())
-            if part.get_content_charset()
-            else part.get_payload()
-            for part in msg.get_payload()
+            key: self.sanitize_for_serialization(val)
+            for key, val in obj_dict.items()
         }
 
-    def deserialize(self, response: urllib3.HTTPResponse, configuration: Configuration) -> ApiResponse:
-        content_type = response.getheader('content-type')
-        deserialized_body = unset
-        streamed = response.supports_chunked_reads()
-
-        deserialized_headers = unset
-        if self.headers is not None:
-            # TODO add header deserialiation here
-            pass
-
-        if self.content is not None:
-            if content_type not in self.content:
-                raise ApiValueError(
-                    f"Invalid content_type returned. Content_type='{content_type}' was returned "
-                    f"when only {str(set(self.content))} are defined for status_code={str(response.status)}"
-                )
-            body_schema = self.content[content_type].schema
-            if body_schema is None:
-                # some specs do not define response content media type schemas
-                return self.response_cls(
-                    response=response,
-                    headers=deserialized_headers,
-                    body=unset
-                )
+    def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
+        """Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: class literal for
+            deserialized object, or string of class name.
+        :param content_type: content type of response.
+
+        :return: deserialized object.
+        """
 
-            if self._content_type_is_json(content_type):
-                body_data = self.__deserialize_json(response)
-            elif content_type == 'application/octet-stream':
-                body_data = self.__deserialize_application_octet_stream(response)
-            elif content_type.startswith('multipart/form-data'):
-                body_data = self.__deserialize_multipart_form_data(response)
-                content_type = 'multipart/form-data'
+        # fetch data from response object
+        if content_type is None:
+            try:
+                data = json.loads(response_text)
+            except ValueError:
+                data = response_text
+        elif content_type.startswith("application/json"):
+            if response_text == "":
+                data = ""
             else:
-                raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
-        elif streamed:
-            response.release_conn()
-
-        return self.response_cls(
-            response=response,
-            headers=deserialized_headers,
-            body=deserialized_body
-        )
+                data = json.loads(response_text)
+        elif content_type.startswith("text/plain"):
+            data = response_text
+        else:
+            raise ApiException(
+                status=0,
+                reason="Unsupported content type: {0}".format(content_type)
+            )
 
+        return self.__deserialize(data, response_type)
 
-class ApiClient:
-    """Generic API client for OpenAPI client library builds.
+    def __deserialize(self, data, klass):
+        """Deserializes dict, list, str into an object.
 
-    OpenAPI generic API client. This client handles the client-
-    server communication, and is invariant across implementations. Specifics of
-    the methods and models for each application are generated from the OpenAPI
-    templates.
+        :param data: dict, list or str.
+        :param klass: class literal, or string of class name.
 
-    NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
+        :return: object.
+        """
+        if data is None:
+            return None
 
-    :param configuration: .Configuration object for this client
-    :param header_name: a header to pass when making calls to the API.
-    :param header_value: a header value to pass when making calls to
-        the API.
-    :param cookie: a cookie to include in the header when making calls
-        to the API
-    :param pool_threads: The number of threads to use for async requests
-        to the API. More threads means more concurrent API requests.
-    """
+        if isinstance(klass, str):
+            if klass.startswith('List['):
+                m = re.match(r'List\[(.*)]', klass)
+                assert m is not None, "Malformed List type definition"
+                sub_kls = m.group(1)
+                return [self.__deserialize(sub_data, sub_kls)
+                        for sub_data in data]
+
+            if klass.startswith('Dict['):
+                m = re.match(r'Dict\[([^,]*), (.*)]', klass)
+                assert m is not None, "Malformed Dict type definition"
+                sub_kls = m.group(2)
+                return {k: self.__deserialize(v, sub_kls)
+                        for k, v in data.items()}
+
+            # convert str to class
+            if klass in self.NATIVE_TYPES_MAPPING:
+                klass = self.NATIVE_TYPES_MAPPING[klass]
+            else:
+                klass = getattr(cloudharness_cli.samples.models, klass)
+
+        if klass in self.PRIMITIVE_TYPES:
+            return self.__deserialize_primitive(data, klass)
+        elif klass == object:
+            return self.__deserialize_object(data)
+        elif klass == datetime.date:
+            return self.__deserialize_date(data)
+        elif klass == datetime.datetime:
+            return self.__deserialize_datetime(data)
+        elif issubclass(klass, Enum):
+            return self.__deserialize_enum(data, klass)
+        else:
+            return self.__deserialize_model(data, klass)
 
-    _pool = None
+    def parameters_to_tuples(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __init__(
-        self,
-        configuration: typing.Optional[Configuration] = None,
-        header_name: typing.Optional[str] = None,
-        header_value: typing.Optional[str] = None,
-        cookie: typing.Optional[str] = None,
-        pool_threads: int = 1
-    ):
-        if configuration is None:
-            configuration = Configuration()
-        self.configuration = configuration
-        self.pool_threads = pool_threads
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: Parameters as list of tuples, collections formatted
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, value) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(str(value) for value in v)))
+            else:
+                new_params.append((k, v))
+        return new_params
 
-        self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = HTTPHeaderDict()
-        if header_name is not None:
-            self.default_headers[header_name] = header_value
-        self.cookie = cookie
-        # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+    def parameters_to_url_query(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __enter__(self):
-        return self
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: URL query string (e.g. a=Hello%20World&b=123)
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if isinstance(v, bool):
+                v = str(v).lower()
+            if isinstance(v, (int, float)):
+                v = str(v)
+            if isinstance(v, dict):
+                v = json.dumps(v)
+
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, str(value)) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(quote(str(value)) for value in v))
+                    )
+            else:
+                new_params.append((k, quote(str(v))))
 
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
+        return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def close(self):
-        if self._pool:
-            self._pool.close()
-            self._pool.join()
-            self._pool = None
-            if hasattr(atexit, 'unregister'):
-                atexit.unregister(self.close)
+    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
+        """Builds form parameters.
 
-    @property
-    def pool(self):
-        """Create thread pool on first request
-         avoids instantiating unused threadpool for blocking clients.
+        :param files: File parameters.
+        :return: Form parameters with files.
         """
-        if self._pool is None:
-            atexit.register(self.close)
-            self._pool = ThreadPool(self.pool_threads)
-        return self._pool
-
-    @property
-    def user_agent(self):
-        """User agent for this API client"""
-        return self.default_headers['User-Agent']
+        params = []
+        for k, v in files.items():
+            if isinstance(v, str):
+                with open(v, 'rb') as f:
+                    filename = os.path.basename(f.name)
+                    filedata = f.read()
+            elif isinstance(v, bytes):
+                filename = k
+                filedata = v
+            else:
+                raise ValueError("Unsupported file value")
+            mimetype = (
+                mimetypes.guess_type(filename)[0]
+                or 'application/octet-stream'
+            )
+            params.append(
+                tuple([k, tuple([filename, filedata, mimetype])])
+            )
+        return params
 
-    @user_agent.setter
-    def user_agent(self, value):
-        self.default_headers['User-Agent'] = value
+    def select_header_accept(self, accepts: List[str]) -> Optional[str]:
+        """Returns `Accept` based on an array of accepts provided.
 
-    def set_default_header(self, header_name, header_value):
-        self.default_headers[header_name] = header_value
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return None
 
-    def __call_api(
-        self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
+        for accept in accepts:
+            if re.search('json', accept, re.IGNORECASE):
+                return accept
 
-        # header parameters
-        used_headers = HTTPHeaderDict(self.default_headers)
-        if self.cookie:
-            headers['Cookie'] = self.cookie
+        return accepts[0]
 
-        # auth setting
-        self.update_params_for_auth(used_headers,
-                                    auth_settings, resource_path, method, body)
+    def select_header_content_type(self, content_types):
+        """Returns `Content-Type` based on an array of content_types provided.
 
-        # must happen after cookie setting and auth setting in case user is overriding those
-        if headers:
-            used_headers.update(headers)
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return None
 
-        # request url
-        if host is None:
-            url = self.configuration.host + resource_path
-        else:
-            # use server/host defined in path or operation instead
-            url = host + resource_path
+        for content_type in content_types:
+            if re.search('json', content_type, re.IGNORECASE):
+                return content_type
 
-        # perform request and return response
-        response = self.request(
-            method,
-            url,
-            headers=used_headers,
-            fields=fields,
-            body=body,
-            stream=stream,
-            timeout=timeout,
-        )
-        return response
+        return content_types[0]
 
-    def call_api(
+    def update_params_for_auth(
         self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        async_req: typing.Optional[bool] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request (synchronous) and returns deserialized data.
-
-        To make an async_req request, set the async_req parameter.
+        headers,
+        queries,
+        auth_settings,
+        resource_path,
+        method,
+        body,
+        request_auth=None
+    ) -> None:
+        """Updates header and query params based on authentication setting.
 
-        :param resource_path: Path to method endpoint.
-        :param method: Method to call.
-        :param headers: Header parameters to be
-            placed in the request header.
-        :param body: Request body.
-        :param fields: Request post form parameters,
-            for `application/x-www-form-urlencoded`, `multipart/form-data`.
-        :param auth_settings: Auth Settings names for the request.
-        :param async_req: execute request asynchronously
-        :type async_req: bool, optional TODO remove, unused
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                 be returned without reading/decoding response
-                                 data. Also when True, if the openapi spec describes a file download,
-                                 the data will be written to a local filesystme file and the BinarySchema
-                                 instance will also inherit from FileSchema and FileIO
-                                 Default is False.
-        :type stream: bool, optional
-        :param timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param host: api endpoint host
-        :return:
-            If async_req parameter is True,
-            the request will be called asynchronously.
-            The method will return the request thread.
-            If parameter async_req is False or missing,
-            then the method will return the response directly.
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
+        if not auth_settings:
+            return
 
-        if not async_req:
-            return self.__call_api(
-                resource_path,
-                method,
+        if request_auth:
+            self._apply_auth_params(
                 headers,
-                body,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
-            )
-
-        return self.pool.apply_async(
-            self.__call_api,
-            (
+                queries,
                 resource_path,
                 method,
-                headers,
                 body,
-                json,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
+                request_auth
             )
-        )
-
-    def request(
+        else:
+            for auth in auth_settings:
+                auth_setting = self.configuration.auth_settings().get(auth)
+                if auth_setting:
+                    self._apply_auth_params(
+                        headers,
+                        queries,
+                        resource_path,
+                        method,
+                        body,
+                        auth_setting
+                    )
+
+    def _apply_auth_params(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request using RESTClient."""
-        if method == "GET":
-            return self.rest_client.GET(url,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        headers=headers)
-        elif method == "HEAD":
-            return self.rest_client.HEAD(url,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         headers=headers)
-        elif method == "OPTIONS":
-            return self.rest_client.OPTIONS(url,
-                                            headers=headers,
-                                            fields=fields,
-                                            stream=stream,
-                                            timeout=timeout,
-                                            body=body)
-        elif method == "POST":
-            return self.rest_client.POST(url,
-                                         headers=headers,
-                                         fields=fields,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         body=body)
-        elif method == "PUT":
-            return self.rest_client.PUT(url,
-                                        headers=headers,
-                                        fields=fields,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        body=body)
-        elif method == "PATCH":
-            return self.rest_client.PATCH(url,
-                                          headers=headers,
-                                          fields=fields,
-                                          stream=stream,
-                                          timeout=timeout,
-                                          body=body)
-        elif method == "DELETE":
-            return self.rest_client.DELETE(url,
-                                           headers=headers,
-                                           stream=stream,
-                                           timeout=timeout,
-                                           body=body)
+        headers,
+        queries,
+        resource_path,
+        method,
+        body,
+        auth_setting
+    ) -> None:
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            if auth_setting['type'] != 'http-signature':
+                headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            queries.append((auth_setting['key'], auth_setting['value']))
         else:
             raise ApiValueError(
-                "http method must be `GET`, `HEAD`, `OPTIONS`,"
-                " `POST`, `PATCH`, `PUT` or `DELETE`."
+                'Authentication token must be in `query` or `header`'
             )
 
-    def update_params_for_auth(self, headers, auth_settings,
-                               resource_path, method, body):
-        """Updates header and query params based on authentication setting.
+    def __deserialize_file(self, response):
+        """Deserializes body to file
 
-        :param headers: Header parameters dict to be updated.
-        :param auth_settings: Authentication setting identifiers list.
-        :param resource_path: A string representation of the HTTP request resource path.
-        :param method: A string representation of the HTTP request method.
-        :param body: A object representing the body of the HTTP request.
-            The object type is the return value of _encoder.default().
-        """
-        if not auth_settings:
-            return
+        Saves response body into a file in a temporary folder,
+        using the filename from the `Content-Disposition` header if provided.
 
-        for auth in auth_settings:
-            auth_setting = self.configuration.auth_settings().get(auth)
-            if not auth_setting:
-                continue
-            if auth_setting['in'] == 'cookie':
-                headers.add('Cookie', auth_setting['value'])
-            elif auth_setting['in'] == 'header':
-                if auth_setting['type'] != 'http-signature':
-                    headers.add(auth_setting['key'], auth_setting['value'])
-            elif auth_setting['in'] == 'query':
-                """ TODO implement auth in query
-                need to pass in prefix_separator_iterator
-                and need to output resource_path with query params added
-                """
-                raise ApiValueError("Auth in query not yet implemented")
-            else:
-                raise ApiValueError(
-                    'Authentication token must be in `query` or `header`'
-                )
+        handle file downloading
+        save response body into a tmp file and return the instance
 
+        :param response:  RESTResponse.
+        :return: file path.
+        """
+        fd, path = tempfile.mkstemp(dir=self.configuration.temp_folder_path)
+        os.close(fd)
+        os.remove(path)
+
+        content_disposition = response.getheader("Content-Disposition")
+        if content_disposition:
+            m = re.search(
+                r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                content_disposition
+            )
+            assert m is not None, "Unexpected 'content-disposition' header value"
+            filename = m.group(1)
+            path = os.path.join(os.path.dirname(path), filename)
 
-class Api:
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
+        with open(path, "wb") as f:
+            f.write(response.data)
 
-    Do not edit the class manually.
-    """
+        return path
+
+    def __deserialize_primitive(self, data, klass):
+        """Deserializes string to primitive type.
 
-    def __init__(self, api_client: typing.Optional[ApiClient] = None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
+        :param data: str.
+        :param klass: class literal.
 
-    @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+        :return: int, long, float, str, bool.
         """
-        Ensures that:
-        - required keys are present
-        - additional properties are not input
-        - value stored under required keys do not have the value unset
-        Note: detailed value checking is done in schema classes
+        try:
+            return klass(data)
+        except UnicodeEncodeError:
+            return str(data)
+        except TypeError:
+            return data
+
+    def __deserialize_object(self, value):
+        """Return an original value.
+
+        :return: object.
         """
-        missing_required_keys = []
-        required_keys_with_unset_values = []
-        for required_key in cls.__required_keys__:
-            if required_key not in data:
-                missing_required_keys.append(required_key)
-                continue
-            value = data[required_key]
-            if value is unset:
-                required_keys_with_unset_values.append(required_key)
-        if missing_required_keys:
-            raise ApiTypeError(
-                '{} missing {} required arguments: {}'.format(
-                    cls.__name__, len(missing_required_keys), missing_required_keys
-                 )
-             )
-        if required_keys_with_unset_values:
-            raise ApiValueError(
-                '{} contains invalid unset values for {} required keys: {}'.format(
-                    cls.__name__, len(required_keys_with_unset_values), required_keys_with_unset_values
-                )
-            )
+        return value
 
-        disallowed_additional_keys = []
-        for key in data:
-            if key in cls.__required_keys__ or key in cls.__optional_keys__:
-                continue
-            disallowed_additional_keys.append(key)
-        if disallowed_additional_keys:
-            raise ApiTypeError(
-                '{} got {} unexpected keyword arguments: {}'.format(
-                    cls.__name__, len(disallowed_additional_keys), disallowed_additional_keys
-                )
-            )
+    def __deserialize_date(self, string):
+        """Deserializes string to date.
 
-    def _get_host_oapg(
-        self,
-        operation_id: str,
-        servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
-        host_index: typing.Optional[int] = None
-    ) -> typing.Optional[str]:
-        configuration = self.api_client.configuration
+        :param string: str.
+        :return: date.
+        """
         try:
-            if host_index is None:
-                index = configuration.server_operation_index.get(
-                    operation_id, configuration.server_index
-                )
-            else:
-                index = host_index
-            server_variables = configuration.server_operation_variables.get(
-                operation_id, configuration.server_variables
-            )
-            host = configuration.get_host_from_settings(
-                index, variables=server_variables, servers=servers
+            return parse(string).date()
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason="Failed to parse `{0}` as date object".format(string)
             )
-        except IndexError:
-            if servers:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(servers)
-                )
-            host = None
-        return host
-
-
-class SerializedRequestBody(typing_extensions.TypedDict, total=False):
-    body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
+    def __deserialize_datetime(self, string):
+        """Deserializes string to datetime.
 
-class RequestBody(StyleFormSerializer, JSONDetector):
-    """
-    A request body parameter
-    content: content_type to MediaType Schema info
-    """
-    __json_encoder = JSONEncoder()
+        The string should be in iso8601 datetime format.
 
-    def __init__(
-        self,
-        content: typing.Dict[str, MediaType],
-        required: bool = False,
-    ):
-        self.required = required
-        if len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-
-    def __serialize_json(
-        self,
-        in_data: typing.Any
-    ) -> typing.Dict[str, bytes]:
-        in_data = self.__json_encoder.default(in_data)
-        json_str = json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode(
-            "utf-8"
-        )
-        return dict(body=json_str)
-
-    @staticmethod
-    def __serialize_text_plain(in_data: typing.Any) -> typing.Dict[str, str]:
-        if isinstance(in_data, frozendict.frozendict):
-            raise ValueError('Unable to serialize type frozendict.frozendict to text/plain')
-        elif isinstance(in_data, tuple):
-            raise ValueError('Unable to serialize type tuple to text/plain')
-        elif isinstance(in_data, NoneClass):
-            raise ValueError('Unable to serialize type NoneClass to text/plain')
-        elif isinstance(in_data, BoolClass):
-            raise ValueError('Unable to serialize type BoolClass to text/plain')
-        return dict(body=str(in_data))
-
-    def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
-        json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
-
-    def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
-        if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
-        elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
-        elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
+        :param string: str.
+        :return: datetime.
+        """
+        try:
+            return parse(string)
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as datetime object"
+                    .format(string)
+                )
             )
-            value.close()
-            return request_field
-        else:
-            return self.__multipart_json_item(key=key, value=value)
 
-    def __serialize_multipart_form_data(
-        self, in_data: Schema
-    ) -> typing.Dict[str, typing.Tuple[RequestField, ...]]:
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(f'Unable to serialize {in_data} to multipart/form-data because it is not a dict of data')
+    def __deserialize_enum(self, data, klass):
+        """Deserializes primitive type to enum.
+
+        :param data: primitive type.
+        :param klass: class literal.
+        :return: enum value.
         """
-        In a multipart/form-data request body, each schema property, or each element of a schema array property,
-        takes a section in the payload with an internal header as defined by RFC7578. The serialization strategy
-        for each property of a multipart/form-data request body can be specified in an associated Encoding Object.
+        try:
+            return klass(data)
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as `{1}`"
+                    .format(data, klass)
+                )
+            )
 
-        When passing in multipart types, boundaries MAY be used to separate sections of the content being
-        transferred – thus, the following default Content-Types are defined for multipart:
+    def __deserialize_model(self, data, klass):
+        """Deserializes list or dict to model.
 
-        If the (object) property is a primitive, or an array of primitive values, the default Content-Type is text/plain
-        If the property is complex, or an array of complex values, the default Content-Type is application/json
-            Question: how is the array of primitives encoded?
-        If the property is a type: string with a contentEncoding, the default Content-Type is application/octet-stream
-        """
-        fields = []
-        for key, value in in_data.items():
-            if isinstance(value, tuple):
-                if value:
-                    # values use explode = True, so the code makes a RequestField for each item with name=key
-                    for item in value:
-                        request_field = self.__multipart_form_item(key=key, value=item)
-                        fields.append(request_field)
-                else:
-                    # send an empty array as json because exploding will not send it
-                    request_field = self.__multipart_json_item(key=key, value=value)
-                    fields.append(request_field)
-            else:
-                request_field = self.__multipart_form_item(key=key, value=value)
-                fields.append(request_field)
-
-        return dict(fields=tuple(fields))
-
-    def __serialize_application_octet_stream(self, in_data: BinarySchema) -> typing.Dict[str, bytes]:
-        if isinstance(in_data, bytes):
-            return dict(body=in_data)
-        # FileIO type
-        result = dict(body=in_data.read())
-        in_data.close()
-        return result
-
-    def __serialize_application_x_www_form_data(
-        self, in_data: typing.Any
-    ) -> SerializedRequestBody:
+        :param data: dict, list.
+        :param klass: class literal.
+        :return: model object.
         """
-        POST submission of form data in body
-        """
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(
-                f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
-        cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
-        return dict(body=value)
-
-    def serialize(
-        self, in_data: typing.Any, content_type: str
-    ) -> SerializedRequestBody:
-        """
-        If a str is returned then the result will be assigned to data when making the request
-        If a tuple is returned then the result will be used as fields input in encode_multipart_formdata
-        Return a tuple of
 
-        The key of the return dict is
-        - body for application/json
-        - encode_multipart and fields for multipart/form-data
-        """
-        media_type = self.content[content_type]
-        if isinstance(in_data, media_type.schema):
-            cast_in_data = in_data
-        elif isinstance(in_data, (dict, frozendict.frozendict)) and in_data:
-            cast_in_data = media_type.schema(**in_data)
-        else:
-            cast_in_data = media_type.schema(in_data)
-        # TODO check for and use encoding if it exists
-        # and content_type is multipart or application/x-www-form-urlencoded
-        if self._content_type_is_json(content_type):
-            return self.__serialize_json(cast_in_data)
-        elif content_type == 'text/plain':
-            return self.__serialize_text_plain(cast_in_data)
-        elif content_type == 'multipart/form-data':
-            return self.__serialize_multipart_form_data(cast_in_data)
-        elif content_type == 'application/x-www-form-urlencoded':
-            return self.__serialize_application_x_www_form_data(cast_in_data)
-        elif content_type == 'application/octet-stream':
-            return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
+        return klass.from_dict(data)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_response.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_response.py
new file mode 100644
index 00000000..9bc7c11f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/api_response.py
@@ -0,0 +1,21 @@
+"""API response object."""
+
+from __future__ import annotations
+from typing import Optional, Generic, Mapping, TypeVar
+from pydantic import Field, StrictInt, StrictBytes, BaseModel
+
+T = TypeVar("T")
+
+class ApiResponse(BaseModel, Generic[T]):
+    """
+    API response object
+    """
+
+    status_code: StrictInt = Field(description="HTTP status code")
+    headers: Optional[Mapping[str, str]] = Field(None, description="HTTP headers")
+    data: T = Field(description="Deserialized data given the data type")
+    raw_data: StrictBytes = Field(description="Raw data (HTTP response body)")
+
+    model_config = {
+        "arbitrary_types_allowed": True
+    }
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/__init__.py
deleted file mode 100644
index 7840f772..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints then import them from
-# tags, paths, or path_to_api, or tag_to_api
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/path_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/path_to_api.py
deleted file mode 100644
index 0cc5ed78..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/path_to_api.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.samples.paths import PathValues
-from cloudharness_cli.samples.apis.paths.error import Error
-from cloudharness_cli.samples.apis.paths.ping import Ping
-from cloudharness_cli.samples.apis.paths.valid import Valid
-from cloudharness_cli.samples.apis.paths.valid_cookie import ValidCookie
-from cloudharness_cli.samples.apis.paths.sampleresources import Sampleresources
-from cloudharness_cli.samples.apis.paths.sampleresources_sampleresource_id import SampleresourcesSampleresourceId
-from cloudharness_cli.samples.apis.paths.operation_async import OperationAsync
-from cloudharness_cli.samples.apis.paths.operation_sync import OperationSync
-from cloudharness_cli.samples.apis.paths.operation_sync_results import OperationSyncResults
-
-PathToApi = typing_extensions.TypedDict(
-    'PathToApi',
-    {
-        PathValues.ERROR: Error,
-        PathValues.PING: Ping,
-        PathValues.VALID: Valid,
-        PathValues.VALIDCOOKIE: ValidCookie,
-        PathValues.SAMPLERESOURCES: Sampleresources,
-        PathValues.SAMPLERESOURCES_SAMPLERESOURCE_ID: SampleresourcesSampleresourceId,
-        PathValues.OPERATION_ASYNC: OperationAsync,
-        PathValues.OPERATION_SYNC: OperationSync,
-        PathValues.OPERATION_SYNC_RESULTS: OperationSyncResults,
-    }
-)
-
-path_to_api = PathToApi(
-    {
-        PathValues.ERROR: Error,
-        PathValues.PING: Ping,
-        PathValues.VALID: Valid,
-        PathValues.VALIDCOOKIE: ValidCookie,
-        PathValues.SAMPLERESOURCES: Sampleresources,
-        PathValues.SAMPLERESOURCES_SAMPLERESOURCE_ID: SampleresourcesSampleresourceId,
-        PathValues.OPERATION_ASYNC: OperationAsync,
-        PathValues.OPERATION_SYNC: OperationSync,
-        PathValues.OPERATION_SYNC_RESULTS: OperationSyncResults,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/__init__.py
deleted file mode 100644
index a8ed00d2..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.apis.path_to_api import path_to_api
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/error.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/error.py
deleted file mode 100644
index d7aaf40b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/error.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.error.get import ApiForget
-
-
-class Error(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_async.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_async.py
deleted file mode 100644
index 04e40332..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_async.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.operation_async.get import ApiForget
-
-
-class OperationAsync(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync.py
deleted file mode 100644
index 83b40649..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.operation_sync.get import ApiForget
-
-
-class OperationSync(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync_results.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync_results.py
deleted file mode 100644
index fa72ae66..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/operation_sync_results.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.operation_sync_results.get import ApiForget
-
-
-class OperationSyncResults(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/ping.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/ping.py
deleted file mode 100644
index b8e3b568..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/ping.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.ping.get import ApiForget
-
-
-class Ping(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources.py
deleted file mode 100644
index 3b513ab0..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from cloudharness_cli.samples.paths.sampleresources.get import ApiForget
-from cloudharness_cli.samples.paths.sampleresources.post import ApiForpost
-
-
-class Sampleresources(
-    ApiForget,
-    ApiForpost,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources_sampleresource_id.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources_sampleresource_id.py
deleted file mode 100644
index 1e8b7793..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/sampleresources_sampleresource_id.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id.get import ApiForget
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id.put import ApiForput
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id.delete import ApiFordelete
-
-
-class SampleresourcesSampleresourceId(
-    ApiForget,
-    ApiForput,
-    ApiFordelete,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid.py
deleted file mode 100644
index 930a13b9..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.valid.get import ApiForget
-
-
-class Valid(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid_cookie.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid_cookie.py
deleted file mode 100644
index d843d017..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/paths/valid_cookie.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.samples.paths.valid_cookie.get import ApiForget
-
-
-class ValidCookie(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tag_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tag_to_api.py
deleted file mode 100644
index a6c707bd..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tag_to_api.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.samples.apis.tags import TagValues
-from cloudharness_cli.samples.apis.tags.auth_api import AuthApi
-from cloudharness_cli.samples.apis.tags.workflows_api import WorkflowsApi
-from cloudharness_cli.samples.apis.tags.resource_api import ResourceApi
-from cloudharness_cli.samples.apis.tags.test_api import TestApi
-
-TagToApi = typing_extensions.TypedDict(
-    'TagToApi',
-    {
-        TagValues.AUTH: AuthApi,
-        TagValues.WORKFLOWS: WorkflowsApi,
-        TagValues.RESOURCE: ResourceApi,
-        TagValues.TEST: TestApi,
-    }
-)
-
-tag_to_api = TagToApi(
-    {
-        TagValues.AUTH: AuthApi,
-        TagValues.WORKFLOWS: WorkflowsApi,
-        TagValues.RESOURCE: ResourceApi,
-        TagValues.TEST: TestApi,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/__init__.py
deleted file mode 100644
index 9605b311..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.apis.tag_to_api import tag_to_api
-
-import enum
-
-
-class TagValues(str, enum.Enum):
-    AUTH = "auth"
-    WORKFLOWS = "workflows"
-    RESOURCE = "resource"
-    TEST = "test"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/auth_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/auth_api.py
deleted file mode 100644
index dd5aec50..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/auth_api.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.samples.paths.valid_cookie.get import ValidCookie
-from cloudharness_cli.samples.paths.valid.get import ValidToken
-
-
-class AuthApi(
-    ValidCookie,
-    ValidToken,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/resource_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/resource_api.py
deleted file mode 100644
index e8071619..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/resource_api.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.samples.paths.sampleresources.post import CreateSampleResource
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id.delete import DeleteSampleResource
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id.get import GetSampleResource
-from cloudharness_cli.samples.paths.sampleresources.get import GetSampleResources
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id.put import UpdateSampleResource
-
-
-class ResourceApi(
-    CreateSampleResource,
-    DeleteSampleResource,
-    GetSampleResource,
-    GetSampleResources,
-    UpdateSampleResource,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/test_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/test_api.py
deleted file mode 100644
index 6961d1b3..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/test_api.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.samples.paths.error.get import Error
-from cloudharness_cli.samples.paths.ping.get import Ping
-
-
-class TestApi(
-    Error,
-    Ping,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/workflows_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/workflows_api.py
deleted file mode 100644
index 289ce506..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/apis/tags/workflows_api.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.samples.paths.operation_async.get import SubmitAsync
-from cloudharness_cli.samples.paths.operation_sync.get import SubmitSync
-from cloudharness_cli.samples.paths.operation_sync_results.get import SubmitSyncWithResults
-
-
-class WorkflowsApi(
-    SubmitAsync,
-    SubmitSync,
-    SubmitSyncWithResults,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/configuration.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/configuration.py
index 296662ac..09f05709 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/configuration.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/configuration.py
@@ -3,70 +3,49 @@
 """
     CloudHarness Sample API
 
-    CloudHarness Sample api  # noqa: E501
+    CloudHarness Sample api
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 import copy
 import logging
+from logging import FileHandler
 import multiprocessing
 import sys
+from typing import Optional
 import urllib3
 
-from http import client as http_client
-from cloudharness_cli.samples.exceptions import ApiValueError
-
+import http.client as httplib
 
 JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'multipleOf', 'maximum', 'exclusiveMaximum',
     'minimum', 'exclusiveMinimum', 'maxLength',
-    'minLength', 'pattern', 'maxItems', 'minItems',
-    'uniqueItems', 'maxProperties', 'minProperties',
+    'minLength', 'pattern', 'maxItems', 'minItems'
 }
 
-class Configuration(object):
-    """NOTE: This class is auto generated by OpenAPI Generator
+class Configuration:
+    """This class contains various settings of the API client.
 
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
-
-    :param host: Base url
+    :param host: Base url.
+    :param ignore_operation_servers
+      Boolean to ignore operation servers for the API client.
+      Config will use `host` as the base url regardless of the operation servers.
     :param api_key: Dict to store API key(s).
       Each entry in the dict specifies an API key.
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is the API key secret.
-    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer).
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is an API key prefix when generating the auth data.
-    :param username: Username for HTTP basic authentication
-    :param password: Password for HTTP basic authentication
-    :param discard_unknown_keys: Boolean value indicating whether to discard
-      unknown properties. A server may send a response that includes additional
-      properties that are not known by the client in the following scenarios:
-      1. The OpenAPI document is incomplete, i.e. it does not match the server
-         implementation.
-      2. The client was generated using an older version of the OpenAPI document
-         and the server has been upgraded since then.
-      If a schema in the OpenAPI document defines the additionalProperties attribute,
-      then all undeclared properties received by the server are injected into the
-      additional properties map. In that case, there are undeclared properties, and
-      nothing to discard.
-    :param disabled_client_side_validations (string): Comma-separated list of
-      JSON schema validation keywords to disable JSON schema structural validation
-      rules. The following keywords may be specified: multipleOf, maximum,
-      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
-      maxItems, minItems.
-      By default, the validation is performed for data generated locally by the client
-      and data received from the server, independent of any validation performed by
-      the server side. If the input data does not satisfy the JSON schema validation
-      rules specified in the OpenAPI document, an exception is raised.
-      If disabled_client_side_validations is set, structural validation is
-      disabled. This can be useful to troubleshoot data validation problem, such as
-      when the OpenAPI document validation rules do not match the actual API data
-      received by the server.
+    :param username: Username for HTTP basic authentication.
+    :param password: Password for HTTP basic authentication.
+    :param access_token: Access token.
     :param server_index: Index to servers configuration.
     :param server_variables: Mapping with string values to replace variables in
       templated server configuration. The validation of enums is performed for
@@ -75,7 +54,11 @@ class Configuration(object):
       configuration.
     :param server_operation_variables: Mapping from operation ID to a mapping with
       string values to replace variables in templated server configuration.
-      The validation of enums is performed for variables with defined enum values before.
+      The validation of enums is performed for variables with defined enum
+      values before.
+    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
+      in PEM format.
+    :param retries: Number of retries for API requests.
 
     :Example:
 
@@ -104,11 +87,15 @@ class Configuration(object):
     def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations="",
+                 access_token=None,
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
-                 ):
+                 ignore_operation_servers=False,
+                 ssl_ca_cert=None,
+                 retries=None,
+                 *,
+                 debug: Optional[bool] = None
+                 ) -> None:
         """Constructor
         """
         self._base_path = "/api" if host is None else host
@@ -122,6 +109,9 @@ def __init__(self, host=None,
         self.server_operation_variables = server_operation_variables or {}
         """Default server variables
         """
+        self.ignore_operation_servers = ignore_operation_servers
+        """Ignore operation servers
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -145,8 +135,9 @@ def __init__(self, host=None,
         self.password = password
         """Password for HTTP basic authentication
         """
-        self.discard_unknown_keys = discard_unknown_keys
-        self.disabled_client_side_validations = disabled_client_side_validations
+        self.access_token = access_token
+        """Access token
+        """
         self.logger = {}
         """Logging Settings
         """
@@ -158,13 +149,16 @@ def __init__(self, host=None,
         self.logger_stream_handler = None
         """Log stream handler
         """
-        self.logger_file_handler = None
+        self.logger_file_handler: Optional[FileHandler] = None
         """Log file handler
         """
         self.logger_file = None
         """Debug file location
         """
-        self.debug = False
+        if debug is not None:
+            self.debug = debug
+        else:
+            self.__debug = False
         """Debug switch
         """
 
@@ -173,7 +167,7 @@ def __init__(self, host=None,
            Set this to false to skip verifying SSL certificate when calling API
            from https server.
         """
-        self.ssl_ca_cert = None
+        self.ssl_ca_cert = ssl_ca_cert
         """Set this to customize the certificate file to verify the peer.
         """
         self.cert_file = None
@@ -185,6 +179,10 @@ def __init__(self, host=None,
         self.assert_hostname = None
         """Set this to True/False to enable/disable SSL hostname verification.
         """
+        self.tls_server_name = None
+        """SSL/TLS Server Name Indication (SNI)
+           Set this to the SNI value expected by the server.
+        """
 
         self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
         """urllib3 connection pool's maximum number of connections saved
@@ -194,7 +192,7 @@ def __init__(self, host=None,
            cpu_count * 5 is used as default value to increase performance.
         """
 
-        self.proxy = None
+        self.proxy: Optional[str] = None
         """Proxy URL
         """
         self.proxy_headers = None
@@ -203,14 +201,23 @@ def __init__(self, host=None,
         self.safe_chars_for_path_param = ''
         """Safe chars for path_param
         """
-        self.retries = None
+        self.retries = retries
         """Adding retries to override urllib3 default value 3
         """
         # Enable client side validation
         self.client_side_validation = True
 
-        # Options to pass down to the underlying urllib3 socket
         self.socket_options = None
+        """Options to pass down to the underlying urllib3 socket
+        """
+
+        self.datetime_format = "%Y-%m-%dT%H:%M:%S.%f%z"
+        """datetime format
+        """
+
+        self.date_format = "%Y-%m-%d"
+        """date format
+        """
 
     def __deepcopy__(self, memo):
         cls = self.__class__
@@ -228,13 +235,6 @@ def __deepcopy__(self, memo):
 
     def __setattr__(self, name, value):
         object.__setattr__(self, name, value)
-        if name == 'disabled_client_side_validations':
-            s = set(filter(None, value.split(',')))
-            for v in s:
-                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
-                    raise ApiValueError(
-                        "Invalid keyword: '{0}''".format(v))
-            self._disabled_client_side_validations = s
 
     @classmethod
     def set_default(cls, default):
@@ -245,21 +245,31 @@ def set_default(cls, default):
 
         :param default: object of Configuration
         """
-        cls._default = copy.deepcopy(default)
+        cls._default = default
 
     @classmethod
     def get_default_copy(cls):
-        """Return new instance of configuration.
+        """Deprecated. Please use `get_default` instead.
+
+        Deprecated. Please use `get_default` instead.
+
+        :return: The configuration object.
+        """
+        return cls.get_default()
+
+    @classmethod
+    def get_default(cls):
+        """Return the default configuration.
 
         This method returns newly created, based on default constructor,
         object of Configuration class or returns a copy of default
-        configuration passed by the set_default method.
+        configuration.
 
         :return: The configuration object.
         """
-        if cls._default is not None:
-            return copy.deepcopy(cls._default)
-        return Configuration()
+        if cls._default is None:
+            cls._default = Configuration()
+        return cls._default
 
     @property
     def logger_file(self):
@@ -313,15 +323,15 @@ def debug(self, value):
             # if debug status is True, turn on debug logging
             for _, logger in self.logger.items():
                 logger.setLevel(logging.DEBUG)
-            # turn on http_client debug
-            http_client.HTTPConnection.debuglevel = 1
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
         else:
             # if debug status is False, turn off debug logging,
             # setting log level to default `logging.WARNING`
             for _, logger in self.logger.items():
                 logger.setLevel(logging.WARNING)
-            # turn off http_client debug
-            http_client.HTTPConnection.debuglevel = 0
+            # turn off httplib debug
+            httplib.HTTPConnection.debuglevel = 0
 
     @property
     def logger_format(self):
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/exceptions.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/exceptions.py
index b2654b6d..6d39d45b 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/exceptions.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/exceptions.py
@@ -3,13 +3,17 @@
 """
     CloudHarness Sample API
 
-    CloudHarness Sample api  # noqa: E501
+    CloudHarness Sample api
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
+from typing import Any, Optional
+from typing_extensions import Self
 
 class OpenApiException(Exception):
     """The base exception class for all OpenAPIExceptions"""
@@ -17,7 +21,7 @@ class OpenApiException(Exception):
 
 class ApiTypeError(OpenApiException, TypeError):
     def __init__(self, msg, path_to_item=None, valid_classes=None,
-                 key_type=None):
+                 key_type=None) -> None:
         """ Raises an exception for TypeErrors
 
         Args:
@@ -45,7 +49,7 @@ def __init__(self, msg, path_to_item=None, valid_classes=None,
 
 
 class ApiValueError(OpenApiException, ValueError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -63,7 +67,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiAttributeError(OpenApiException, AttributeError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Raised when an attribute reference or assignment fails.
 
@@ -82,7 +86,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiKeyError(OpenApiException, KeyError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -100,17 +104,56 @@ def __init__(self, msg, path_to_item=None):
 
 class ApiException(OpenApiException):
 
-    def __init__(self, status=None, reason=None, api_response: 'cloudharness_cli.samples.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+    def __init__(
+        self, 
+        status=None, 
+        reason=None, 
+        http_resp=None,
+        *,
+        body: Optional[str] = None,
+        data: Optional[Any] = None,
+    ) -> None:
+        self.status = status
+        self.reason = reason
+        self.body = body
+        self.data = data
+        self.headers = None
+
+        if http_resp:
+            if self.status is None:
+                self.status = http_resp.status
+            if self.reason is None:
+                self.reason = http_resp.reason
+            if self.body is None:
+                try:
+                    self.body = http_resp.data.decode('utf-8')
+                except Exception:
+                    pass
+            self.headers = http_resp.getheaders()
+
+    @classmethod
+    def from_response(
+        cls, 
+        *, 
+        http_resp, 
+        body: Optional[str], 
+        data: Optional[Any],
+    ) -> Self:
+        if http_resp.status == 400:
+            raise BadRequestException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 401:
+            raise UnauthorizedException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 403:
+            raise ForbiddenException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 404:
+            raise NotFoundException(http_resp=http_resp, body=body, data=data)
+
+        if 500 <= http_resp.status <= 599:
+            raise ServiceException(http_resp=http_resp, body=body, data=data)
+        raise ApiException(http_resp=http_resp, body=body, data=data)
 
     def __str__(self):
         """Custom error messages for exception"""
@@ -120,12 +163,32 @@ def __str__(self):
             error_message += "HTTP response headers: {0}\n".format(
                 self.headers)
 
-        if self.body:
-            error_message += "HTTP response body: {0}\n".format(self.body)
+        if self.data or self.body:
+            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
 
         return error_message
 
 
+class BadRequestException(ApiException):
+    pass
+
+
+class NotFoundException(ApiException):
+    pass
+
+
+class UnauthorizedException(ApiException):
+    pass
+
+
+class ForbiddenException(ApiException):
+    pass
+
+
+class ServiceException(ApiException):
+    pass
+
+
 def render_path(path_to_item):
     """Returns a string representation of a path"""
     result = ""
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/__init__.py
deleted file mode 100644
index e34e2748..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# we can not import model classes here because that would create a circular
-# reference which would not work in python2
-# do not import all models into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all models from one package, import them with
-# from cloudharness_cli.samples.models import ModelA, ModelB
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.py
deleted file mode 100644
index 0329ad6b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-
-class InlineResponse202(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-        
-            @staticmethod
-            def task() -> typing.Type['InlineResponse202Task']:
-                return InlineResponse202Task
-            __annotations__ = {
-                "task": task,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["task"]) -> 'InlineResponse202Task': ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["task", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["task"]) -> typing.Union['InlineResponse202Task', schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["task", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        task: typing.Union['InlineResponse202Task', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'InlineResponse202':
-        return super().__new__(
-            cls,
-            *args,
-            task=task,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-from cloudharness_cli/samples.model.inline_response202_task import InlineResponse202Task
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.pyi
deleted file mode 100644
index 0329ad6b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202.pyi
+++ /dev/null
@@ -1,84 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-
-class InlineResponse202(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-        
-            @staticmethod
-            def task() -> typing.Type['InlineResponse202Task']:
-                return InlineResponse202Task
-            __annotations__ = {
-                "task": task,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["task"]) -> 'InlineResponse202Task': ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["task", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["task"]) -> typing.Union['InlineResponse202Task', schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["task", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        task: typing.Union['InlineResponse202Task', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'InlineResponse202':
-        return super().__new__(
-            cls,
-            *args,
-            task=task,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-from cloudharness_cli/samples.model.inline_response202_task import InlineResponse202Task
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.py
deleted file mode 100644
index 6fe36fa3..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-
-class InlineResponse202Task(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            href = schemas.StrSchema
-            name = schemas.StrSchema
-            __annotations__ = {
-                "href": href,
-                "name": name,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["href"]) -> MetaOapg.properties.href: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["href", "name", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["href"]) -> typing.Union[MetaOapg.properties.href, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["href", "name", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        href: typing.Union[MetaOapg.properties.href, str, schemas.Unset] = schemas.unset,
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'InlineResponse202Task':
-        return super().__new__(
-            cls,
-            *args,
-            href=href,
-            name=name,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.pyi
deleted file mode 100644
index 6fe36fa3..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/inline_response202_task.pyi
+++ /dev/null
@@ -1,89 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-
-class InlineResponse202Task(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            href = schemas.StrSchema
-            name = schemas.StrSchema
-            __annotations__ = {
-                "href": href,
-                "name": name,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["href"]) -> MetaOapg.properties.href: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["href", "name", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["href"]) -> typing.Union[MetaOapg.properties.href, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["href", "name", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        href: typing.Union[MetaOapg.properties.href, str, schemas.Unset] = schemas.unset,
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'InlineResponse202Task':
-        return super().__new__(
-            cls,
-            *args,
-            href=href,
-            name=name,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.py
deleted file mode 100644
index a6c28f5a..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-
-class SampleResource(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        required = {
-            "a",
-        }
-        
-        class properties:
-            a = schemas.NumberSchema
-            b = schemas.NumberSchema
-            id = schemas.NumberSchema
-            __annotations__ = {
-                "a": a,
-                "b": b,
-                "id": id,
-            }
-    
-    a: MetaOapg.properties.a
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.properties.a: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["b"]) -> MetaOapg.properties.b: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["a", "b", "id", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> MetaOapg.properties.a: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["b"]) -> typing.Union[MetaOapg.properties.b, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["a", "b", "id", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.properties.a, decimal.Decimal, int, float, ],
-        b: typing.Union[MetaOapg.properties.b, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        id: typing.Union[MetaOapg.properties.id, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'SampleResource':
-        return super().__new__(
-            cls,
-            *args,
-            a=a,
-            b=b,
-            id=id,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.pyi
deleted file mode 100644
index a6c28f5a..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/model/sample_resource.pyi
+++ /dev/null
@@ -1,104 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-
-class SampleResource(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        required = {
-            "a",
-        }
-        
-        class properties:
-            a = schemas.NumberSchema
-            b = schemas.NumberSchema
-            id = schemas.NumberSchema
-            __annotations__ = {
-                "a": a,
-                "b": b,
-                "id": id,
-            }
-    
-    a: MetaOapg.properties.a
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.properties.a: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["b"]) -> MetaOapg.properties.b: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["a", "b", "id", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> MetaOapg.properties.a: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["b"]) -> typing.Union[MetaOapg.properties.b, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["a", "b", "id", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.properties.a, decimal.Decimal, int, float, ],
-        b: typing.Union[MetaOapg.properties.b, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        id: typing.Union[MetaOapg.properties.id, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'SampleResource':
-        return super().__new__(
-            cls,
-            *args,
-            a=a,
-            b=b,
-            id=id,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/__init__.py
index 2706f5ed..db37e7e4 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/__init__.py
@@ -1,16 +1,20 @@
 # coding: utf-8
 
 # flake8: noqa
+"""
+    CloudHarness Sample API
 
-# import all models into this package
-# if you have many models here with many references from one model to another this may
-# raise a RecursionError
-# to avoid this, import only the models that you directly need like:
-# from from cloudharness_cli.samples.model.pet import Pet
-# or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
+    CloudHarness Sample api
 
-from cloudharness_cli.samples.model.inline_response202 import InlineResponse202
-from cloudharness_cli.samples.model.inline_response202_task import InlineResponse202Task
-from cloudharness_cli.samples.model.sample_resource import SampleResource
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+# import models into model package
+from cloudharness_cli.samples.models.inline_response202 import InlineResponse202
+from cloudharness_cli.samples.models.inline_response202_task import InlineResponse202Task
+from cloudharness_cli.samples.models.sample_resource import SampleResource
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202.py
new file mode 100644
index 00000000..561d0872
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202.py
@@ -0,0 +1,92 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict
+from typing import Any, ClassVar, Dict, List, Optional
+from cloudharness_cli.samples.models.inline_response202_task import InlineResponse202Task
+from typing import Optional, Set
+from typing_extensions import Self
+
+class InlineResponse202(BaseModel):
+    """
+    InlineResponse202
+    """ # noqa: E501
+    task: Optional[InlineResponse202Task] = None
+    __properties: ClassVar[List[str]] = ["task"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of InlineResponse202 from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of task
+        if self.task:
+            _dict['task'] = self.task.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of InlineResponse202 from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "task": InlineResponse202Task.from_dict(obj["task"]) if obj.get("task") is not None else None
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202_task.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202_task.py
new file mode 100644
index 00000000..5b3d9b64
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/inline_response202_task.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class InlineResponse202Task(BaseModel):
+    """
+    InlineResponse202Task
+    """ # noqa: E501
+    href: Optional[StrictStr] = Field(default=None, description="the url where to check the operation status")
+    name: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["href", "name"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of InlineResponse202Task from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of InlineResponse202Task from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "href": obj.get("href"),
+            "name": obj.get("name")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/sample_resource.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/sample_resource.py
new file mode 100644
index 00000000..b72474a5
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/models/sample_resource.py
@@ -0,0 +1,92 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Optional, Set
+from typing_extensions import Self
+
+class SampleResource(BaseModel):
+    """
+    
+    """ # noqa: E501
+    a: Union[StrictFloat, StrictInt]
+    b: Optional[Union[StrictFloat, StrictInt]] = None
+    id: Optional[Union[StrictFloat, StrictInt]] = None
+    __properties: ClassVar[List[str]] = ["a", "b", "id"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of SampleResource from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of SampleResource from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "a": obj.get("a"),
+            "b": obj.get("b"),
+            "id": obj.get("id")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/__init__.py
deleted file mode 100644
index 48eee2bf..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.apis.path_to_api import path_to_api
-
-import enum
-
-
-class PathValues(str, enum.Enum):
-    ERROR = "/error"
-    PING = "/ping"
-    VALID = "/valid"
-    VALIDCOOKIE = "/valid-cookie"
-    SAMPLERESOURCES = "/sampleresources"
-    SAMPLERESOURCES_SAMPLERESOURCE_ID = "/sampleresources/{sampleresourceId}"
-    OPERATION_ASYNC = "/operation_async"
-    OPERATION_SYNC = "/operation_sync"
-    OPERATION_SYNC_RESULTS = "/operation_sync_results"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/__init__.py
deleted file mode 100644
index 72c9e307..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.error import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.ERROR
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.py
deleted file mode 100644
index 7e7aee45..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.py
+++ /dev/null
@@ -1,246 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor500(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_500 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor500,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '500': _response_for_500,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _error_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _error_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _error_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _error_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        test sentry is working
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class Error(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def error(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def error(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def error(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def error(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._error_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._error_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.pyi
deleted file mode 100644
index 704e8aa3..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/error/get.pyi
+++ /dev/null
@@ -1,240 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor500(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_500 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor500,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _error_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _error_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _error_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _error_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        test sentry is working
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class Error(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def error(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def error(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def error(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def error(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._error_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._error_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/__init__.py
deleted file mode 100644
index 654cc770..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.operation_async import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.OPERATION_ASYNC
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py
deleted file mode 100644
index 24318033..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.py
+++ /dev/null
@@ -1,235 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.inline_response202 import InlineResponse202
-
-from . import path
-
-SchemaFor202ResponseBodyApplicationJson = InlineResponse202
-
-
-@dataclass
-class ApiResponseFor202(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor202ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_202 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor202,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor202ResponseBodyApplicationJson),
-    },
-)
-_status_code_to_response = {
-    '202': _response_for_202,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _submit_async_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def _submit_async_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _submit_async_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _submit_async_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Send an asynchronous operation
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SubmitAsync(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def submit_async(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def submit_async(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def submit_async(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def submit_async(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_async_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_async_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.pyi
deleted file mode 100644
index 86aa6cf4..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_async/get.pyi
+++ /dev/null
@@ -1,230 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.inline_response202 import InlineResponse202
-
-SchemaFor202ResponseBodyApplicationJson = InlineResponse202
-
-
-@dataclass
-class ApiResponseFor202(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor202ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_202 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor202,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor202ResponseBodyApplicationJson),
-    },
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _submit_async_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def _submit_async_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _submit_async_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _submit_async_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Send an asynchronous operation
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SubmitAsync(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def submit_async(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def submit_async(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def submit_async(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def submit_async(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_async_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_async_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/__init__.py
deleted file mode 100644
index 4e290c44..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.operation_sync import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.OPERATION_SYNC
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.py
deleted file mode 100644
index 17d0d63c..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.py
+++ /dev/null
@@ -1,233 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-SchemaFor200ResponseBodyApplicationJson = schemas.DictSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _submit_sync_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _submit_sync_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _submit_sync_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _submit_sync_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Send a synchronous operation
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SubmitSync(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def submit_sync(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def submit_sync(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def submit_sync(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def submit_sync(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.pyi
deleted file mode 100644
index a2ec6755..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync/get.pyi
+++ /dev/null
@@ -1,228 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-SchemaFor200ResponseBodyApplicationJson = schemas.DictSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _submit_sync_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _submit_sync_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _submit_sync_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _submit_sync_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Send a synchronous operation
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SubmitSync(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def submit_sync(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def submit_sync(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def submit_sync(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def submit_sync(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/__init__.py
deleted file mode 100644
index f45000f9..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.operation_sync_results import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.OPERATION_SYNC_RESULTS
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.py
deleted file mode 100644
index 179be814..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.py
+++ /dev/null
@@ -1,298 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-# Query params
-ASchema = schemas.NumberSchema
-BSchema = schemas.NumberSchema
-RequestRequiredQueryParams = typing_extensions.TypedDict(
-    'RequestRequiredQueryParams',
-    {
-        'a': typing.Union[ASchema, decimal.Decimal, int, float, ],
-        'b': typing.Union[BSchema, decimal.Decimal, int, float, ],
-    }
-)
-RequestOptionalQueryParams = typing_extensions.TypedDict(
-    'RequestOptionalQueryParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
-    pass
-
-
-request_query_a = api_client.QueryParameter(
-    name="a",
-    style=api_client.ParameterStyle.FORM,
-    schema=ASchema,
-    required=True,
-    explode=True,
-)
-request_query_b = api_client.QueryParameter(
-    name="b",
-    style=api_client.ParameterStyle.FORM,
-    schema=BSchema,
-    required=True,
-    explode=True,
-)
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _submit_sync_with_results_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _submit_sync_with_results_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _submit_sync_with_results_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _submit_sync_with_results_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_a,
-            request_query_b,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SubmitSyncWithResults(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def submit_sync_with_results(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def submit_sync_with_results(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def submit_sync_with_results(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def submit_sync_with_results(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_with_results_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_with_results_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.pyi
deleted file mode 100644
index 1f312bb7..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/operation_sync_results/get.pyi
+++ /dev/null
@@ -1,293 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-# Query params
-ASchema = schemas.NumberSchema
-BSchema = schemas.NumberSchema
-RequestRequiredQueryParams = typing_extensions.TypedDict(
-    'RequestRequiredQueryParams',
-    {
-        'a': typing.Union[ASchema, decimal.Decimal, int, float, ],
-        'b': typing.Union[BSchema, decimal.Decimal, int, float, ],
-    }
-)
-RequestOptionalQueryParams = typing_extensions.TypedDict(
-    'RequestOptionalQueryParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
-    pass
-
-
-request_query_a = api_client.QueryParameter(
-    name="a",
-    style=api_client.ParameterStyle.FORM,
-    schema=ASchema,
-    required=True,
-    explode=True,
-)
-request_query_b = api_client.QueryParameter(
-    name="b",
-    style=api_client.ParameterStyle.FORM,
-    schema=BSchema,
-    required=True,
-    explode=True,
-)
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _submit_sync_with_results_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _submit_sync_with_results_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _submit_sync_with_results_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _submit_sync_with_results_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_a,
-            request_query_b,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class SubmitSyncWithResults(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def submit_sync_with_results(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def submit_sync_with_results(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def submit_sync_with_results(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def submit_sync_with_results(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_with_results_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._submit_sync_with_results_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/__init__.py
deleted file mode 100644
index 165017f3..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.ping import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.PING
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.py
deleted file mode 100644
index 0dec8488..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.py
+++ /dev/null
@@ -1,246 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-SchemaFor200ResponseBodyApplicationJson = schemas.NumberSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor500(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_500 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor500,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '500': _response_for_500,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _ping_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _ping_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _ping_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _ping_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        test the application is up
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class Ping(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def ping(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def ping(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def ping(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def ping(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._ping_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._ping_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.pyi
deleted file mode 100644
index 10149943..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/ping/get.pyi
+++ /dev/null
@@ -1,240 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-SchemaFor200ResponseBodyApplicationJson = schemas.NumberSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor500(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_500 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor500,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _ping_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _ping_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _ping_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _ping_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        test the application is up
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class Ping(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def ping(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def ping(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def ping(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def ping(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._ping_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._ping_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/__init__.py
deleted file mode 100644
index 116e3210..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.sampleresources import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.SAMPLERESOURCES
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.py
deleted file mode 100644
index 87664d1c..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.py
+++ /dev/null
@@ -1,260 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-from . import path
-
-
-
-class SchemaFor200ResponseBodyApplicationJson(
-    schemas.ListSchema
-):
-
-
-    class MetaOapg:
-        
-        @staticmethod
-        def items() -> typing.Type['SampleResource']:
-            return SampleResource
-
-    def __new__(
-        cls,
-        arg: typing.Union[typing.Tuple['SampleResource'], typing.List['SampleResource']],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'SchemaFor200ResponseBodyApplicationJson':
-        return super().__new__(
-            cls,
-            arg,
-            _configuration=_configuration,
-        )
-
-    def __getitem__(self, i: int) -> 'SampleResource':
-        return super().__getitem__(i)
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_sample_resources_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_sample_resources_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_sample_resources_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_sample_resources_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        List All SampleResources
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetSampleResources(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_sample_resources(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_sample_resources(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_sample_resources(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_sample_resources(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resources_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resources_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.pyi
deleted file mode 100644
index b10eccbc..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/get.pyi
+++ /dev/null
@@ -1,255 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-
-
-class SchemaFor200ResponseBodyApplicationJson(
-    schemas.ListSchema
-):
-
-
-    class MetaOapg:
-        
-        @staticmethod
-        def items() -> typing.Type['SampleResource']:
-            return SampleResource
-
-    def __new__(
-        cls,
-        arg: typing.Union[typing.Tuple['SampleResource'], typing.List['SampleResource']],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'SchemaFor200ResponseBodyApplicationJson':
-        return super().__new__(
-            cls,
-            arg,
-            _configuration=_configuration,
-        )
-
-    def __getitem__(self, i: int) -> 'SampleResource':
-        return super().__getitem__(i)
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_sample_resources_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_sample_resources_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_sample_resources_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_sample_resources_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        List All SampleResources
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetSampleResources(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_sample_resources(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_sample_resources(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_sample_resources(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_sample_resources(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resources_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resources_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.py
deleted file mode 100644
index c0bfe3c5..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.py
+++ /dev/null
@@ -1,312 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-from . import path
-
-# body param
-SchemaForRequestBodyApplicationJson = SampleResource
-
-
-request_body_sample_resource = api_client.RequestBody(
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaForRequestBodyApplicationJson),
-    },
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor201(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_201 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor201,
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-_status_code_to_response = {
-    '201': _response_for_201,
-    '400': _response_for_400,
-}
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Create a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-
-        if body is schemas.unset:
-            raise exceptions.ApiValueError(
-                'The required body parameter has an invalid value of: unset. Set a valid value instead')
-        _fields = None
-        _body = None
-        serialized_data = request_body_sample_resource.serialize(body, content_type)
-        _headers.add('Content-Type', content_type)
-        if 'fields' in serialized_data:
-            _fields = serialized_data['fields']
-        elif 'body' in serialized_data:
-            _body = serialized_data['body']
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='post'.upper(),
-            headers=_headers,
-            fields=_fields,
-            body=_body,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class CreateSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._create_sample_resource_oapg(
-            body=body,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForpost(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._create_sample_resource_oapg(
-            body=body,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.pyi
deleted file mode 100644
index 9c1f6035..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources/post.pyi
+++ /dev/null
@@ -1,306 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-# body param
-SchemaForRequestBodyApplicationJson = SampleResource
-
-
-request_body_sample_resource = api_client.RequestBody(
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaForRequestBodyApplicationJson),
-    },
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor201(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_201 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor201,
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _create_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Create a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-
-        if body is schemas.unset:
-            raise exceptions.ApiValueError(
-                'The required body parameter has an invalid value of: unset. Set a valid value instead')
-        _fields = None
-        _body = None
-        serialized_data = request_body_sample_resource.serialize(body, content_type)
-        _headers.add('Content-Type', content_type)
-        if 'fields' in serialized_data:
-            _fields = serialized_data['fields']
-        elif 'body' in serialized_data:
-            _body = serialized_data['body']
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='post'.upper(),
-            headers=_headers,
-            fields=_fields,
-            body=_body,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class CreateSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def create_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._create_sample_resource_oapg(
-            body=body,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForpost(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._create_sample_resource_oapg(
-            body=body,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/__init__.py
deleted file mode 100644
index 8acfb53e..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.sampleresources_sampleresource_id import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.SAMPLERESOURCES_SAMPLERESOURCE_ID
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.py
deleted file mode 100644
index 65962b94..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.py
+++ /dev/null
@@ -1,282 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-# Path params
-SampleresourceIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'sampleresourceId': typing.Union[SampleresourceIdSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_sampleresource_id = api_client.PathParameter(
-    name="sampleresourceId",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=SampleresourceIdSchema,
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor204(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_204 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor204,
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '204': _response_for_204,
-    '400': _response_for_400,
-    '404': _response_for_404,
-}
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _delete_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-    ]: ...
-
-    @typing.overload
-    def _delete_sample_resource_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _delete_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _delete_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Delete a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_sampleresource_id,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-        # TODO add cookie handling
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='delete'.upper(),
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class DeleteSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def delete_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-    ]: ...
-
-    @typing.overload
-    def delete_sample_resource(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_sample_resource_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiFordelete(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-    ]: ...
-
-    @typing.overload
-    def delete(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_sample_resource_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.pyi
deleted file mode 100644
index dcf3f0e5..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/delete.pyi
+++ /dev/null
@@ -1,275 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-# Path params
-SampleresourceIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'sampleresourceId': typing.Union[SampleresourceIdSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_sampleresource_id = api_client.PathParameter(
-    name="sampleresourceId",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=SampleresourceIdSchema,
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor204(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_204 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor204,
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _delete_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-    ]: ...
-
-    @typing.overload
-    def _delete_sample_resource_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _delete_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _delete_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Delete a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_sampleresource_id,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-        # TODO add cookie handling
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='delete'.upper(),
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class DeleteSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def delete_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-    ]: ...
-
-    @typing.overload
-    def delete_sample_resource(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_sample_resource_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiFordelete(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-    ]: ...
-
-    @typing.overload
-    def delete(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor204,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_sample_resource_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.py
deleted file mode 100644
index 6c34cbbc..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.py
+++ /dev/null
@@ -1,315 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-from . import path
-
-# Path params
-SampleresourceIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'sampleresourceId': typing.Union[SampleresourceIdSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_sampleresource_id = api_client.PathParameter(
-    name="sampleresourceId",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=SampleresourceIdSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyApplicationJson = SampleResource
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '400': _response_for_400,
-    '404': _response_for_404,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_sample_resource_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Get a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_sampleresource_id,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_sample_resource(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resource_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resource_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.pyi
deleted file mode 100644
index f48bb243..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/get.pyi
+++ /dev/null
@@ -1,308 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-# Path params
-SampleresourceIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'sampleresourceId': typing.Union[SampleresourceIdSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_sampleresource_id = api_client.PathParameter(
-    name="sampleresourceId",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=SampleresourceIdSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyApplicationJson = SampleResource
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_sample_resource_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_sample_resource_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Get a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_sampleresource_id,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_sample_resource(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_sample_resource(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resource_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_sample_resource_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.py
deleted file mode 100644
index 560e5ea4..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.py
+++ /dev/null
@@ -1,382 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-from . import path
-
-# Path params
-SampleresourceIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'sampleresourceId': typing.Union[SampleresourceIdSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_sampleresource_id = api_client.PathParameter(
-    name="sampleresourceId",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=SampleresourceIdSchema,
-    required=True,
-)
-# body param
-SchemaForRequestBodyApplicationJson = SampleResource
-
-
-request_body_sample_resource = api_client.RequestBody(
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaForRequestBodyApplicationJson),
-    },
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor202(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_202 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor202,
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '202': _response_for_202,
-    '400': _response_for_400,
-    '404': _response_for_404,
-}
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Update a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_sampleresource_id,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-
-        if body is schemas.unset:
-            raise exceptions.ApiValueError(
-                'The required body parameter has an invalid value of: unset. Set a valid value instead')
-        _fields = None
-        _body = None
-        serialized_data = request_body_sample_resource.serialize(body, content_type)
-        _headers.add('Content-Type', content_type)
-        if 'fields' in serialized_data:
-            _fields = serialized_data['fields']
-        elif 'body' in serialized_data:
-            _body = serialized_data['body']
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='put'.upper(),
-            headers=_headers,
-            fields=_fields,
-            body=_body,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class UpdateSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._update_sample_resource_oapg(
-            body=body,
-            path_params=path_params,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForput(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._update_sample_resource_oapg(
-            body=body,
-            path_params=path_params,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.pyi
deleted file mode 100644
index 0cfcd412..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/sampleresources_sampleresource_id/put.pyi
+++ /dev/null
@@ -1,375 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-
-# Path params
-SampleresourceIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'sampleresourceId': typing.Union[SampleresourceIdSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_sampleresource_id = api_client.PathParameter(
-    name="sampleresourceId",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=SampleresourceIdSchema,
-    required=True,
-)
-# body param
-SchemaForRequestBodyApplicationJson = SampleResource
-
-
-request_body_sample_resource = api_client.RequestBody(
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaForRequestBodyApplicationJson),
-    },
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor202(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_202 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor202,
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _update_sample_resource_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Update a SampleResource
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_sampleresource_id,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-
-        if body is schemas.unset:
-            raise exceptions.ApiValueError(
-                'The required body parameter has an invalid value of: unset. Set a valid value instead')
-        _fields = None
-        _body = None
-        serialized_data = request_body_sample_resource.serialize(body, content_type)
-        _headers.add('Content-Type', content_type)
-        if 'fields' in serialized_data:
-            _fields = serialized_data['fields']
-        elif 'body' in serialized_data:
-            _body = serialized_data['body']
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='put'.upper(),
-            headers=_headers,
-            fields=_fields,
-            body=_body,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class UpdateSampleResource(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def update_sample_resource(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._update_sample_resource_oapg(
-            body=body,
-            path_params=path_params,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForput(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-    ]: ...
-
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor202,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def put(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._update_sample_resource_oapg(
-            body=body,
-            path_params=path_params,
-            content_type=content_type,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/__init__.py
deleted file mode 100644
index aa36dcde..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.valid import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.VALID
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.py
deleted file mode 100644
index 0e0a8d5b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-_auth = [
-    'bearerAuth',
-]
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor401(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_401 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor401,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '401': _response_for_401,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _valid_token_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _valid_token_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _valid_token_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _valid_token_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Check if the token is valid. Get a token by logging into the base url
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class ValidToken(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def valid_token(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def valid_token(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def valid_token(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def valid_token(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_token_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_token_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.pyi
deleted file mode 100644
index 85232a94..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid/get.pyi
+++ /dev/null
@@ -1,241 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor401(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_401 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor401,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _valid_token_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _valid_token_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _valid_token_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _valid_token_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Check if the token is valid. Get a token by logging into the base url
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class ValidToken(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def valid_token(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def valid_token(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def valid_token(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def valid_token(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_token_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_token_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/__init__.py
deleted file mode 100644
index 8b9910f5..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.samples.paths.valid_cookie import Api
-
-from cloudharness_cli.samples.paths import PathValues
-
-path = PathValues.VALIDCOOKIE
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.py
deleted file mode 100644
index 914a0742..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-from . import path
-
-_auth = [
-    'cookieAuth',
-]
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor401(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_401 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor401,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '401': _response_for_401,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _valid_cookie_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _valid_cookie_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _valid_cookie_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _valid_cookie_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Check if the token is valid. Get a token by logging into the base url
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class ValidCookie(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def valid_cookie(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def valid_cookie(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def valid_cookie(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def valid_cookie(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_cookie_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_cookie_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.pyi
deleted file mode 100644
index bfb82b1c..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/paths/valid_cookie/get.pyi
+++ /dev/null
@@ -1,241 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.samples import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.samples import schemas  # noqa: F401
-
-SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor401(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_401 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor401,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _valid_cookie_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _valid_cookie_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _valid_cookie_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _valid_cookie_oapg(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Check if the token is valid. Get a token by logging into the base url
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class ValidCookie(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def valid_cookie(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def valid_cookie(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def valid_cookie(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def valid_cookie(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_cookie_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._valid_cookie_oapg(
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/test/common/test_models/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/py.typed
similarity index 100%
rename from libraries/client/cloudharness_cli/test/common/test_models/__init__.py
rename to libraries/client/cloudharness_cli/cloudharness_cli/samples/py.typed
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/rest.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/rest.py
index 7f79f628..04de20ce 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/rest.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/samples/rest.py
@@ -3,35 +3,67 @@
 """
     CloudHarness Sample API
 
-    CloudHarness Sample api  # noqa: E501
+    CloudHarness Sample api
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
-import logging
+import io
+import json
+import re
 import ssl
-from urllib.parse import urlencode
-import typing
 
-import certifi
 import urllib3
-from urllib3._collections import HTTPHeaderDict
 
 from cloudharness_cli.samples.exceptions import ApiException, ApiValueError
 
+SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"}
+RESTResponseType = urllib3.HTTPResponse
+
+
+def is_socks_proxy_url(url):
+    if url is None:
+        return False
+    split_section = url.split("://")
+    if len(split_section) < 2:
+        return False
+    else:
+        return split_section[0].lower() in SUPPORTED_SOCKS_PROXIES
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp) -> None:
+        self.response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = None
+
+    def read(self):
+        if self.data is None:
+            self.data = self.response.data
+        return self.data
+
+    def getheaders(self):
+        """Returns a dictionary of the response headers."""
+        return self.response.headers
 
-logger = logging.getLogger(__name__)
+    def getheader(self, name, default=None):
+        """Returns a given response header."""
+        return self.response.headers.get(name, default)
 
 
-class RESTClientObject(object):
+class RESTClientObject:
 
-    def __init__(self, configuration, pools_size=4, maxsize=None):
+    def __init__(self, configuration) -> None:
         # urllib3.PoolManager will pass all kw parameters to connectionpool
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
-        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
         # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
 
         # cert_reqs
@@ -40,140 +72,167 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         else:
             cert_reqs = ssl.CERT_NONE
 
-        # ca_certs
-        if configuration.ssl_ca_cert:
-            ca_certs = configuration.ssl_ca_cert
-        else:
-            # if not set certificate file, use Mozilla's root certificates.
-            ca_certs = certifi.where()
-
-        addition_pool_args = {}
+        pool_args = {
+            "cert_reqs": cert_reqs,
+            "ca_certs": configuration.ssl_ca_cert,
+            "cert_file": configuration.cert_file,
+            "key_file": configuration.key_file,
+        }
         if configuration.assert_hostname is not None:
-            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+            pool_args['assert_hostname'] = (
+                configuration.assert_hostname
+            )
 
         if configuration.retries is not None:
-            addition_pool_args['retries'] = configuration.retries
+            pool_args['retries'] = configuration.retries
+
+        if configuration.tls_server_name:
+            pool_args['server_hostname'] = configuration.tls_server_name
+
 
         if configuration.socket_options is not None:
-            addition_pool_args['socket_options'] = configuration.socket_options
+            pool_args['socket_options'] = configuration.socket_options
 
-        if maxsize is None:
-            if configuration.connection_pool_maxsize is not None:
-                maxsize = configuration.connection_pool_maxsize
-            else:
-                maxsize = 4
+        if configuration.connection_pool_maxsize is not None:
+            pool_args['maxsize'] = configuration.connection_pool_maxsize
 
         # https pool manager
+        self.pool_manager: urllib3.PoolManager
+
         if configuration.proxy:
-            self.pool_manager = urllib3.ProxyManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                proxy_url=configuration.proxy,
-                proxy_headers=configuration.proxy_headers,
-                **addition_pool_args
-            )
+            if is_socks_proxy_url(configuration.proxy):
+                from urllib3.contrib.socks import SOCKSProxyManager
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["headers"] = configuration.proxy_headers
+                self.pool_manager = SOCKSProxyManager(**pool_args)
+            else:
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["proxy_headers"] = configuration.proxy_headers
+                self.pool_manager = urllib3.ProxyManager(**pool_args)
         else:
-            self.pool_manager = urllib3.PoolManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                **addition_pool_args
-            )
+            self.pool_manager = urllib3.PoolManager(**pool_args)
 
     def request(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, typing.Any], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
+        method,
+        url,
+        headers=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ):
         """Perform requests.
 
         :param method: http request method
         :param url: http request url
         :param headers: http request headers
-        :param body: request body, for other types
-        :param fields: request parameters for
-                                `application/x-www-form-urlencoded`
-                                or `multipart/form-data`
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                be returned without reading/decoding response
-                                data. Default is False.
-        :param timeout: timeout setting for this request. If one
-                                number provided, it will be total request
-                                timeout. It can also be a pair (tuple) of
-                                (connection, read) timeouts.
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencoded`
+                            and `multipart/form-data`
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
-                          'PATCH', 'OPTIONS']
-
-        if fields and body:
+        assert method in [
+            'GET',
+            'HEAD',
+            'DELETE',
+            'POST',
+            'PUT',
+            'PATCH',
+            'OPTIONS'
+        ]
+
+        if post_params and body:
             raise ApiValueError(
-                "body parameter cannot be used with fields parameter."
+                "body parameter cannot be used with post_params parameter."
             )
 
-        fields = fields or {}
+        post_params = post_params or {}
         headers = headers or {}
 
-        if timeout:
-            if isinstance(timeout, (int, float)):  # noqa: E501,F821
-                timeout = urllib3.Timeout(total=timeout)
-            elif (isinstance(timeout, tuple) and
-                  len(timeout) == 2):
-                timeout = urllib3.Timeout(connect=timeout[0], read=timeout[1])
+        timeout = None
+        if _request_timeout:
+            if isinstance(_request_timeout, (int, float)):
+                timeout = urllib3.Timeout(total=_request_timeout)
+            elif (
+                    isinstance(_request_timeout, tuple)
+                    and len(_request_timeout) == 2
+                ):
+                timeout = urllib3.Timeout(
+                    connect=_request_timeout[0],
+                    read=_request_timeout[1]
+                )
 
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
             if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
-                if 'Content-Type' not in headers and body is None:
+
+                # no content type provided or payload is json
+                content_type = headers.get('Content-Type')
+                if (
+                    not content_type
+                    or re.search('json', content_type, re.IGNORECASE)
+                ):
+                    request_body = None
+                    if body is not None:
+                        request_body = json.dumps(body)
                     r = self.pool_manager.request(
                         method,
                         url,
-                        preload_content=not stream,
+                        body=request_body,
                         timeout=timeout,
-                        headers=headers
+                        headers=headers,
+                        preload_content=False
                     )
-                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                elif content_type == 'application/x-www-form-urlencoded':
                     r = self.pool_manager.request(
-                        method, url,
-                        body=body,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=False,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
-                elif headers['Content-Type'] == 'multipart/form-data':
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif content_type == 'multipart/form-data':
                     # must del headers['Content-Type'], or the correct
                     # Content-Type which generated by urllib3 will be
                     # overwritten.
                     del headers['Content-Type']
+                    # Ensures that dict objects are serialized
+                    post_params = [(a, json.dumps(b)) if isinstance(b, dict) else (a,b) for a, b in post_params]
                     r = self.pool_manager.request(
-                        method, url,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=True,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
+                        headers=headers,
+                        preload_content=False
+                    )
                 # Pass a `string` parameter directly in the body to support
-                # other content types than Json when `body` argument is
-                # provided in serialized form
+                # other content types than JSON when `body` argument is
+                # provided in serialized form.
                 elif isinstance(body, str) or isinstance(body, bytes):
-                    request_body = body
                     r = self.pool_manager.request(
-                        method, url,
+                        method,
+                        url,
+                        body=body,
+                        timeout=timeout,
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif headers['Content-Type'] == 'text/plain' and isinstance(body, bool):
+                    request_body = "true" if body else "false"
+                    r = self.pool_manager.request(
+                        method,
+                        url,
                         body=request_body,
-                        preload_content=not stream,
+                        preload_content=False,
                         timeout=timeout,
                         headers=headers)
                 else:
@@ -184,72 +243,16 @@ def request(
                     raise ApiException(status=0, reason=msg)
             # For `GET`, `HEAD`
             else:
-                r = self.pool_manager.request(method, url,
-                                              preload_content=not stream,
-                                              timeout=timeout,
-                                              headers=headers)
+                r = self.pool_manager.request(
+                    method,
+                    url,
+                    fields={},
+                    timeout=timeout,
+                    headers=headers,
+                    preload_content=False
+                )
         except urllib3.exceptions.SSLError as e:
-            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            msg = "\n".join([type(e).__name__, str(e)])
             raise ApiException(status=0, reason=msg)
 
-        if not stream:
-            # log response body
-            logger.debug("response body: %s", r.data)
-
-        return r
-
-    def GET(self, url, headers=None, stream=False,
-            timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("GET", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def HEAD(self, url, headers=None, stream=False,
-             timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("HEAD", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def OPTIONS(self, url, headers=None,
-                body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("OPTIONS", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def DELETE(self, url, headers=None, body=None,
-               stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("DELETE", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def POST(self, url, headers=None,
-             body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("POST", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PUT(self, url, headers=None,
-            body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PUT", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PATCH(self, url, headers=None,
-              body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PATCH", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
+        return RESTResponse(r)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/samples/schemas.py b/libraries/client/cloudharness_cli/cloudharness_cli/samples/schemas.py
deleted file mode 100644
index bf36892b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/samples/schemas.py
+++ /dev/null
@@ -1,2463 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from collections import defaultdict
-from datetime import date, datetime, timedelta  # noqa: F401
-import functools
-import decimal
-import io
-import re
-import types
-import typing
-import uuid
-
-from dateutil.parser.isoparser import isoparser, _takes_ascii
-import frozendict
-
-from cloudharness_cli.samples.exceptions import (
-    ApiTypeError,
-    ApiValueError,
-)
-from cloudharness_cli.samples.configuration import (
-    Configuration,
-)
-
-
-class Unset(object):
-    """
-    An instance of this class is set as the default value for object type(dict) properties that are optional
-    When a property has an unset value, that property will not be assigned in the dict
-    """
-    pass
-
-unset = Unset()
-
-none_type = type(None)
-file_type = io.IOBase
-
-
-class FileIO(io.FileIO):
-    """
-    A class for storing files
-    Note: this class is not immutable
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
-                raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
-            return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
-
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        pass
-
-
-def update(d: dict, u: dict):
-    """
-    Adds u to d
-    Where each dict is defaultdict(set)
-    """
-    if not u:
-        return d
-    for k, v in u.items():
-        if k not in d:
-            d[k] = v
-        else:
-            d[k] = d[k] | v
-
-
-class ValidationMetadata(frozendict.frozendict):
-    """
-    A class storing metadata that is needed to validate OpenApi Schema payloads
-    """
-    def __new__(
-        cls,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-        from_server: bool = False,
-        configuration: typing.Optional[Configuration] = None,
-        seen_classes: typing.FrozenSet[typing.Type] = frozenset(),
-        validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]] = frozendict.frozendict()
-    ):
-        """
-        Args:
-            path_to_item: the path to the current data being instantiated.
-                For {'a': [1]} if the code is handling, 1, then the path is ('args[0]', 'a', 0)
-                This changes from location to location
-            from_server: whether or not this data came form the server
-                True when receiving server data
-                False when instantiating model with client side data not form the server
-                This does not change from location to location
-            configuration: the Configuration instance to use
-                This is needed because in Configuration:
-                - one can disable validation checking
-                This does not change from location to location
-            seen_classes: when deserializing data that matches multiple schemas, this is used to store
-                the schemas that have been traversed. This is used to stop processing when a cycle is seen.
-                This changes from location to location
-            validated_path_to_schemas: stores the already validated schema classes for a given path location
-                This does not change from location to location
-        """
-        return super().__new__(
-            cls,
-            path_to_item=path_to_item,
-            from_server=from_server,
-            configuration=configuration,
-            seen_classes=seen_classes,
-            validated_path_to_schemas=validated_path_to_schemas
-        )
-
-    def validation_ran_earlier(self, cls: type) -> bool:
-        validated_schemas = self.validated_path_to_schemas.get(self.path_to_item, set())
-        validation_ran_earlier = validated_schemas and cls in validated_schemas
-        if validation_ran_earlier:
-            return True
-        if cls in self.seen_classes:
-            return True
-        return False
-
-    @property
-    def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]:
-        return self.get('path_to_item')
-
-    @property
-    def from_server(self) -> bool:
-        return self.get('from_server')
-
-    @property
-    def configuration(self) -> typing.Optional[Configuration]:
-        return self.get('configuration')
-
-    @property
-    def seen_classes(self) -> typing.FrozenSet[typing.Type]:
-        return self.get('seen_classes')
-
-    @property
-    def validated_path_to_schemas(self) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]]:
-        return self.get('validated_path_to_schemas')
-
-
-class Singleton:
-    """
-    Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
-    """
-    _instances = {}
-
-    def __new__(cls, arg: typing.Any, **kwargs):
-        """
-        cls base classes: BoolClass, NoneClass, str, decimal.Decimal
-        The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
-        However 1.0  can also be ingested into that enum schema because 1.0 == 1 and
-        Decimal('1.0') == Decimal('1')
-        But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
-        and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
-        """
-        key = (cls, arg, str(arg))
-        if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
-                inst = super().__new__(cls)
-                cls._instances[key] = inst
-            else:
-                cls._instances[key] = super().__new__(cls, arg)
-        return cls._instances[key]
-
-    def __repr__(self):
-        if isinstance(self, NoneClass):
-            return f'<{self.__class__.__name__}: None>'
-        elif isinstance(self, BoolClass):
-            if bool(self):
-                return f'<{self.__class__.__name__}: True>'
-            return f'<{self.__class__.__name__}: False>'
-        return f'<{self.__class__.__name__}: {super().__repr__()}>'
-
-
-class classproperty:
-
-    def __init__(self, fget):
-        self.fget = fget
-
-    def __get__(self, owner_self, owner_cls):
-        return self.fget(owner_cls)
-
-
-class NoneClass(Singleton):
-    @classproperty
-    def NONE(cls):
-        return cls(None)
-
-    def __bool__(self) -> bool:
-        return False
-
-
-class BoolClass(Singleton):
-    @classproperty
-    def TRUE(cls):
-        return cls(True)
-
-    @classproperty
-    def FALSE(cls):
-        return cls(False)
-
-    @functools.lru_cache()
-    def __bool__(self) -> bool:
-        for key, instance in self._instances.items():
-            if self is instance:
-                return bool(key[1])
-        raise ValueError('Unable to find the boolean value of this instance')
-
-
-class MetaOapgTyped:
-    exclusive_maximum: typing.Union[int, float]
-    inclusive_maximum: typing.Union[int, float]
-    exclusive_minimum: typing.Union[int, float]
-    inclusive_minimum: typing.Union[int, float]
-    max_items: int
-    min_items: int
-    discriminator: typing.Dict[str, typing.Dict[str, typing.Type['Schema']]]
-
-
-    class properties:
-        # to hold object properties
-        pass
-
-    additional_properties: typing.Optional[typing.Type['Schema']]
-    max_properties: int
-    min_properties: int
-    all_of: typing.List[typing.Type['Schema']]
-    one_of: typing.List[typing.Type['Schema']]
-    any_of: typing.List[typing.Type['Schema']]
-    not_schema: typing.Type['Schema']
-    max_length: int
-    min_length: int
-    items: typing.Type['Schema']
-
-
-class Schema:
-    """
-    the base class of all swagger/openapi schemas/models
-    """
-    __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    _types: typing.Set[typing.Type]
-    MetaOapg = MetaOapgTyped
-
-    @staticmethod
-    def __get_valid_classes_phrase(input_classes):
-        """Returns a string phrase describing what types are allowed"""
-        all_classes = list(input_classes)
-        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-        all_class_names = [cls.__name__ for cls in all_classes]
-        if len(all_class_names) == 1:
-            return "is {0}".format(all_class_names[0])
-        return "is one of [{0}]".format(", ".join(all_class_names))
-
-    @staticmethod
-    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
-        if isinstance(item_cls, types.FunctionType):
-            # referenced schema
-            return item_cls()
-        elif isinstance(item_cls, staticmethod):
-            # referenced schema
-            return item_cls.__func__()
-        return item_cls
-
-    @classmethod
-    def __type_error_message(
-        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-    ):
-        """
-        Keyword Args:
-            var_value (any): the variable which has the type_error
-            var_name (str): the name of the variable which has the typ error
-            valid_classes (tuple): the accepted classes for current_item's
-                                      value
-            key_type (bool): False if our value is a value in a dict
-                             True if it is a key in a dict
-                             False if our item is an item in a tuple
-        """
-        key_or_value = "value"
-        if key_type:
-            key_or_value = "key"
-        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-        msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
-            var_name,
-            key_or_value,
-            valid_classes_phrase,
-            type(var_value).__name__,
-        )
-        return msg
-
-    @classmethod
-    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-        error_msg = cls.__type_error_message(
-            var_name=path_to_item[-1],
-            var_value=var_value,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-        return ApiTypeError(
-            error_msg,
-            path_to_item=path_to_item,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        Schema _validate_oapg
-        All keyword validation except for type checking was done in calling stack frames
-        If those validations passed, the validated classes are collected in path_to_schemas
-
-        Returns:
-            path_to_schemas: a map of path to schemas
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        base_class = type(arg)
-        if base_class not in cls._types:
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                cls._types,
-                key_type=False,
-            )
-
-        path_to_schemas = {validation_metadata.path_to_item: set()}
-        path_to_schemas[validation_metadata.path_to_item].add(cls)
-        path_to_schemas[validation_metadata.path_to_item].add(base_class)
-        return path_to_schemas
-
-    @staticmethod
-    def _process_schema_classes_oapg(
-        schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
-    ):
-        """
-        Processes and mutates schema_classes
-        If a SomeSchema is a subclass of DictSchema then remove DictSchema because it is already included
-        """
-        if len(schema_classes) < 2:
-            return
-        if len(schema_classes) > 2 and UnsetAnyTypeSchema in schema_classes:
-            schema_classes.remove(UnsetAnyTypeSchema)
-        x_schema = schema_type_classes & schema_classes
-        if not x_schema:
-            return
-        x_schema = x_schema.pop()
-        if any(c is not x_schema and issubclass(c, x_schema) for c in schema_classes):
-            # needed to not have a mro error in get_new_class
-            schema_classes.remove(x_schema)
-
-    @classmethod
-    def __get_new_cls(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]:
-        """
-        Make a new dynamic class and return an instance of that class
-        We are making an instance of cls, but instead of making cls
-        make a new class, new_cls
-        which includes dynamic bases including cls
-        return an instance of that new class
-
-        Dict property + List Item Assignment Use cases:
-        1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
-            where the key is the path to the item, and the value will be the required manufactured class
-            made out of the matching schemas
-        2. value is an instance of the the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
-            because value is of the correct type, and validation was run earlier when the instance was created
-        """
-        _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(_path_to_schemas, other_path_to_schemas)
-        # loop through it make a new class for each entry
-        # do not modify the returned result because it is cached and we would be modifying the cached value
-        path_to_schemas = {}
-        for path, schema_classes in _path_to_schemas.items():
-            """
-            Use cases
-            1. N number of schema classes + enum + type != bool/None, classes in path_to_schemas: tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-                needs Singleton added
-            2. N number of schema classes + enum + type == bool/None, classes in path_to_schemas: BoolClass/NoneClass
-                Singleton already added
-            3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-            """
-            cls._process_schema_classes_oapg(schema_classes)
-            enum_schema = any(
-                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
-            inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
-            chosen_schema_classes = schema_classes - inheritable_primitive_type
-            suffix = tuple(inheritable_primitive_type)
-            if enum_schema and suffix[0] not in {NoneClass, BoolClass}:
-                suffix = (Singleton,) + suffix
-
-            used_classes = tuple(sorted(chosen_schema_classes, key=lambda a_cls: a_cls.__name__)) + suffix
-            mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes)
-            path_to_schemas[path] = mfg_cls
-
-        return path_to_schemas
-
-    @classmethod
-    def _get_new_instance_without_conversion_oapg(
-        cls,
-        arg: typing.Any,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        # We have a Dynamic class and we are making an instance of it
-        if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, properties)
-        elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, items)
-        """
-        str = openapi str, date, and datetime
-        decimal.Decimal = openapi int and float
-        FileIO = openapi binary type and the user inputs a file
-        bytes = openapi binary type and the user inputs bytes
-        """
-        return super(Schema, cls).__new__(cls, arg)
-
-    @classmethod
-    def from_openapi_data_oapg(
-        cls,
-        arg: typing.Union[
-            str,
-            date,
-            datetime,
-            int,
-            float,
-            decimal.Decimal,
-            bool,
-            None,
-            'Schema',
-            dict,
-            frozendict.frozendict,
-            tuple,
-            list,
-            io.FileIO,
-            io.BufferedReader,
-            bytes
-        ],
-        _configuration: typing.Optional[Configuration]
-    ):
-        """
-        Schema from_openapi_data_oapg
-        """
-        from_server = True
-        validated_path_to_schemas = {}
-        arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas)
-        validation_metadata = ValidationMetadata(
-            from_server=from_server, configuration=_configuration, validated_path_to_schemas=validated_path_to_schemas)
-        path_to_schemas = cls.__get_new_cls(arg, validation_metadata)
-        new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
-            arg,
-            validation_metadata.path_to_item,
-            path_to_schemas
-        )
-        return new_inst
-
-    @staticmethod
-    def __get_input_dict(*args, **kwargs) -> frozendict.frozendict:
-        input_dict = {}
-        if args and isinstance(args[0], (dict, frozendict.frozendict)):
-            input_dict.update(args[0])
-        if kwargs:
-            input_dict.update(kwargs)
-        return frozendict.frozendict(input_dict)
-
-    @staticmethod
-    def __remove_unsets(kwargs):
-        return {key: val for key, val in kwargs.items() if val is not unset}
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
-        """
-        Schema __new__
-
-        Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
-            kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the Configuration that enables json schema validation keywords
-                like minItems, minLength etc
-
-        Note: double underscores are used here because pycharm thinks that these variables
-        are instance properties if they are named normally :(
-        """
-        __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
-            raise TypeError(
-                'No input given. args or kwargs must be given.'
-            )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
-        else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
-        __from_server = False
-        __validated_path_to_schemas = {}
-        __arg = cast_to_allowed_types(
-            __arg, __from_server, __validated_path_to_schemas)
-        __validation_metadata = ValidationMetadata(
-            configuration=_configuration, from_server=__from_server, validated_path_to_schemas=__validated_path_to_schemas)
-        __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata)
-        __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
-            __arg,
-            __validation_metadata.path_to_item,
-            __path_to_schemas
-        )
-
-    def __init__(
-        self,
-        *args: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[Configuration] = None,
-        **kwargs: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
-        ]
-    ):
-        """
-        this is needed to fix 'Unexpected argument' warning in pycharm
-        this code does nothing because all Schema instances are immutable
-        this means that all input data is passed into and used in new, and after the new instance is made
-        no new attributes are assigned and init is not used
-        """
-        pass
-
-"""
-import itertools
-data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-type_to_cls = {
-    'None': 'NoneClass',
-    'FrozenDict': 'frozendict.frozendict',
-    'Tuple': 'tuple',
-    'Str': 'str',
-    'Decimal': 'decimal.Decimal',
-    'Bool': 'BoolClass'
-}
-cls_tuples = [v for v in itertools.combinations(data_types, 5)]
-typed_classes = [f"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\n    pass" for cls_tuple in cls_tuples]
-for cls in typed_classes:
-    print(cls)
-object_classes = [f"{''.join(cls_tuple)}Mixin = object" for cls_tuple in cls_tuples]
-for cls in object_classes:
-    print(cls)
-"""
-if typing.TYPE_CHECKING:
-    # qty 1
-    NoneMixin = NoneClass
-    FrozenDictMixin = frozendict.frozendict
-    TupleMixin = tuple
-    StrMixin = str
-    DecimalMixin = decimal.Decimal
-    BoolMixin = BoolClass
-    BytesMixin = bytes
-    FileMixin = FileIO
-    # qty 2
-    class BinaryMixin(bytes, FileIO):
-        pass
-    class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
-        pass
-    class NoneTupleMixin(NoneClass, tuple):
-        pass
-    class NoneStrMixin(NoneClass, str):
-        pass
-    class NoneDecimalMixin(NoneClass, decimal.Decimal):
-        pass
-    class NoneBoolMixin(NoneClass, BoolClass):
-        pass
-    class FrozenDictTupleMixin(frozendict.frozendict, tuple):
-        pass
-    class FrozenDictStrMixin(frozendict.frozendict, str):
-        pass
-    class FrozenDictDecimalMixin(frozendict.frozendict, decimal.Decimal):
-        pass
-    class FrozenDictBoolMixin(frozendict.frozendict, BoolClass):
-        pass
-    class TupleStrMixin(tuple, str):
-        pass
-    class TupleDecimalMixin(tuple, decimal.Decimal):
-        pass
-    class TupleBoolMixin(tuple, BoolClass):
-        pass
-    class StrDecimalMixin(str, decimal.Decimal):
-        pass
-    class StrBoolMixin(str, BoolClass):
-        pass
-    class DecimalBoolMixin(decimal.Decimal, BoolClass):
-        pass
-    # qty 3
-    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
-        pass
-    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
-        pass
-    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
-        pass
-    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
-        pass
-    class NoneTupleStrMixin(NoneClass, tuple, str):
-        pass
-    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
-        pass
-    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
-        pass
-    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
-        pass
-    class NoneStrBoolMixin(NoneClass, str, BoolClass):
-        pass
-    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
-        pass
-    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
-        pass
-    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
-        pass
-    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
-        pass
-    class TupleStrBoolMixin(tuple, str, BoolClass):
-        pass
-    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
-        pass
-    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
-        pass
-    # qty 4
-    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
-        pass
-    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
-        pass
-    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
-        pass
-    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
-        pass
-    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
-        pass
-else:
-    # qty 1
-    class NoneMixin:
-        _types = {NoneClass}
-    class FrozenDictMixin:
-        _types = {frozendict.frozendict}
-    class TupleMixin:
-        _types = {tuple}
-    class StrMixin:
-        _types = {str}
-    class DecimalMixin:
-        _types = {decimal.Decimal}
-    class BoolMixin:
-        _types = {BoolClass}
-    class BytesMixin:
-        _types = {bytes}
-    class FileMixin:
-        _types = {FileIO}
-    # qty 2
-    class BinaryMixin:
-        _types = {bytes, FileIO}
-    class NoneFrozenDictMixin:
-        _types = {NoneClass, frozendict.frozendict}
-    class NoneTupleMixin:
-        _types = {NoneClass, tuple}
-    class NoneStrMixin:
-        _types = {NoneClass, str}
-    class NoneDecimalMixin:
-        _types = {NoneClass, decimal.Decimal}
-    class NoneBoolMixin:
-        _types = {NoneClass, BoolClass}
-    class FrozenDictTupleMixin:
-        _types = {frozendict.frozendict, tuple}
-    class FrozenDictStrMixin:
-        _types = {frozendict.frozendict, str}
-    class FrozenDictDecimalMixin:
-        _types = {frozendict.frozendict, decimal.Decimal}
-    class FrozenDictBoolMixin:
-        _types = {frozendict.frozendict, BoolClass}
-    class TupleStrMixin:
-        _types = {tuple, str}
-    class TupleDecimalMixin:
-        _types = {tuple, decimal.Decimal}
-    class TupleBoolMixin:
-        _types = {tuple, BoolClass}
-    class StrDecimalMixin:
-        _types = {str, decimal.Decimal}
-    class StrBoolMixin:
-        _types = {str, BoolClass}
-    class DecimalBoolMixin:
-        _types = {decimal.Decimal, BoolClass}
-    # qty 3
-    class NoneFrozenDictTupleMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple}
-    class NoneFrozenDictStrMixin:
-        _types = {NoneClass, frozendict.frozendict, str}
-    class NoneFrozenDictDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
-    class NoneFrozenDictBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, BoolClass}
-    class NoneTupleStrMixin:
-        _types = {NoneClass, tuple, str}
-    class NoneTupleDecimalMixin:
-        _types = {NoneClass, tuple, decimal.Decimal}
-    class NoneTupleBoolMixin:
-        _types = {NoneClass, tuple, BoolClass}
-    class NoneStrDecimalMixin:
-        _types = {NoneClass, str, decimal.Decimal}
-    class NoneStrBoolMixin:
-        _types = {NoneClass, str, BoolClass}
-    class NoneDecimalBoolMixin:
-        _types = {NoneClass, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrMixin:
-        _types = {frozendict.frozendict, tuple, str}
-    class FrozenDictTupleDecimalMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal}
-    class FrozenDictTupleBoolMixin:
-        _types = {frozendict.frozendict, tuple, BoolClass}
-    class FrozenDictStrDecimalMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal}
-    class FrozenDictStrBoolMixin:
-        _types = {frozendict.frozendict, str, BoolClass}
-    class FrozenDictDecimalBoolMixin:
-        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
-    class TupleStrDecimalMixin:
-        _types = {tuple, str, decimal.Decimal}
-    class TupleStrBoolMixin:
-        _types = {tuple, str, BoolClass}
-    class TupleDecimalBoolMixin:
-        _types = {tuple, decimal.Decimal, BoolClass}
-    class StrDecimalBoolMixin:
-        _types = {str, decimal.Decimal, BoolClass}
-    # qty 4
-    class NoneFrozenDictTupleStrMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str}
-    class NoneFrozenDictTupleDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
-    class NoneFrozenDictTupleBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
-    class NoneFrozenDictStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
-    class NoneFrozenDictStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
-    class NoneFrozenDictDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal}
-    class NoneTupleStrBoolMixin:
-        _types = {NoneClass, tuple, str, BoolClass}
-    class NoneTupleDecimalBoolMixin:
-        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
-    class NoneStrDecimalBoolMixin:
-        _types = {NoneClass, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
-    class FrozenDictTupleStrBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, BoolClass}
-    class FrozenDictTupleDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class FrozenDictStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class TupleStrDecimalBoolMixin:
-        _types = {tuple, str, decimal.Decimal, BoolClass}
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
-    class NoneFrozenDictTupleStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
-    class NoneFrozenDictTupleDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class NoneFrozenDictStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalBoolMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
-
-
-class ValidatorBase:
-    @staticmethod
-    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
-        """Returns true if JSON schema validation is enabled for the specified
-        validation keyword. This can be used to skip JSON schema structural validation
-        as requested in the configuration.
-        Note: the suffix _oapg stands for openapi python (experimental) generator and
-        it has been added to prevent collisions with other methods and properties
-
-        Args:
-            schema_keyword (string): the name of a JSON schema validation keyword.
-            configuration (Configuration): the configuration class.
-        """
-
-        return (configuration is None or
-            not hasattr(configuration, '_disabled_client_side_validations') or
-            schema_keyword not in configuration._disabled_client_side_validations)
-
-    @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
-        raise ApiValueError(
-            "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
-                value=value,
-                constraint_msg=constraint_msg,
-                constraint_value=constraint_value,
-                additional_txt=additional_txt,
-                path_to_item=path_to_item,
-            )
-        )
-
-
-class EnumBase:
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        EnumBase _validate_oapg
-        Validates that arg is in the enum's allowed values
-        """
-        try:
-            cls.MetaOapg.enum_value_to_name[arg]
-        except KeyError:
-            raise ApiValueError("Invalid value {} passed in to {}, allowed_values={}".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class BoolBase:
-    def is_true_oapg(self) -> bool:
-        """
-        A replacement for x is True
-        True if the instance is a BoolClass True Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self)
-
-    def is_false_oapg(self) -> bool:
-        """
-        A replacement for x is False
-        True if the instance is a BoolClass False Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self) is False
-
-
-class NoneBase:
-    def is_none_oapg(self) -> bool:
-        """
-        A replacement for x is None
-        True if the instance is a NoneClass None Singleton
-        """
-        if issubclass(self.__class__, NoneClass):
-            return True
-        return False
-
-
-class StrBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_str_oapg(self) -> str:
-        return self
-
-    @property
-    def as_date_oapg(self) -> date:
-        raise Exception('not implemented')
-
-    @property
-    def as_datetime_oapg(self) -> datetime:
-        raise Exception('not implemented')
-
-    @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        raise Exception('not implemented')
-
-    @property
-    def as_uuid_oapg(self) -> uuid.UUID:
-        raise Exception('not implemented')
-
-    @classmethod
-    def __check_str_validations(
-        cls,
-        arg: str,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_length') and
-                len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_length') and
-                len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('pattern', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'regex')):
-            for regex_dict in cls.MetaOapg.regex:
-                flags = regex_dict.get('flags', 0)
-                if not re.search(regex_dict['pattern'], arg, flags=flags):
-                    if flags != 0:
-                        # Don't print the regex flags if the flags are not
-                        # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
-                            value=arg,
-                            constraint_msg="must match regular expression",
-                            constraint_value=regex_dict['pattern'],
-                            path_to_item=validation_metadata.path_to_item,
-                            additional_txt=" with flags=`{}`".format(flags)
-                        )
-                    cls._raise_validation_errror_message_oapg(
-                        value=arg,
-                        constraint_msg="must match regular expression",
-                        constraint_value=regex_dict['pattern'],
-                        path_to_item=validation_metadata.path_to_item
-                    )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        StrBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, str):
-            cls.__check_str_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class UUIDBase:
-    @property
-    @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
-        return uuid.UUID(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                uuid.UUID(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Invalid value '{}' for type UUID at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        UUIDBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class CustomIsoparser(isoparser):
-
-    @_takes_ascii
-    def parse_isodatetime(self, dt_str):
-        components, pos = self._parse_isodate(dt_str)
-        if len(dt_str) > pos:
-            if self._sep is None or dt_str[pos:pos + 1] == self._sep:
-                components += self._parse_isotime(dt_str[pos + 1:])
-            else:
-                raise ValueError('String contains unknown ISO components')
-
-        if len(components) > 3 and components[3] == 24:
-            components[3] = 0
-            return datetime(*components) + timedelta(days=1)
-
-        if len(components) <= 3:
-            raise ValueError('Value is not a datetime')
-
-        return datetime(*components)
-
-    @_takes_ascii
-    def parse_isodate(self, datestr):
-        components, pos = self._parse_isodate(datestr)
-
-        if len(datestr) > pos:
-            raise ValueError('String contains invalid time components')
-
-        if len(components) > 3:
-            raise ValueError('String contains invalid time components')
-
-        return date(*components)
-
-
-DEFAULT_ISOPARSER = CustomIsoparser()
-
-
-class DateBase:
-    @property
-    @functools.lru_cache()
-    def as_date_oapg(self) -> date:
-        return DEFAULT_ISOPARSER.parse_isodate(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodate(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 date format. "
-                    "Invalid value '{}' for type date at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        DateBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DateTimeBase:
-    @property
-    @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime:
-        return DEFAULT_ISOPARSER.parse_isodatetime(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodatetime(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 datetime format. "
-                    "Invalid value '{}' for type datetime at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DateTimeBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DecimalBase:
-    """
-    A class for storing decimals that are sent over the wire as strings
-    These schemas must remain based on StrBase rather than NumberBase
-    because picking base classes must be deterministic
-    """
-
-    @property
-    @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        return decimal.Decimal(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                decimal.Decimal(arg)
-                return True
-            except decimal.InvalidOperation:
-                raise ApiValueError(
-                    "Value cannot be converted to a decimal. "
-                    "Invalid value '{}' for type decimal at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DecimalBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class NumberBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            """
-            Note: for some numbers like 9.0 they could be represented as an
-            integer but our code chooses to store them as
-            >>> Decimal('9.0').as_tuple()
-            DecimalTuple(sign=0, digits=(9, 0), exponent=-1)
-            so we can tell that the value came from a float and convert it back to a float
-            during later serialization
-            """
-            if self.as_tuple().exponent < 0:
-                # this could be represented as an integer but should be represented as a float
-                # because that's what it was serialized from
-                raise ApiValueError(f'{self} is not an integer')
-            self._as_int = int(self)
-            return self._as_int
-
-    @property
-    def as_float_oapg(self) -> float:
-        try:
-            return self._as_float
-        except AttributeError:
-            if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
-            self._as_float = float(self)
-            return self._as_float
-
-    @classmethod
-    def __check_numeric_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if cls._is_json_validation_enabled_oapg('multipleOf',
-                                      validation_metadata.configuration) and hasattr(cls.MetaOapg, 'multiple_of'):
-            multiple_of_value = cls.MetaOapg.multiple_of
-            if (not (float(arg) / multiple_of_value).is_integer()):
-                # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="value must be a multiple of",
-                    constraint_value=multiple_of_value,
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-        checking_max_or_min_values = any(
-            hasattr(cls.MetaOapg, validation_key) for validation_key in {
-                'exclusive_maximum',
-                'inclusive_maximum',
-                'exclusive_minimum',
-                'inclusive_minimum',
-            }
-        )
-        if not checking_max_or_min_values:
-            return
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_maximum') and
-                arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_maximum') and
-                arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_minimum') and
-                arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_minimum') and
-                arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_minimum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        NumberBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, decimal.Decimal):
-            cls.__check_numeric_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class ListBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def __validate_items(cls, list_items, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for items are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            list_items: the input list of items
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-
-        # if we have definitions for an items schema, use it
-        # otherwise accept anything
-        item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
-        item_cls = cls._get_class_oapg(item_cls)
-        path_to_schemas = {}
-        for i, value in enumerate(list_items):
-            item_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=validation_metadata.path_to_item+(i,),
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if item_validation_metadata.validation_ran_earlier(item_cls):
-                continue
-            other_path_to_schemas = item_cls._validate_oapg(
-                value, validation_metadata=item_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_tuple_validations(
-            cls, arg,
-            validation_metadata: ValidationMetadata):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_items') and
-                len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_items') and
-                len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('uniqueItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
-            unique_items = set(arg)
-            if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
-                    constraint_value='unique_items==True',
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        ListBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, tuple):
-            cls.__check_tuple_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, tuple):
-            return _path_to_schemas
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        other_path_to_schemas = cls.__validate_items(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_items_oapg(
-        cls: 'Schema',
-        arg: typing.List[typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        '''
-        ListBase _get_items_oapg
-        '''
-        cast_items = []
-
-        for i, value in enumerate(arg):
-            item_path_to_item = path_to_item + (i,)
-            item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
-                value,
-                item_path_to_item,
-                path_to_schemas
-            )
-            cast_items.append(new_value)
-
-        return cast_items
-
-
-class Discriminable:
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def _ensure_discriminator_value_present_oapg(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args):
-        if not args or args and disc_property_name not in args[0]:
-            # The input data does not contain the discriminator property
-            raise ApiValueError(
-                "Cannot deserialize input data due to missing discriminator. "
-                "The discriminator property '{}' is missing at path: {}".format(disc_property_name, validation_metadata.path_to_item)
-            )
-
-    @classmethod
-    def get_discriminated_class_oapg(cls, disc_property_name: str, disc_payload_value: str):
-        """
-        Used in schemas with discriminators
-        """
-        if not hasattr(cls.MetaOapg, 'discriminator'):
-            return None
-        disc = cls.MetaOapg.discriminator()
-        if disc_property_name not in disc:
-            return None
-        discriminated_cls = disc[disc_property_name].get(disc_payload_value)
-        if discriminated_cls is not None:
-            return discriminated_cls
-        if not hasattr(cls, 'MetaOapg'):
-            return None
-        elif not (
-            hasattr(cls.MetaOapg, 'all_of') or
-            hasattr(cls.MetaOapg, 'one_of') or
-            hasattr(cls.MetaOapg, 'any_of')
-        ):
-            return None
-        # TODO stop traveling if a cycle is hit
-        if hasattr(cls.MetaOapg, 'all_of'):
-            for allof_cls in cls.MetaOapg.all_of():
-                discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'one_of'):
-            for oneof_cls in cls.MetaOapg.one_of():
-                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'any_of'):
-            for anyof_cls in cls.MetaOapg.any_of():
-                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        return None
-
-
-class DictBase(Discriminable, ValidatorBase):
-
-    @classmethod
-    def __validate_arg_presence(cls, arg):
-        """
-        Ensures that:
-        - all required arguments are passed in
-        - the input variable names are valid
-            - present in properties or
-            - accepted because additionalProperties exists
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-            - a var_name is invalid if additional_properties == NotAnyTypeSchema
-            and var_name not in properties.__annotations__
-        - required properties were not passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        seen_required_properties = set()
-        invalid_arguments = []
-        required_property_names = getattr(cls.MetaOapg, 'required', set())
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name in arg:
-            if property_name in required_property_names:
-                seen_required_properties.add(property_name)
-            elif property_name in property_annotations:
-                continue
-            elif additional_properties is not NotAnyTypeSchema:
-                continue
-            else:
-                invalid_arguments.append(property_name)
-        missing_required_arguments = list(required_property_names - seen_required_properties)
-        if missing_required_arguments:
-            missing_required_arguments.sort()
-            raise ApiTypeError(
-                "{} is missing {} required argument{}: {}".format(
-                    cls.__name__,
-                    len(missing_required_arguments),
-                    "s" if len(missing_required_arguments) > 1 else "",
-                    missing_required_arguments
-                )
-            )
-        if invalid_arguments:
-            invalid_arguments.sort()
-            raise ApiTypeError(
-                "{} was passed {} invalid argument{}: {}".format(
-                    cls.__name__,
-                    len(invalid_arguments),
-                    "s" if len(invalid_arguments) > 1 else "",
-                    invalid_arguments
-                )
-            )
-
-    @classmethod
-    def __validate_args(cls, arg, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for properties are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        path_to_schemas = {}
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name, value in arg.items():
-            path_to_item = validation_metadata.path_to_item+(property_name,)
-            if property_name in property_annotations:
-                schema = property_annotations[property_name]
-            elif additional_properties is not NotAnyTypeSchema:
-                if additional_properties is UnsetAnyTypeSchema:
-                    """
-                    If additionalProperties is unset and this path_to_item does not yet have
-                    any validations on it, validate it.
-                    If it already has validations on it, skip this validation.
-                    """
-                    if path_to_item in path_to_schemas:
-                        continue
-                schema = additional_properties
-            else:
-                raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
-                    value, cls, validation_metadata.path_to_item+(property_name,)
-                ))
-            schema = cls._get_class_oapg(schema)
-            arg_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=path_to_item,
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if arg_validation_metadata.validation_ran_earlier(schema):
-                continue
-            other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_dict_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_properties') and
-                len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_properties') and
-                len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DictBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, frozendict.frozendict):
-            cls.__check_dict_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, frozendict.frozendict):
-            return _path_to_schemas
-        cls.__validate_arg_presence(arg)
-        other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
-        update(_path_to_schemas, other_path_to_schemas)
-        try:
-            discriminator = cls.MetaOapg.discriminator()
-        except AttributeError:
-            return _path_to_schemas
-        # discriminator exists
-        disc_prop_name = list(discriminator.keys())[0]
-        cls._ensure_discriminator_value_present_oapg(disc_prop_name, validation_metadata, arg)
-        discriminated_cls = cls.get_discriminated_class_oapg(
-            disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name])
-        if discriminated_cls is None:
-            raise ApiValueError(
-                "Invalid discriminator value was passed in to {}.{} Only the values {} are allowed at {}".format(
-                    cls.__name__,
-                    disc_prop_name,
-                    list(discriminator[disc_prop_name].keys()),
-                    validation_metadata.path_to_item + (disc_prop_name,)
-                )
-            )
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        if updated_vm.validation_ran_earlier(discriminated_cls):
-            return _path_to_schemas
-        other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_properties_oapg(
-        cls,
-        arg: typing.Dict[str, typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        """
-        DictBase _get_properties_oapg, this is how properties are set
-        These values already passed validation
-        """
-        dict_items = {}
-
-        for property_name_js, value in arg.items():
-            property_path_to_item = path_to_item + (property_name_js,)
-            property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
-                value,
-                property_path_to_item,
-                path_to_schemas
-            )
-            dict_items[property_name_js] = new_value
-
-        return dict_items
-
-    def __setattr__(self, name: str, value: typing.Any):
-        if not isinstance(self, FileIO):
-            raise AttributeError('property setting not supported on immutable instances')
-
-    def __getattr__(self, name: str):
-        """
-        for instance.name access
-        Properties are only type hinted for required properties
-        so that hasattr(instance, 'optionalProp') is False when that key is not present
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        if name not in self.__class__.__annotations__:
-            raise AttributeError(f"{self} has no attribute '{name}'")
-        try:
-            value = self[name]
-            return value
-        except KeyError as ex:
-            raise AttributeError(str(ex))
-
-    def __getitem__(self, name: str):
-        """
-        dict_instance[name] accessor
-        key errors thrown
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        return super().__getitem__(name)
-
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
-        # dict_instance[name] accessor
-        if not isinstance(self, frozendict.frozendict):
-            raise NotImplementedError()
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return unset
-
-
-def cast_to_allowed_types(
-    arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict.frozendict, list, tuple, bytes, Schema, io.FileIO, io.BufferedReader],
-    from_server: bool,
-    validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]],
-    path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-) -> typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO]:
-    """
-    Casts the input payload arg into the allowed types
-    The input validated_path_to_schemas is mutated by running this function
-
-    When from_server is False then
-    - date/datetime is cast to str
-    - int/float is cast to Decimal
-
-    If a Schema instance is passed in it is converted back to a primitive instance because
-    One may need to validate that data to the original Schema class AND additional different classes
-    those additional classes will need to be added to the new manufactured class for that payload
-    If the code didn't do this and kept the payload as a Schema instance it would fail to validate to other
-    Schema classes and the code wouldn't be able to mfg a new class that includes all valid schemas
-    TODO: store the validated schema classes in validation_metadata
-
-    Args:
-        arg: the payload
-        from_server: whether this payload came from the server or not
-        validated_path_to_schemas: a dict that stores the validated classes at any path location in the payload
-    """
-    if isinstance(arg, Schema):
-        # store the already run validations
-        schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            """
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            """
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
-        validated_path_to_schemas[path_to_item] = schema_classes
-
-    type_error = ApiTypeError(f"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}")
-    if isinstance(arg, str):
-        return str(arg)
-    elif isinstance(arg, (dict, frozendict.frozendict)):
-        return frozendict.frozendict({key: cast_to_allowed_types(val, from_server, validated_path_to_schemas, path_to_item + (key,)) for key, val in arg.items()})
-    elif isinstance(arg, (bool, BoolClass)):
-        """
-        this check must come before isinstance(arg, (int, float))
-        because isinstance(True, int) is True
-        """
-        if arg:
-            return BoolClass.TRUE
-        return BoolClass.FALSE
-    elif isinstance(arg, int):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, float):
-        decimal_from_float = decimal.Decimal(arg)
-        if decimal_from_float.as_integer_ratio()[1] == 1:
-            # 9.0 -> Decimal('9.0')
-            # 3.4028234663852886e+38 -> Decimal('340282346638528859811704183484516925440.0')
-            return decimal.Decimal(str(decimal_from_float)+'.0')
-        return decimal_from_float
-    elif isinstance(arg, (tuple, list)):
-        return tuple([cast_to_allowed_types(item, from_server, validated_path_to_schemas, path_to_item + (i,)) for i, item in enumerate(arg)])
-    elif isinstance(arg, (none_type, NoneClass)):
-        return NoneClass.NONE
-    elif isinstance(arg, (date, datetime)):
-        if not from_server:
-            return arg.isoformat()
-        raise type_error
-    elif isinstance(arg, uuid.UUID):
-        if not from_server:
-            return str(arg)
-        raise type_error
-    elif isinstance(arg, decimal.Decimal):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, bytes):
-        return bytes(arg)
-    elif isinstance(arg, (io.FileIO, io.BufferedReader)):
-        return FileIO(arg)
-    raise ValueError('Invalid type passed in got input={} type={}'.format(arg, type(arg)))
-
-
-class ComposedBase(Discriminable):
-
-    @classmethod
-    def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
-        path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of():
-            if validation_metadata.validation_ran_earlier(allof_cls):
-                continue
-            other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __get_oneof_class(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata,
-    ):
-        oneof_classes = []
-        path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of():
-            if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
-                oneof_classes.append(oneof_cls)
-                continue
-            if validation_metadata.validation_ran_earlier(oneof_cls):
-                oneof_classes.append(oneof_cls)
-                continue
-            try:
-                path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and oneof_cls is discriminated_cls:
-                    raise ex
-                continue
-            oneof_classes.append(oneof_cls)
-        if not oneof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the oneOf schemas matched the input data.".format(cls)
-            )
-        elif len(oneof_classes) > 1:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. Multiple "
-                "oneOf schemas {} matched the inputs, but a max of one is allowed.".format(cls, oneof_classes)
-            )
-        # exactly one class matches
-        return path_to_schemas
-
-    @classmethod
-    def __get_anyof_classes(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata
-    ):
-        anyof_classes = []
-        path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of():
-            if validation_metadata.validation_ran_earlier(anyof_cls):
-                anyof_classes.append(anyof_cls)
-                continue
-
-            try:
-                other_path_to_schemas = anyof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and anyof_cls is discriminated_cls:
-                    raise ex
-                continue
-            anyof_classes.append(anyof_cls)
-            update(path_to_schemas, other_path_to_schemas)
-        if not anyof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the anyOf schemas matched the input data.".format(cls)
-            )
-        return path_to_schemas
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        ComposedBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        # validation checking on types, validations, and enums
-        path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-
-        # process composed schema
-        discriminator = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
-            discriminator = cls.MetaOapg.discriminator()
-        discriminated_cls = None
-        if discriminator and arg and isinstance(arg, frozendict.frozendict):
-            disc_property_name = list(discriminator.keys())[0]
-            cls._ensure_discriminator_value_present_oapg(disc_property_name, updated_vm, arg)
-            # get discriminated_cls by looking at the dict in the current class
-            discriminated_cls = cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name])
-            if discriminated_cls is None:
-                raise ApiValueError(
-                    "Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}".format(
-                        arg[disc_property_name],
-                        cls.__name__,
-                        disc_property_name,
-                        list(discriminator[disc_property_name].keys()),
-                        updated_vm.path_to_item + (disc_property_name,)
-                    )
-                )
-
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'all_of'):
-            other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm)
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'one_of'):
-            other_path_to_schemas = cls.__get_oneof_class(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'any_of'):
-            other_path_to_schemas = cls.__get_anyof_classes(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        not_cls = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
-            not_cls = cls.MetaOapg.not_schema
-            not_cls = cls._get_class_oapg(not_cls)
-        if not_cls:
-            other_path_to_schemas = None
-            not_exception = ApiValueError(
-                "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
-                    arg,
-                    cls.__name__,
-                    not_cls.__name__,
-                )
-            )
-            if updated_vm.validation_ran_earlier(not_cls):
-                raise not_exception
-
-            try:
-                other_path_to_schemas = not_cls._validate_oapg(arg, validation_metadata=updated_vm)
-            except (ApiValueError, ApiTypeError):
-                pass
-            if other_path_to_schemas:
-                raise not_exception
-
-        if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
-            # TODO use an exception from this package here
-            assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
-        return path_to_schemas
-
-
-# DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
-class ComposedSchema(
-    ComposedBase,
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
-        if not args:
-            if not kwargs:
-                raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__))
-            args = (kwargs, )
-        return super().from_openapi_data_oapg(args[0], _configuration=_configuration)
-
-
-class ListSchema(
-    ListBase,
-    Schema,
-    TupleMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NoneSchema(
-    NoneBase,
-    Schema,
-    NoneMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NumberSchema(
-    NumberBase,
-    Schema,
-    DecimalMixin
-):
-    """
-    This is used for type: number with no format
-    Both integers AND floats are accepted
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class IntBase:
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            self._as_int = int(self)
-            return self._as_int
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-
-            denominator = arg.as_integer_ratio()[-1]
-            if denominator != 1:
-                raise ApiValueError(
-                    "Invalid value '{}' for type integer at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        IntBase _validate_oapg
-        TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class IntSchema(IntBase, NumberSchema):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class Int32Base:
-    __inclusive_minimum = decimal.Decimal(-2147483648)
-    __inclusive_maximum = decimal.Decimal(2147483647)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int32 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int32Schema(
-    Int32Base,
-    IntSchema
-):
-    pass
-
-
-class Int64Base:
-    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
-    __inclusive_maximum = decimal.Decimal(9223372036854775807)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int64 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int64Schema(
-    Int64Base,
-    IntSchema
-):
-    pass
-
-
-class Float32Base:
-    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type float at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Float32Schema(
-    Float32Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class Float64Base:
-    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type double at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-class Float64Schema(
-    Float64Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        # todo check format
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class StrSchema(
-    StrBase,
-    Schema,
-    StrMixin
-):
-    """
-    date + datetime string types must inherit from this class
-    That is because one can validate a str payload as both:
-    - type: string (format unset)
-    - type: string, format: date
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class UUIDSchema(UUIDBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateSchema(DateBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateTimeSchema(DateTimeBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DecimalSchema(DecimalBase, StrSchema):
-
-    def __new__(cls, arg: str, **kwargs: Configuration):
-        """
-        Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
-        which can be simple (str) or complex (dicts or lists with nested values)
-        Because casting is only done once and recursively casts all values prior to validation then for a potential
-        client side Decimal input if Decimal was accepted as an input in DecimalSchema then one would not know
-        if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
-        where it should stay as Decimal.
-        """
-        return super().__new__(cls, arg, **kwargs)
-
-
-class BytesSchema(
-    Schema,
-    BytesMixin
-):
-    """
-    this class will subclass bytes and is immutable
-    """
-    def __new__(cls, arg: bytes, **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class FileSchema(
-    Schema,
-    FileMixin
-):
-    """
-    This class is NOT immutable
-    Dynamic classes are built using it for example when AnyType allows in binary data
-    Al other schema classes ARE immutable
-    If one wanted to make this immutable one could make this a DictSchema with required properties:
-    - data = BytesSchema (which would be an immutable bytes based schema)
-    - file_name = StrSchema
-    and cast_to_allowed_types would convert bytes and file instances into dicts containing data + file_name
-    The downside would be that data would be stored in memory which one may not want to do for very large files
-
-    The developer is responsible for closing this file and deleting it
-
-    This class was kept as mutable:
-    - to allow file reading and writing to disk
-    - to be able to preserve file name info
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class BinaryBase:
-    pass
-
-
-class BinarySchema(
-    ComposedBase,
-    BinaryBase,
-    Schema,
-    BinaryMixin
-):
-    class MetaOapg:
-        @staticmethod
-        def one_of():
-            return [
-                BytesSchema,
-                FileSchema,
-            ]
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
-
-
-class BoolSchema(
-    BoolBase,
-    Schema,
-    BoolMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class AnyTypeSchema(
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
-):
-    # Python representation of a schema defined as true or {}
-    pass
-
-
-class UnsetAnyTypeSchema(AnyTypeSchema):
-    # Used when additionalProperties/items was not explicitly defined and a defining schema is needed
-    pass
-
-
-class NotAnyTypeSchema(
-    ComposedSchema,
-):
-    """
-    Python representation of a schema defined as false or {'not': {}}
-    Does not allow inputs in of AnyType
-    Note: validations on this class are never run because the code knows that no inputs will ever validate
-    """
-
-    class MetaOapg:
-        not_schema = AnyTypeSchema
-
-    def __new__(
-        cls,
-        *args,
-        _configuration: typing.Optional[Configuration] = None,
-    ) -> 'NotAnyTypeSchema':
-        return super().__new__(
-            cls,
-            *args,
-            _configuration=_configuration,
-        )
-
-
-class DictSchema(
-    DictBase,
-    Schema,
-    FrozenDictMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *args, **kwargs)
-
-
-schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
-
-
-@functools.lru_cache()
-def get_new_class(
-    class_name: str,
-    bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
-) -> typing.Type[Schema]:
-    """
-    Returns a new class that is made with the subclass bases
-    """
-    new_cls: typing.Type[Schema] = type(class_name, bases, {})
-    return new_cls
-
-
-LOG_CACHE_USAGE = False
-
-
-def log_cache_usage(cache_fn):
-    if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/__init__.py
index 5af7c6f0..cb3b2e65 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/__init__.py
@@ -5,24 +5,31 @@
 """
     Volumes manager API
 
-    CloudHarness Volumes manager API  # noqa: E501
+    CloudHarness Volumes manager API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 __version__ = "1.0.0"
 
+# import apis into sdk package
+from cloudharness_cli.volumemanager.api.rest_api import RestApi
+
 # import ApiClient
+from cloudharness_cli.volumemanager.api_response import ApiResponse
 from cloudharness_cli.volumemanager.api_client import ApiClient
-
-# import Configuration
 from cloudharness_cli.volumemanager.configuration import Configuration
-
-# import exceptions
 from cloudharness_cli.volumemanager.exceptions import OpenApiException
-from cloudharness_cli.volumemanager.exceptions import ApiAttributeError
 from cloudharness_cli.volumemanager.exceptions import ApiTypeError
 from cloudharness_cli.volumemanager.exceptions import ApiValueError
 from cloudharness_cli.volumemanager.exceptions import ApiKeyError
+from cloudharness_cli.volumemanager.exceptions import ApiAttributeError
 from cloudharness_cli.volumemanager.exceptions import ApiException
+
+# import models into sdk package
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+from cloudharness_cli.volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/__init__.py
new file mode 100644
index 00000000..4bf39aeb
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/__init__.py
@@ -0,0 +1,5 @@
+# flake8: noqa
+
+# import apis into api package
+from cloudharness_cli.volumemanager.api.rest_api import RestApi
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/rest_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/rest_api.py
new file mode 100644
index 00000000..6e4764a4
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api/rest_api.py
@@ -0,0 +1,570 @@
+# coding: utf-8
+
+"""
+    Volumes manager API
+
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import Field, StrictStr
+from typing_extensions import Annotated
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+from cloudharness_cli.volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate
+
+from cloudharness_cli.volumemanager.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.volumemanager.api_response import ApiResponse
+from cloudharness_cli.volumemanager.rest import RESTResponseType
+
+
+class RestApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def pvc_name_get(
+        self,
+        name: Annotated[StrictStr, Field(description="The name of the Persistent Volume Claim to be retrieved")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> PersistentVolumeClaim:
+        """Retrieve a Persistent Volume Claim from the Kubernetes repository.
+
+
+        :param name: The name of the Persistent Volume Claim to be retrieved (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._pvc_name_get_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "PersistentVolumeClaim",
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def pvc_name_get_with_http_info(
+        self,
+        name: Annotated[StrictStr, Field(description="The name of the Persistent Volume Claim to be retrieved")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[PersistentVolumeClaim]:
+        """Retrieve a Persistent Volume Claim from the Kubernetes repository.
+
+
+        :param name: The name of the Persistent Volume Claim to be retrieved (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._pvc_name_get_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "PersistentVolumeClaim",
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def pvc_name_get_without_preload_content(
+        self,
+        name: Annotated[StrictStr, Field(description="The name of the Persistent Volume Claim to be retrieved")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Retrieve a Persistent Volume Claim from the Kubernetes repository.
+
+
+        :param name: The name of the Persistent Volume Claim to be retrieved (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._pvc_name_get_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "PersistentVolumeClaim",
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _pvc_name_get_serialize(
+        self,
+        name,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if name is not None:
+            _path_params['name'] = name
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'bearerAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/pvc/{name}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def pvc_post(
+        self,
+        persistent_volume_claim_create: Annotated[PersistentVolumeClaimCreate, Field(description="The Persistent Volume Claim to create.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> PersistentVolumeClaim:
+        """Create a Persistent Volume Claim in Kubernetes
+
+
+        :param persistent_volume_claim_create: The Persistent Volume Claim to create. (required)
+        :type persistent_volume_claim_create: PersistentVolumeClaimCreate
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._pvc_post_serialize(
+            persistent_volume_claim_create=persistent_volume_claim_create,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '201': "PersistentVolumeClaim",
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def pvc_post_with_http_info(
+        self,
+        persistent_volume_claim_create: Annotated[PersistentVolumeClaimCreate, Field(description="The Persistent Volume Claim to create.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[PersistentVolumeClaim]:
+        """Create a Persistent Volume Claim in Kubernetes
+
+
+        :param persistent_volume_claim_create: The Persistent Volume Claim to create. (required)
+        :type persistent_volume_claim_create: PersistentVolumeClaimCreate
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._pvc_post_serialize(
+            persistent_volume_claim_create=persistent_volume_claim_create,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '201': "PersistentVolumeClaim",
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def pvc_post_without_preload_content(
+        self,
+        persistent_volume_claim_create: Annotated[PersistentVolumeClaimCreate, Field(description="The Persistent Volume Claim to create.")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Create a Persistent Volume Claim in Kubernetes
+
+
+        :param persistent_volume_claim_create: The Persistent Volume Claim to create. (required)
+        :type persistent_volume_claim_create: PersistentVolumeClaimCreate
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._pvc_post_serialize(
+            persistent_volume_claim_create=persistent_volume_claim_create,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '201': "PersistentVolumeClaim",
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _pvc_post_serialize(
+        self,
+        persistent_volume_claim_create,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+        if persistent_volume_claim_create is not None:
+            _body_params = persistent_volume_claim_create
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'bearerAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/pvc',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_client.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_client.py
index 87150397..559185ce 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_client.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_client.py
@@ -1,1499 +1,781 @@
 # coding: utf-8
+
 """
     Volumes manager API
 
-    CloudHarness Volumes manager API  # noqa: E501
+    CloudHarness Volumes manager API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
-from dataclasses import dataclass
-from decimal import Decimal
-import enum
-import email
+import datetime
+from dateutil.parser import parse
+from enum import Enum
 import json
+import mimetypes
 import os
-import io
-import atexit
-from multiprocessing.pool import ThreadPool
 import re
 import tempfile
-import typing
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-from urllib.parse import urlparse, quote
-from urllib3.fields import RequestField as RequestFieldBase
 
-import frozendict
+from urllib.parse import quote
+from typing import Tuple, Optional, List, Dict, Union
+from pydantic import SecretStr
 
-from cloudharness_cli.volumemanager import rest
 from cloudharness_cli.volumemanager.configuration import Configuration
-from cloudharness_cli.volumemanager.exceptions import ApiTypeError, ApiValueError
-from cloudharness_cli.volumemanager.schemas import (
-    NoneClass,
-    BoolClass,
-    Schema,
-    FileIO,
-    BinarySchema,
-    date,
-    datetime,
-    none_type,
-    Unset,
-    unset,
+from cloudharness_cli.volumemanager.api_response import ApiResponse, T as ApiResponseT
+import cloudharness_cli.volumemanager.models
+from cloudharness_cli.volumemanager import rest
+from cloudharness_cli.volumemanager.exceptions import (
+    ApiValueError,
+    ApiException,
+    BadRequestException,
+    UnauthorizedException,
+    ForbiddenException,
+    NotFoundException,
+    ServiceException
 )
 
+RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]
 
-class RequestField(RequestFieldBase):
-    def __eq__(self, other):
-        if not isinstance(other, RequestField):
-            return False
-        return self.__dict__ == other.__dict__
-
-
-class JSONEncoder(json.JSONEncoder):
-    compact_separators = (',', ':')
-
-    def default(self, obj):
-        if isinstance(obj, str):
-            return str(obj)
-        elif isinstance(obj, float):
-            return float(obj)
-        elif isinstance(obj, int):
-            return int(obj)
-        elif isinstance(obj, Decimal):
-            if obj.as_tuple().exponent >= 0:
-                return int(obj)
-            return float(obj)
-        elif isinstance(obj, NoneClass):
-            return None
-        elif isinstance(obj, BoolClass):
-            return bool(obj)
-        elif isinstance(obj, (dict, frozendict.frozendict)):
-            return {key: self.default(val) for key, val in obj.items()}
-        elif isinstance(obj, (list, tuple)):
-            return [self.default(item) for item in obj]
-        raise ApiValueError('Unable to prepare type {} for serialization'.format(obj.__class__.__name__))
-
-
-class ParameterInType(enum.Enum):
-    QUERY = 'query'
-    HEADER = 'header'
-    PATH = 'path'
-    COOKIE = 'cookie'
-
-
-class ParameterStyle(enum.Enum):
-    MATRIX = 'matrix'
-    LABEL = 'label'
-    FORM = 'form'
-    SIMPLE = 'simple'
-    SPACE_DELIMITED = 'spaceDelimited'
-    PIPE_DELIMITED = 'pipeDelimited'
-    DEEP_OBJECT = 'deepObject'
-
-
-class PrefixSeparatorIterator:
-    # A class to store prefixes and separators for rfc6570 expansions
-
-    def __init__(self, prefix: str, separator: str):
-        self.prefix = prefix
-        self.separator = separator
-        self.first = True
-        if separator in {'.', '|', '%20'}:
-            item_separator = separator
-        else:
-            item_separator = ','
-        self.item_separator = item_separator
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.first:
-            self.first = False
-            return self.prefix
-        return self.separator
-
-
-class ParameterSerializerBase:
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        return False
-
-    @staticmethod
-    def __ref6570_item_value(in_data: typing.Any, percent_encode: bool):
-        """
-        Get representation if str/float/int/None/items in list/ values in dict
-        None is returned if an item is undefined, use cases are value=
-        - None
-        - []
-        - {}
-        - [None, None None]
-        - {'a': None, 'b': None}
-        """
-        if type(in_data) in {str, float, int}:
-            if percent_encode:
-                return quote(str(in_data))
-            return str(in_data)
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, list) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, dict) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        raise ApiValueError('Unable to generate a ref6570 item representation of {}'.format(in_data))
-
-    @staticmethod
-    def _to_dict(name: str, value: str):
-        return {name: value}
-
-    @classmethod
-    def __ref6570_str_float_int_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_value = cls.__ref6570_item_value(in_data, percent_encode)
-        if item_value is None or (item_value == '' and prefix_separator_iterator.separator == ';'):
-            return next(prefix_separator_iterator) + var_name_piece
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        return next(prefix_separator_iterator) + var_name_piece + value_pair_equals + item_value
+class ApiClient:
+    """Generic API client for OpenAPI client library builds.
 
-    @classmethod
-    def __ref6570_list_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_values = [cls.__ref6570_item_value(v, percent_encode) for v in in_data]
-        item_values = [v for v in item_values if v is not None]
-        if not item_values:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece +
-                value_pair_equals +
-                prefix_separator_iterator.item_separator.join(item_values)
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [var_name_piece + value_pair_equals + val for val in item_values]
-        )
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
 
-    @classmethod
-    def __ref6570_dict_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        in_data_transformed = {key: cls.__ref6570_item_value(val, percent_encode) for key, val in in_data.items()}
-        in_data_transformed = {key: val for key, val in in_data_transformed.items() if val is not None}
-        if not in_data_transformed:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece + value_pair_equals +
-                prefix_separator_iterator.item_separator.join(
-                    prefix_separator_iterator.item_separator.join(
-                        item_pair
-                    ) for item_pair in in_data_transformed.items()
-                )
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [key + '=' + val for key, val in in_data_transformed.items()]
-        )
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    """
 
-    @classmethod
-    def _ref6570_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator
-    ) -> str:
-        """
-        Separator is for separate variables like dict with explode true, not for array item separation
-        """
-        named_parameter_expansion = prefix_separator_iterator.separator in {'&', ';'}
-        var_name_piece = variable_name if named_parameter_expansion else ''
-        if type(in_data) in {str, float, int}:
-            return cls.__ref6570_str_float_int_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        elif isinstance(in_data, list):
-            return cls.__ref6570_list_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, dict):
-            return cls.__ref6570_dict_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        # bool, bytes, etc
-        raise ApiValueError('Unable to generate a ref6570 representation of {}'.format(in_data))
+    PRIMITIVE_TYPES = (float, bool, bytes, str, int)
+    NATIVE_TYPES_MAPPING = {
+        'int': int,
+        'long': int, # TODO remove as only py3 is supported?
+        'float': float,
+        'str': str,
+        'bool': bool,
+        'date': datetime.date,
+        'datetime': datetime.datetime,
+        'object': object,
+    }
+    _pool = None
 
+    def __init__(
+        self,
+        configuration=None,
+        header_name=None,
+        header_value=None,
+        cookie=None
+    ) -> None:
+        # use default configuration if none is provided
+        if configuration is None:
+            configuration = Configuration.get_default()
+        self.configuration = configuration
 
-class StyleFormSerializer(ParameterSerializerBase):
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        if style is ParameterStyle.FORM:
-            return True
-        return super()._get_default_explode(style)
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+        self.client_side_validation = configuration.client_side_validation
 
-    def _serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> str:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    def __enter__(self):
+        return self
 
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass
 
-class StyleSimpleSerializer(ParameterSerializerBase):
+    @property
+    def user_agent(self):
+        """User agent for this API client"""
+        return self.default_headers['User-Agent']
 
-    def _serialize_simple(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool
-    ) -> str:
-        prefix_separator_iterator = PrefixSeparatorIterator('', ',')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
 
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
 
-class JSONDetector:
-    """
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    """
-    __json_content_type_pattern = re.compile("application/[^+]*[+]?(json);?.*")
 
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
-@dataclass
-class ParameterBase(JSONDetector):
-    name: str
-    in_type: ParameterInType
-    required: bool
-    style: typing.Optional[ParameterStyle]
-    explode: typing.Optional[bool]
-    allow_reserved: typing.Optional[bool]
-    schema: typing.Optional[typing.Type[Schema]]
-    content: typing.Optional[typing.Dict[str, typing.Type[Schema]]]
-
-    __style_to_in_type = {
-        ParameterStyle.MATRIX: {ParameterInType.PATH},
-        ParameterStyle.LABEL: {ParameterInType.PATH},
-        ParameterStyle.FORM: {ParameterInType.QUERY, ParameterInType.COOKIE},
-        ParameterStyle.SIMPLE: {ParameterInType.PATH, ParameterInType.HEADER},
-        ParameterStyle.SPACE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.PIPE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.DEEP_OBJECT: {ParameterInType.QUERY},
-    }
-    __in_type_to_default_style = {
-        ParameterInType.QUERY: ParameterStyle.FORM,
-        ParameterInType.PATH: ParameterStyle.SIMPLE,
-        ParameterInType.HEADER: ParameterStyle.SIMPLE,
-        ParameterInType.COOKIE: ParameterStyle.FORM,
-    }
-    __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
-    _json_encoder = JSONEncoder()
+    _default = None
 
     @classmethod
-    def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
-        if style is None:
-            return
-        in_type_set = cls.__style_to_in_type[style]
-        if in_type not in in_type_set:
-            raise ValueError(
-                'Invalid style and in_type combination. For style={} only in_type={} are allowed'.format(
-                    style, in_type_set
-                )
-            )
-
-    def __init__(
-        self,
-        name: str,
-        in_type: ParameterInType,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        if schema is None and content is None:
-            raise ValueError('Value missing; Pass in either schema or content')
-        if schema and content:
-            raise ValueError('Too many values provided. Both schema and content were provided. Only one may be input')
-        if name in self.__disallowed_header_names and in_type is ParameterInType.HEADER:
-            raise ValueError('Invalid name, name may not be one of {}'.format(self.__disallowed_header_names))
-        self.__verify_style_to_in_type(style, in_type)
-        if content is None and style is None:
-            style = self.__in_type_to_default_style[in_type]
-        if content is not None and in_type in self.__in_type_to_default_style and len(content) != 1:
-            raise ValueError('Invalid content length, content length must equal 1')
-        self.in_type = in_type
-        self.name = name
-        self.required = required
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-        self.schema = schema
-        self.content = content
-
-    def _serialize_json(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        eliminate_whitespace: bool = False
-    ) -> str:
-        if eliminate_whitespace:
-            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
-        return json.dumps(in_data)
+    def get_default(cls):
+        """Return new instance of ApiClient.
 
+        This method returns newly created, based on default constructor,
+        object of ApiClient class or returns a copy of default
+        ApiClient.
 
-class PathParameter(ParameterBase, StyleSimpleSerializer):
+        :return: The ApiClient object.
+        """
+        if cls._default is None:
+            cls._default = ApiClient()
+        return cls._default
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.PATH,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of ApiClient.
 
-    def __serialize_label(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator('.', '.')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        It stores default ApiClient.
 
-    def __serialize_matrix(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator(';', ';')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        :param default: object of ApiClient.
+        """
+        cls._default = default
 
-    def __serialize_simple(
+    def param_serialize(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-    ) -> typing.Dict[str, str]:
-        value = self._serialize_simple(
-            in_data=in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True
-        )
-        return self._to_dict(self.name, value)
+        method,
+        resource_path,
+        path_params=None,
+        query_params=None,
+        header_params=None,
+        body=None,
+        post_params=None,
+        files=None, auth_settings=None,
+        collection_formats=None,
+        _host=None,
+        _request_auth=None
+    ) -> RequestSerialized:
+
+        """Builds the HTTP request params needed by the request.
+        :param method: Method to call.
+        :param resource_path: Path to method endpoint.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param files dict: key -> filename, value -> filepath,
+            for `multipart/form-data`.
+        :param collection_formats: dict of collection formats for path, query,
+            header, and post parameters.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :return: tuple of form (path, http_method, query_params, header_params,
+            body, post_params, files)
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> path
-                path:
-                    returns path_params: dict
-            label -> path
-                returns path_params
-            matrix -> path
-                returns path_params
-            """
-            if self.style:
-                if self.style is ParameterStyle.SIMPLE:
-                    return self.__serialize_simple(cast_in_data)
-                elif self.style is ParameterStyle.LABEL:
-                    return self.__serialize_label(cast_in_data)
-                elif self.style is ParameterStyle.MATRIX:
-                    return self.__serialize_matrix(cast_in_data)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class QueryParameter(ParameterBase, StyleFormSerializer):
+        config = self.configuration
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.QUERY,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+        # header parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+            header_params = dict(
+                self.parameters_to_tuples(header_params,collection_formats)
+            )
 
-    def __serialize_space_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            path_params = self.parameters_to_tuples(
+                path_params,
+                collection_formats
+            )
+            for k, v in path_params:
+                # specified safe chars, encode everything
+                resource_path = resource_path.replace(
+                    '{%s}' % k,
+                    quote(str(v), safe=config.safe_chars_for_path_param)
+                )
 
-    def __serialize_pipe_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # post parameters
+        if post_params or files:
+            post_params = post_params if post_params else []
+            post_params = self.sanitize_for_serialization(post_params)
+            post_params = self.parameters_to_tuples(
+                post_params,
+                collection_formats
+            )
+            if files:
+                post_params.extend(self.files_parameters(files))
 
-    def __serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._serialize_form(
-            in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
+        # auth setting
+        self.update_params_for_auth(
+            header_params,
+            query_params,
+            auth_settings,
+            resource_path,
+            method,
+            body,
+            request_auth=_request_auth
         )
-        return self._to_dict(self.name, value)
 
-    def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if self.style is ParameterStyle.FORM:
-            return PrefixSeparatorIterator('?', '&')
-        elif self.style is ParameterStyle.SPACE_DELIMITED:
-            return PrefixSeparatorIterator('', '%20')
-        elif self.style is ParameterStyle.PIPE_DELIMITED:
-            return PrefixSeparatorIterator('', '|')
-
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> query
-                query:
-                    - GET/HEAD/DELETE: could use fields
-                    - PUT/POST: must use urlencode to send parameters
-                    returns fields: tuple
-            spaceDelimited -> query
-                returns fields
-            pipeDelimited -> query
-                returns fields
-            deepObject -> query, https://github.com/OAI/OpenAPI-Specification/issues/1706
-                returns fields
-            """
-            if self.style:
-                # TODO update query ones to omit setting values when [] {} or None is input
-                if self.style is ParameterStyle.FORM:
-                    return self.__serialize_form(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.SPACE_DELIMITED:
-                    return self.__serialize_space_delimited(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.PIPE_DELIMITED:
-                    return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
-        # self.content will be length one
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
-                return self._to_dict(
-                    self.name,
-                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
-                )
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
 
+        # request url
+        if _host is None or self.configuration.ignore_operation_servers:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = _host + resource_path
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            url_query = self.parameters_to_url_query(
+                query_params,
+                collection_formats
+            )
+            url += "?" + url_query
 
-class CookieParameter(ParameterBase, StyleFormSerializer):
+        return method, url, header_params, body, post_params
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.COOKIE,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> cookie
-                returns fields: tuple
-            """
-            if self.style:
-                """
-                TODO add escaping of comma, space, equals
-                or turn encoding on
-                """
-                value = self._serialize_form(
-                    cast_in_data,
-                    explode=self.explode,
-                    name=self.name,
-                    percent_encode=False,
-                    prefix_separator_iterator=PrefixSeparatorIterator('', '&')
-                )
-                return self._to_dict(self.name, value)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class HeaderParameter(ParameterBase, StyleSimpleSerializer):
-    def __init__(
+    def call_api(
         self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.HEADER,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
-
-    @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
-        data = tuple(t for t in in_data if t)
-        headers = HTTPHeaderDict()
-        if not data:
-            return headers
-        headers.extend(data)
-        return headers
+        method,
+        url,
+        header_params=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ) -> rest.RESTResponse:
+        """Makes the HTTP request (synchronous)
+        :param method: Method to call.
+        :param url: Path to method endpoint.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param _request_timeout: timeout setting for this request.
+        :return: RESTResponse
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> header
-                headers: PoolManager needs a mapping, tuple is close
-                    returns headers: dict
-            """
-            if self.style:
-                value = self._serialize_simple(cast_in_data, self.name, self.explode, False)
-                return self.__to_headers(((self.name, value),))
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self.__to_headers(((self.name, value),))
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class Encoding:
-    def __init__(
-        self,
-        content_type: str,
-        headers: typing.Optional[typing.Dict[str, HeaderParameter]] = None,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: bool = False,
-    ):
-        self.content_type = content_type
-        self.headers = headers
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-
-
-@dataclass
-class MediaType:
-    """
-    Used to store request and response body schema information
-    encoding:
-        A map between a property name and its encoding information.
-        The key, being the property name, MUST exist in the schema as a property.
-        The encoding object SHALL only apply to requestBody objects when the media type is
-        multipart or application/x-www-form-urlencoded.
-    """
-    schema: typing.Optional[typing.Type[Schema]] = None
-    encoding: typing.Optional[typing.Dict[str, Encoding]] = None
+        try:
+            # perform request and return response
+            response_data = self.rest_client.request(
+                method, url,
+                headers=header_params,
+                body=body, post_params=post_params,
+                _request_timeout=_request_timeout
+            )
 
+        except ApiException as e:
+            raise e
 
-@dataclass
-class ApiResponse:
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        return response_data
 
-    def __init__(
+    def response_deserialize(
         self,
-        response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
-    ):
-        """
-        pycharm needs this to prevent 'Unexpected argument' warnings
+        response_data: rest.RESTResponse,
+        response_types_map: Optional[Dict[str, ApiResponseT]]=None
+    ) -> ApiResponse[ApiResponseT]:
+        """Deserializes response into an object.
+        :param response_data: RESTResponse object to be deserialized.
+        :param response_types_map: dict of response types.
+        :return: ApiResponse
         """
-        self.response = response
-        self.body = body
-        self.headers = headers
 
+        msg = "RESTResponse.read() must be called before passing it to response_deserialize()"
+        assert response_data.data is not None, msg
 
-@dataclass
-class ApiResponseWithoutDeserialization(ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]] = unset
-    headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
+        response_type = response_types_map.get(str(response_data.status), None)
+        if not response_type and isinstance(response_data.status, int) and 100 <= response_data.status <= 599:
+            # if not found, look for '1XX', '2XX', etc.
+            response_type = response_types_map.get(str(response_data.status)[0] + "XX", None)
 
+        # deserialize response data
+        response_text = None
+        return_data = None
+        try:
+            if response_type == "bytearray":
+                return_data = response_data.data
+            elif response_type == "file":
+                return_data = self.__deserialize_file(response_data)
+            elif response_type is not None:
+                match = None
+                content_type = response_data.getheader('content-type')
+                if content_type is not None:
+                    match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
+                encoding = match.group(1) if match else "utf-8"
+                response_text = response_data.data.decode(encoding)
+                return_data = self.deserialize(response_text, response_type, content_type)
+        finally:
+            if not 200 <= response_data.status <= 299:
+                raise ApiException.from_response(
+                    http_resp=response_data,
+                    body=response_text,
+                    data=return_data,
+                )
 
-class OpenApiResponse(JSONDetector):
-    __filename_content_disposition_pattern = re.compile('filename="(.+?)"')
+        return ApiResponse(
+            status_code = response_data.status,
+            data = return_data,
+            headers = response_data.getheaders(),
+            raw_data = response_data.data
+        )
 
-    def __init__(
-        self,
-        response_cls: typing.Type[ApiResponse] = ApiResponse,
-        content: typing.Optional[typing.Dict[str, MediaType]] = None,
-        headers: typing.Optional[typing.List[HeaderParameter]] = None,
-    ):
-        self.headers = headers
-        if content is not None and len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-        self.response_cls = response_cls
-
-    @staticmethod
-    def __deserialize_json(response: urllib3.HTTPResponse) -> typing.Any:
-        # python must be >= 3.9 so we can pass in bytes into json.loads
-        return json.loads(response.data)
-
-    @staticmethod
-    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
-        if response_url is None:
-            return None
-        url_path = urlparse(response_url).path
-        if url_path:
-            path_basename = os.path.basename(url_path)
-            if path_basename:
-                _filename, ext = os.path.splitext(path_basename)
-                if ext:
-                    return path_basename
-        return None
+    def sanitize_for_serialization(self, obj):
+        """Builds a JSON POST object.
 
-    @classmethod
-    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
-        if content_disposition is None:
-            return None
-        match = cls.__filename_content_disposition_pattern.search(content_disposition)
-        if not match:
-            return None
-        return match.group(1)
+        If obj is None, return None.
+        If obj is SecretStr, return obj.get_secret_value()
+        If obj is str, int, long, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, sanitize each element in the list.
+        If obj is dict, return the dict.
+        If obj is OpenAPI model, return the properties dict.
 
-    def __deserialize_application_octet_stream(
-        self, response: urllib3.HTTPResponse
-    ) -> typing.Union[bytes, io.BufferedReader]:
-        """
-        urllib3 use cases:
-        1. when preload_content=True (stream=False) then supports_chunked_reads is False and bytes are returned
-        2. when preload_content=False (stream=True) then supports_chunked_reads is True and
-            a file will be written and returned
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
         """
-        if response.supports_chunked_reads():
-            file_name = (
-                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
-                or self.__file_name_from_response_url(response.geturl())
+        if obj is None:
+            return None
+        elif isinstance(obj, Enum):
+            return obj.value
+        elif isinstance(obj, SecretStr):
+            return obj.get_secret_value()
+        elif isinstance(obj, self.PRIMITIVE_TYPES):
+            return obj
+        elif isinstance(obj, list):
+            return [
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
+            ]
+        elif isinstance(obj, tuple):
+            return tuple(
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
             )
+        elif isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
 
-            if file_name is None:
-                _fd, path = tempfile.mkstemp()
-            else:
-                path = os.path.join(tempfile.gettempdir(), file_name)
-
-            with open(path, 'wb') as new_file:
-                chunk_size = 1024
-                while True:
-                    data = response.read(chunk_size)
-                    if not data:
-                        break
-                    new_file.write(data)
-            # release_conn is needed for streaming connections only
-            response.release_conn()
-            new_file = open(path, 'rb')
-            return new_file
+        elif isinstance(obj, dict):
+            obj_dict = obj
         else:
-            return response.data
+            # Convert model obj to dict except
+            # attributes `openapi_types`, `attribute_map`
+            # and attributes which value is not None.
+            # Convert attribute name to json key in
+            # model definition for request.
+            if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj.__dict__
 
-    @staticmethod
-    def __deserialize_multipart_form_data(
-        response: urllib3.HTTPResponse
-    ) -> typing.Dict[str, typing.Any]:
-        msg = email.message_from_bytes(response.data)
         return {
-            part.get_param("name", header="Content-Disposition"): part.get_payload(
-                decode=True
-            ).decode(part.get_content_charset())
-            if part.get_content_charset()
-            else part.get_payload()
-            for part in msg.get_payload()
+            key: self.sanitize_for_serialization(val)
+            for key, val in obj_dict.items()
         }
 
-    def deserialize(self, response: urllib3.HTTPResponse, configuration: Configuration) -> ApiResponse:
-        content_type = response.getheader('content-type')
-        deserialized_body = unset
-        streamed = response.supports_chunked_reads()
-
-        deserialized_headers = unset
-        if self.headers is not None:
-            # TODO add header deserialiation here
-            pass
-
-        if self.content is not None:
-            if content_type not in self.content:
-                raise ApiValueError(
-                    f"Invalid content_type returned. Content_type='{content_type}' was returned "
-                    f"when only {str(set(self.content))} are defined for status_code={str(response.status)}"
-                )
-            body_schema = self.content[content_type].schema
-            if body_schema is None:
-                # some specs do not define response content media type schemas
-                return self.response_cls(
-                    response=response,
-                    headers=deserialized_headers,
-                    body=unset
-                )
+    def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
+        """Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: class literal for
+            deserialized object, or string of class name.
+        :param content_type: content type of response.
+
+        :return: deserialized object.
+        """
 
-            if self._content_type_is_json(content_type):
-                body_data = self.__deserialize_json(response)
-            elif content_type == 'application/octet-stream':
-                body_data = self.__deserialize_application_octet_stream(response)
-            elif content_type.startswith('multipart/form-data'):
-                body_data = self.__deserialize_multipart_form_data(response)
-                content_type = 'multipart/form-data'
+        # fetch data from response object
+        if content_type is None:
+            try:
+                data = json.loads(response_text)
+            except ValueError:
+                data = response_text
+        elif content_type.startswith("application/json"):
+            if response_text == "":
+                data = ""
             else:
-                raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
-        elif streamed:
-            response.release_conn()
-
-        return self.response_cls(
-            response=response,
-            headers=deserialized_headers,
-            body=deserialized_body
-        )
+                data = json.loads(response_text)
+        elif content_type.startswith("text/plain"):
+            data = response_text
+        else:
+            raise ApiException(
+                status=0,
+                reason="Unsupported content type: {0}".format(content_type)
+            )
 
+        return self.__deserialize(data, response_type)
 
-class ApiClient:
-    """Generic API client for OpenAPI client library builds.
+    def __deserialize(self, data, klass):
+        """Deserializes dict, list, str into an object.
 
-    OpenAPI generic API client. This client handles the client-
-    server communication, and is invariant across implementations. Specifics of
-    the methods and models for each application are generated from the OpenAPI
-    templates.
+        :param data: dict, list or str.
+        :param klass: class literal, or string of class name.
 
-    NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
+        :return: object.
+        """
+        if data is None:
+            return None
 
-    :param configuration: .Configuration object for this client
-    :param header_name: a header to pass when making calls to the API.
-    :param header_value: a header value to pass when making calls to
-        the API.
-    :param cookie: a cookie to include in the header when making calls
-        to the API
-    :param pool_threads: The number of threads to use for async requests
-        to the API. More threads means more concurrent API requests.
-    """
+        if isinstance(klass, str):
+            if klass.startswith('List['):
+                m = re.match(r'List\[(.*)]', klass)
+                assert m is not None, "Malformed List type definition"
+                sub_kls = m.group(1)
+                return [self.__deserialize(sub_data, sub_kls)
+                        for sub_data in data]
+
+            if klass.startswith('Dict['):
+                m = re.match(r'Dict\[([^,]*), (.*)]', klass)
+                assert m is not None, "Malformed Dict type definition"
+                sub_kls = m.group(2)
+                return {k: self.__deserialize(v, sub_kls)
+                        for k, v in data.items()}
+
+            # convert str to class
+            if klass in self.NATIVE_TYPES_MAPPING:
+                klass = self.NATIVE_TYPES_MAPPING[klass]
+            else:
+                klass = getattr(cloudharness_cli.volumemanager.models, klass)
+
+        if klass in self.PRIMITIVE_TYPES:
+            return self.__deserialize_primitive(data, klass)
+        elif klass == object:
+            return self.__deserialize_object(data)
+        elif klass == datetime.date:
+            return self.__deserialize_date(data)
+        elif klass == datetime.datetime:
+            return self.__deserialize_datetime(data)
+        elif issubclass(klass, Enum):
+            return self.__deserialize_enum(data, klass)
+        else:
+            return self.__deserialize_model(data, klass)
 
-    _pool = None
+    def parameters_to_tuples(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __init__(
-        self,
-        configuration: typing.Optional[Configuration] = None,
-        header_name: typing.Optional[str] = None,
-        header_value: typing.Optional[str] = None,
-        cookie: typing.Optional[str] = None,
-        pool_threads: int = 1
-    ):
-        if configuration is None:
-            configuration = Configuration()
-        self.configuration = configuration
-        self.pool_threads = pool_threads
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: Parameters as list of tuples, collections formatted
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, value) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(str(value) for value in v)))
+            else:
+                new_params.append((k, v))
+        return new_params
 
-        self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = HTTPHeaderDict()
-        if header_name is not None:
-            self.default_headers[header_name] = header_value
-        self.cookie = cookie
-        # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+    def parameters_to_url_query(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __enter__(self):
-        return self
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: URL query string (e.g. a=Hello%20World&b=123)
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if isinstance(v, bool):
+                v = str(v).lower()
+            if isinstance(v, (int, float)):
+                v = str(v)
+            if isinstance(v, dict):
+                v = json.dumps(v)
+
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, str(value)) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(quote(str(value)) for value in v))
+                    )
+            else:
+                new_params.append((k, quote(str(v))))
 
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
+        return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def close(self):
-        if self._pool:
-            self._pool.close()
-            self._pool.join()
-            self._pool = None
-            if hasattr(atexit, 'unregister'):
-                atexit.unregister(self.close)
+    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
+        """Builds form parameters.
 
-    @property
-    def pool(self):
-        """Create thread pool on first request
-         avoids instantiating unused threadpool for blocking clients.
+        :param files: File parameters.
+        :return: Form parameters with files.
         """
-        if self._pool is None:
-            atexit.register(self.close)
-            self._pool = ThreadPool(self.pool_threads)
-        return self._pool
-
-    @property
-    def user_agent(self):
-        """User agent for this API client"""
-        return self.default_headers['User-Agent']
+        params = []
+        for k, v in files.items():
+            if isinstance(v, str):
+                with open(v, 'rb') as f:
+                    filename = os.path.basename(f.name)
+                    filedata = f.read()
+            elif isinstance(v, bytes):
+                filename = k
+                filedata = v
+            else:
+                raise ValueError("Unsupported file value")
+            mimetype = (
+                mimetypes.guess_type(filename)[0]
+                or 'application/octet-stream'
+            )
+            params.append(
+                tuple([k, tuple([filename, filedata, mimetype])])
+            )
+        return params
 
-    @user_agent.setter
-    def user_agent(self, value):
-        self.default_headers['User-Agent'] = value
+    def select_header_accept(self, accepts: List[str]) -> Optional[str]:
+        """Returns `Accept` based on an array of accepts provided.
 
-    def set_default_header(self, header_name, header_value):
-        self.default_headers[header_name] = header_value
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return None
 
-    def __call_api(
-        self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
+        for accept in accepts:
+            if re.search('json', accept, re.IGNORECASE):
+                return accept
 
-        # header parameters
-        used_headers = HTTPHeaderDict(self.default_headers)
-        if self.cookie:
-            headers['Cookie'] = self.cookie
+        return accepts[0]
 
-        # auth setting
-        self.update_params_for_auth(used_headers,
-                                    auth_settings, resource_path, method, body)
+    def select_header_content_type(self, content_types):
+        """Returns `Content-Type` based on an array of content_types provided.
 
-        # must happen after cookie setting and auth setting in case user is overriding those
-        if headers:
-            used_headers.update(headers)
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return None
 
-        # request url
-        if host is None:
-            url = self.configuration.host + resource_path
-        else:
-            # use server/host defined in path or operation instead
-            url = host + resource_path
+        for content_type in content_types:
+            if re.search('json', content_type, re.IGNORECASE):
+                return content_type
 
-        # perform request and return response
-        response = self.request(
-            method,
-            url,
-            headers=used_headers,
-            fields=fields,
-            body=body,
-            stream=stream,
-            timeout=timeout,
-        )
-        return response
+        return content_types[0]
 
-    def call_api(
+    def update_params_for_auth(
         self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        async_req: typing.Optional[bool] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request (synchronous) and returns deserialized data.
-
-        To make an async_req request, set the async_req parameter.
+        headers,
+        queries,
+        auth_settings,
+        resource_path,
+        method,
+        body,
+        request_auth=None
+    ) -> None:
+        """Updates header and query params based on authentication setting.
 
-        :param resource_path: Path to method endpoint.
-        :param method: Method to call.
-        :param headers: Header parameters to be
-            placed in the request header.
-        :param body: Request body.
-        :param fields: Request post form parameters,
-            for `application/x-www-form-urlencoded`, `multipart/form-data`.
-        :param auth_settings: Auth Settings names for the request.
-        :param async_req: execute request asynchronously
-        :type async_req: bool, optional TODO remove, unused
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                 be returned without reading/decoding response
-                                 data. Also when True, if the openapi spec describes a file download,
-                                 the data will be written to a local filesystme file and the BinarySchema
-                                 instance will also inherit from FileSchema and FileIO
-                                 Default is False.
-        :type stream: bool, optional
-        :param timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param host: api endpoint host
-        :return:
-            If async_req parameter is True,
-            the request will be called asynchronously.
-            The method will return the request thread.
-            If parameter async_req is False or missing,
-            then the method will return the response directly.
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
+        if not auth_settings:
+            return
 
-        if not async_req:
-            return self.__call_api(
-                resource_path,
-                method,
+        if request_auth:
+            self._apply_auth_params(
                 headers,
-                body,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
-            )
-
-        return self.pool.apply_async(
-            self.__call_api,
-            (
+                queries,
                 resource_path,
                 method,
-                headers,
                 body,
-                json,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
+                request_auth
             )
-        )
-
-    def request(
+        else:
+            for auth in auth_settings:
+                auth_setting = self.configuration.auth_settings().get(auth)
+                if auth_setting:
+                    self._apply_auth_params(
+                        headers,
+                        queries,
+                        resource_path,
+                        method,
+                        body,
+                        auth_setting
+                    )
+
+    def _apply_auth_params(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request using RESTClient."""
-        if method == "GET":
-            return self.rest_client.GET(url,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        headers=headers)
-        elif method == "HEAD":
-            return self.rest_client.HEAD(url,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         headers=headers)
-        elif method == "OPTIONS":
-            return self.rest_client.OPTIONS(url,
-                                            headers=headers,
-                                            fields=fields,
-                                            stream=stream,
-                                            timeout=timeout,
-                                            body=body)
-        elif method == "POST":
-            return self.rest_client.POST(url,
-                                         headers=headers,
-                                         fields=fields,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         body=body)
-        elif method == "PUT":
-            return self.rest_client.PUT(url,
-                                        headers=headers,
-                                        fields=fields,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        body=body)
-        elif method == "PATCH":
-            return self.rest_client.PATCH(url,
-                                          headers=headers,
-                                          fields=fields,
-                                          stream=stream,
-                                          timeout=timeout,
-                                          body=body)
-        elif method == "DELETE":
-            return self.rest_client.DELETE(url,
-                                           headers=headers,
-                                           stream=stream,
-                                           timeout=timeout,
-                                           body=body)
+        headers,
+        queries,
+        resource_path,
+        method,
+        body,
+        auth_setting
+    ) -> None:
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            if auth_setting['type'] != 'http-signature':
+                headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            queries.append((auth_setting['key'], auth_setting['value']))
         else:
             raise ApiValueError(
-                "http method must be `GET`, `HEAD`, `OPTIONS`,"
-                " `POST`, `PATCH`, `PUT` or `DELETE`."
+                'Authentication token must be in `query` or `header`'
             )
 
-    def update_params_for_auth(self, headers, auth_settings,
-                               resource_path, method, body):
-        """Updates header and query params based on authentication setting.
+    def __deserialize_file(self, response):
+        """Deserializes body to file
 
-        :param headers: Header parameters dict to be updated.
-        :param auth_settings: Authentication setting identifiers list.
-        :param resource_path: A string representation of the HTTP request resource path.
-        :param method: A string representation of the HTTP request method.
-        :param body: A object representing the body of the HTTP request.
-            The object type is the return value of _encoder.default().
-        """
-        if not auth_settings:
-            return
+        Saves response body into a file in a temporary folder,
+        using the filename from the `Content-Disposition` header if provided.
 
-        for auth in auth_settings:
-            auth_setting = self.configuration.auth_settings().get(auth)
-            if not auth_setting:
-                continue
-            if auth_setting['in'] == 'cookie':
-                headers.add('Cookie', auth_setting['value'])
-            elif auth_setting['in'] == 'header':
-                if auth_setting['type'] != 'http-signature':
-                    headers.add(auth_setting['key'], auth_setting['value'])
-            elif auth_setting['in'] == 'query':
-                """ TODO implement auth in query
-                need to pass in prefix_separator_iterator
-                and need to output resource_path with query params added
-                """
-                raise ApiValueError("Auth in query not yet implemented")
-            else:
-                raise ApiValueError(
-                    'Authentication token must be in `query` or `header`'
-                )
+        handle file downloading
+        save response body into a tmp file and return the instance
 
+        :param response:  RESTResponse.
+        :return: file path.
+        """
+        fd, path = tempfile.mkstemp(dir=self.configuration.temp_folder_path)
+        os.close(fd)
+        os.remove(path)
+
+        content_disposition = response.getheader("Content-Disposition")
+        if content_disposition:
+            m = re.search(
+                r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                content_disposition
+            )
+            assert m is not None, "Unexpected 'content-disposition' header value"
+            filename = m.group(1)
+            path = os.path.join(os.path.dirname(path), filename)
 
-class Api:
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
+        with open(path, "wb") as f:
+            f.write(response.data)
 
-    Do not edit the class manually.
-    """
+        return path
+
+    def __deserialize_primitive(self, data, klass):
+        """Deserializes string to primitive type.
 
-    def __init__(self, api_client: typing.Optional[ApiClient] = None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
+        :param data: str.
+        :param klass: class literal.
 
-    @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+        :return: int, long, float, str, bool.
         """
-        Ensures that:
-        - required keys are present
-        - additional properties are not input
-        - value stored under required keys do not have the value unset
-        Note: detailed value checking is done in schema classes
+        try:
+            return klass(data)
+        except UnicodeEncodeError:
+            return str(data)
+        except TypeError:
+            return data
+
+    def __deserialize_object(self, value):
+        """Return an original value.
+
+        :return: object.
         """
-        missing_required_keys = []
-        required_keys_with_unset_values = []
-        for required_key in cls.__required_keys__:
-            if required_key not in data:
-                missing_required_keys.append(required_key)
-                continue
-            value = data[required_key]
-            if value is unset:
-                required_keys_with_unset_values.append(required_key)
-        if missing_required_keys:
-            raise ApiTypeError(
-                '{} missing {} required arguments: {}'.format(
-                    cls.__name__, len(missing_required_keys), missing_required_keys
-                 )
-             )
-        if required_keys_with_unset_values:
-            raise ApiValueError(
-                '{} contains invalid unset values for {} required keys: {}'.format(
-                    cls.__name__, len(required_keys_with_unset_values), required_keys_with_unset_values
-                )
-            )
+        return value
 
-        disallowed_additional_keys = []
-        for key in data:
-            if key in cls.__required_keys__ or key in cls.__optional_keys__:
-                continue
-            disallowed_additional_keys.append(key)
-        if disallowed_additional_keys:
-            raise ApiTypeError(
-                '{} got {} unexpected keyword arguments: {}'.format(
-                    cls.__name__, len(disallowed_additional_keys), disallowed_additional_keys
-                )
-            )
+    def __deserialize_date(self, string):
+        """Deserializes string to date.
 
-    def _get_host_oapg(
-        self,
-        operation_id: str,
-        servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
-        host_index: typing.Optional[int] = None
-    ) -> typing.Optional[str]:
-        configuration = self.api_client.configuration
+        :param string: str.
+        :return: date.
+        """
         try:
-            if host_index is None:
-                index = configuration.server_operation_index.get(
-                    operation_id, configuration.server_index
-                )
-            else:
-                index = host_index
-            server_variables = configuration.server_operation_variables.get(
-                operation_id, configuration.server_variables
-            )
-            host = configuration.get_host_from_settings(
-                index, variables=server_variables, servers=servers
+            return parse(string).date()
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason="Failed to parse `{0}` as date object".format(string)
             )
-        except IndexError:
-            if servers:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(servers)
-                )
-            host = None
-        return host
-
-
-class SerializedRequestBody(typing_extensions.TypedDict, total=False):
-    body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
+    def __deserialize_datetime(self, string):
+        """Deserializes string to datetime.
 
-class RequestBody(StyleFormSerializer, JSONDetector):
-    """
-    A request body parameter
-    content: content_type to MediaType Schema info
-    """
-    __json_encoder = JSONEncoder()
+        The string should be in iso8601 datetime format.
 
-    def __init__(
-        self,
-        content: typing.Dict[str, MediaType],
-        required: bool = False,
-    ):
-        self.required = required
-        if len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-
-    def __serialize_json(
-        self,
-        in_data: typing.Any
-    ) -> typing.Dict[str, bytes]:
-        in_data = self.__json_encoder.default(in_data)
-        json_str = json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode(
-            "utf-8"
-        )
-        return dict(body=json_str)
-
-    @staticmethod
-    def __serialize_text_plain(in_data: typing.Any) -> typing.Dict[str, str]:
-        if isinstance(in_data, frozendict.frozendict):
-            raise ValueError('Unable to serialize type frozendict.frozendict to text/plain')
-        elif isinstance(in_data, tuple):
-            raise ValueError('Unable to serialize type tuple to text/plain')
-        elif isinstance(in_data, NoneClass):
-            raise ValueError('Unable to serialize type NoneClass to text/plain')
-        elif isinstance(in_data, BoolClass):
-            raise ValueError('Unable to serialize type BoolClass to text/plain')
-        return dict(body=str(in_data))
-
-    def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
-        json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
-
-    def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
-        if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
-        elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
-        elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
+        :param string: str.
+        :return: datetime.
+        """
+        try:
+            return parse(string)
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as datetime object"
+                    .format(string)
+                )
             )
-            value.close()
-            return request_field
-        else:
-            return self.__multipart_json_item(key=key, value=value)
 
-    def __serialize_multipart_form_data(
-        self, in_data: Schema
-    ) -> typing.Dict[str, typing.Tuple[RequestField, ...]]:
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(f'Unable to serialize {in_data} to multipart/form-data because it is not a dict of data')
+    def __deserialize_enum(self, data, klass):
+        """Deserializes primitive type to enum.
+
+        :param data: primitive type.
+        :param klass: class literal.
+        :return: enum value.
         """
-        In a multipart/form-data request body, each schema property, or each element of a schema array property,
-        takes a section in the payload with an internal header as defined by RFC7578. The serialization strategy
-        for each property of a multipart/form-data request body can be specified in an associated Encoding Object.
+        try:
+            return klass(data)
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as `{1}`"
+                    .format(data, klass)
+                )
+            )
 
-        When passing in multipart types, boundaries MAY be used to separate sections of the content being
-        transferred – thus, the following default Content-Types are defined for multipart:
+    def __deserialize_model(self, data, klass):
+        """Deserializes list or dict to model.
 
-        If the (object) property is a primitive, or an array of primitive values, the default Content-Type is text/plain
-        If the property is complex, or an array of complex values, the default Content-Type is application/json
-            Question: how is the array of primitives encoded?
-        If the property is a type: string with a contentEncoding, the default Content-Type is application/octet-stream
-        """
-        fields = []
-        for key, value in in_data.items():
-            if isinstance(value, tuple):
-                if value:
-                    # values use explode = True, so the code makes a RequestField for each item with name=key
-                    for item in value:
-                        request_field = self.__multipart_form_item(key=key, value=item)
-                        fields.append(request_field)
-                else:
-                    # send an empty array as json because exploding will not send it
-                    request_field = self.__multipart_json_item(key=key, value=value)
-                    fields.append(request_field)
-            else:
-                request_field = self.__multipart_form_item(key=key, value=value)
-                fields.append(request_field)
-
-        return dict(fields=tuple(fields))
-
-    def __serialize_application_octet_stream(self, in_data: BinarySchema) -> typing.Dict[str, bytes]:
-        if isinstance(in_data, bytes):
-            return dict(body=in_data)
-        # FileIO type
-        result = dict(body=in_data.read())
-        in_data.close()
-        return result
-
-    def __serialize_application_x_www_form_data(
-        self, in_data: typing.Any
-    ) -> SerializedRequestBody:
+        :param data: dict, list.
+        :param klass: class literal.
+        :return: model object.
         """
-        POST submission of form data in body
-        """
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(
-                f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
-        cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
-        return dict(body=value)
-
-    def serialize(
-        self, in_data: typing.Any, content_type: str
-    ) -> SerializedRequestBody:
-        """
-        If a str is returned then the result will be assigned to data when making the request
-        If a tuple is returned then the result will be used as fields input in encode_multipart_formdata
-        Return a tuple of
 
-        The key of the return dict is
-        - body for application/json
-        - encode_multipart and fields for multipart/form-data
-        """
-        media_type = self.content[content_type]
-        if isinstance(in_data, media_type.schema):
-            cast_in_data = in_data
-        elif isinstance(in_data, (dict, frozendict.frozendict)) and in_data:
-            cast_in_data = media_type.schema(**in_data)
-        else:
-            cast_in_data = media_type.schema(in_data)
-        # TODO check for and use encoding if it exists
-        # and content_type is multipart or application/x-www-form-urlencoded
-        if self._content_type_is_json(content_type):
-            return self.__serialize_json(cast_in_data)
-        elif content_type == 'text/plain':
-            return self.__serialize_text_plain(cast_in_data)
-        elif content_type == 'multipart/form-data':
-            return self.__serialize_multipart_form_data(cast_in_data)
-        elif content_type == 'application/x-www-form-urlencoded':
-            return self.__serialize_application_x_www_form_data(cast_in_data)
-        elif content_type == 'application/octet-stream':
-            return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
+        return klass.from_dict(data)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_response.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_response.py
new file mode 100644
index 00000000..9bc7c11f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/api_response.py
@@ -0,0 +1,21 @@
+"""API response object."""
+
+from __future__ import annotations
+from typing import Optional, Generic, Mapping, TypeVar
+from pydantic import Field, StrictInt, StrictBytes, BaseModel
+
+T = TypeVar("T")
+
+class ApiResponse(BaseModel, Generic[T]):
+    """
+    API response object
+    """
+
+    status_code: StrictInt = Field(description="HTTP status code")
+    headers: Optional[Mapping[str, str]] = Field(None, description="HTTP headers")
+    data: T = Field(description="Deserialized data given the data type")
+    raw_data: StrictBytes = Field(description="Raw data (HTTP response body)")
+
+    model_config = {
+        "arbitrary_types_allowed": True
+    }
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/__init__.py
deleted file mode 100644
index 7840f772..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints then import them from
-# tags, paths, or path_to_api, or tag_to_api
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/path_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/path_to_api.py
deleted file mode 100644
index 6d420fcb..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/path_to_api.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.volumemanager.paths import PathValues
-from cloudharness_cli.volumemanager.apis.paths.pvc import Pvc
-from cloudharness_cli.volumemanager.apis.paths.pvc_name import PvcName
-
-PathToApi = typing_extensions.TypedDict(
-    'PathToApi',
-    {
-        PathValues.PVC: Pvc,
-        PathValues.PVC_NAME: PvcName,
-    }
-)
-
-path_to_api = PathToApi(
-    {
-        PathValues.PVC: Pvc,
-        PathValues.PVC_NAME: PvcName,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/__init__.py
deleted file mode 100644
index 5fa427f9..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.volumemanager.apis.path_to_api import path_to_api
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc.py
deleted file mode 100644
index 587cdcfa..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.volumemanager.paths.pvc.post import ApiForpost
-
-
-class Pvc(
-    ApiForpost,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc_name.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc_name.py
deleted file mode 100644
index 623732ef..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/paths/pvc_name.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.volumemanager.paths.pvc_name.get import ApiForget
-
-
-class PvcName(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tag_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tag_to_api.py
deleted file mode 100644
index a665128d..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tag_to_api.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.volumemanager.apis.tags import TagValues
-from cloudharness_cli.volumemanager.apis.tags.rest_api import RestApi
-
-TagToApi = typing_extensions.TypedDict(
-    'TagToApi',
-    {
-        TagValues.REST: RestApi,
-    }
-)
-
-tag_to_api = TagToApi(
-    {
-        TagValues.REST: RestApi,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/__init__.py
deleted file mode 100644
index d0e84292..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.volumemanager.apis.tag_to_api import tag_to_api
-
-import enum
-
-
-class TagValues(str, enum.Enum):
-    REST = "rest"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/rest_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/rest_api.py
deleted file mode 100644
index af13c644..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/apis/tags/rest_api.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.volumemanager.paths.pvc_name.get import PvcNameGet
-from cloudharness_cli.volumemanager.paths.pvc.post import PvcPost
-
-
-class RestApi(
-    PvcNameGet,
-    PvcPost,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/configuration.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/configuration.py
index deaf2899..ad9dffaf 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/configuration.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/configuration.py
@@ -3,69 +3,48 @@
 """
     Volumes manager API
 
-    CloudHarness Volumes manager API  # noqa: E501
+    CloudHarness Volumes manager API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 import copy
 import logging
+from logging import FileHandler
 import multiprocessing
 import sys
+from typing import Optional
 import urllib3
 
-from http import client as http_client
-from cloudharness_cli.volumemanager.exceptions import ApiValueError
-
+import http.client as httplib
 
 JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'multipleOf', 'maximum', 'exclusiveMaximum',
     'minimum', 'exclusiveMinimum', 'maxLength',
-    'minLength', 'pattern', 'maxItems', 'minItems',
-    'uniqueItems', 'maxProperties', 'minProperties',
+    'minLength', 'pattern', 'maxItems', 'minItems'
 }
 
-class Configuration(object):
-    """NOTE: This class is auto generated by OpenAPI Generator
+class Configuration:
+    """This class contains various settings of the API client.
 
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
-
-    :param host: Base url
+    :param host: Base url.
+    :param ignore_operation_servers
+      Boolean to ignore operation servers for the API client.
+      Config will use `host` as the base url regardless of the operation servers.
     :param api_key: Dict to store API key(s).
       Each entry in the dict specifies an API key.
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is the API key secret.
-    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer).
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is an API key prefix when generating the auth data.
-    :param username: Username for HTTP basic authentication
-    :param password: Password for HTTP basic authentication
-    :param discard_unknown_keys: Boolean value indicating whether to discard
-      unknown properties. A server may send a response that includes additional
-      properties that are not known by the client in the following scenarios:
-      1. The OpenAPI document is incomplete, i.e. it does not match the server
-         implementation.
-      2. The client was generated using an older version of the OpenAPI document
-         and the server has been upgraded since then.
-      If a schema in the OpenAPI document defines the additionalProperties attribute,
-      then all undeclared properties received by the server are injected into the
-      additional properties map. In that case, there are undeclared properties, and
-      nothing to discard.
-    :param disabled_client_side_validations (string): Comma-separated list of
-      JSON schema validation keywords to disable JSON schema structural validation
-      rules. The following keywords may be specified: multipleOf, maximum,
-      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
-      maxItems, minItems.
-      By default, the validation is performed for data generated locally by the client
-      and data received from the server, independent of any validation performed by
-      the server side. If the input data does not satisfy the JSON schema validation
-      rules specified in the OpenAPI document, an exception is raised.
-      If disabled_client_side_validations is set, structural validation is
-      disabled. This can be useful to troubleshoot data validation problem, such as
-      when the OpenAPI document validation rules do not match the actual API data
-      received by the server.
+    :param username: Username for HTTP basic authentication.
+    :param password: Password for HTTP basic authentication.
+    :param access_token: Access token.
     :param server_index: Index to servers configuration.
     :param server_variables: Mapping with string values to replace variables in
       templated server configuration. The validation of enums is performed for
@@ -74,7 +53,11 @@ class Configuration(object):
       configuration.
     :param server_operation_variables: Mapping from operation ID to a mapping with
       string values to replace variables in templated server configuration.
-      The validation of enums is performed for variables with defined enum values before.
+      The validation of enums is performed for variables with defined enum
+      values before.
+    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
+      in PEM format.
+    :param retries: Number of retries for API requests.
 
     :Example:
     """
@@ -84,11 +67,15 @@ class Configuration(object):
     def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations="",
+                 access_token=None,
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
-                 ):
+                 ignore_operation_servers=False,
+                 ssl_ca_cert=None,
+                 retries=None,
+                 *,
+                 debug: Optional[bool] = None
+                 ) -> None:
         """Constructor
         """
         self._base_path = "/api" if host is None else host
@@ -102,6 +89,9 @@ def __init__(self, host=None,
         self.server_operation_variables = server_operation_variables or {}
         """Default server variables
         """
+        self.ignore_operation_servers = ignore_operation_servers
+        """Ignore operation servers
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -125,8 +115,9 @@ def __init__(self, host=None,
         self.password = password
         """Password for HTTP basic authentication
         """
-        self.discard_unknown_keys = discard_unknown_keys
-        self.disabled_client_side_validations = disabled_client_side_validations
+        self.access_token = access_token
+        """Access token
+        """
         self.logger = {}
         """Logging Settings
         """
@@ -138,13 +129,16 @@ def __init__(self, host=None,
         self.logger_stream_handler = None
         """Log stream handler
         """
-        self.logger_file_handler = None
+        self.logger_file_handler: Optional[FileHandler] = None
         """Log file handler
         """
         self.logger_file = None
         """Debug file location
         """
-        self.debug = False
+        if debug is not None:
+            self.debug = debug
+        else:
+            self.__debug = False
         """Debug switch
         """
 
@@ -153,7 +147,7 @@ def __init__(self, host=None,
            Set this to false to skip verifying SSL certificate when calling API
            from https server.
         """
-        self.ssl_ca_cert = None
+        self.ssl_ca_cert = ssl_ca_cert
         """Set this to customize the certificate file to verify the peer.
         """
         self.cert_file = None
@@ -165,6 +159,10 @@ def __init__(self, host=None,
         self.assert_hostname = None
         """Set this to True/False to enable/disable SSL hostname verification.
         """
+        self.tls_server_name = None
+        """SSL/TLS Server Name Indication (SNI)
+           Set this to the SNI value expected by the server.
+        """
 
         self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
         """urllib3 connection pool's maximum number of connections saved
@@ -174,7 +172,7 @@ def __init__(self, host=None,
            cpu_count * 5 is used as default value to increase performance.
         """
 
-        self.proxy = None
+        self.proxy: Optional[str] = None
         """Proxy URL
         """
         self.proxy_headers = None
@@ -183,14 +181,23 @@ def __init__(self, host=None,
         self.safe_chars_for_path_param = ''
         """Safe chars for path_param
         """
-        self.retries = None
+        self.retries = retries
         """Adding retries to override urllib3 default value 3
         """
         # Enable client side validation
         self.client_side_validation = True
 
-        # Options to pass down to the underlying urllib3 socket
         self.socket_options = None
+        """Options to pass down to the underlying urllib3 socket
+        """
+
+        self.datetime_format = "%Y-%m-%dT%H:%M:%S.%f%z"
+        """datetime format
+        """
+
+        self.date_format = "%Y-%m-%d"
+        """date format
+        """
 
     def __deepcopy__(self, memo):
         cls = self.__class__
@@ -208,13 +215,6 @@ def __deepcopy__(self, memo):
 
     def __setattr__(self, name, value):
         object.__setattr__(self, name, value)
-        if name == 'disabled_client_side_validations':
-            s = set(filter(None, value.split(',')))
-            for v in s:
-                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
-                    raise ApiValueError(
-                        "Invalid keyword: '{0}''".format(v))
-            self._disabled_client_side_validations = s
 
     @classmethod
     def set_default(cls, default):
@@ -225,21 +225,31 @@ def set_default(cls, default):
 
         :param default: object of Configuration
         """
-        cls._default = copy.deepcopy(default)
+        cls._default = default
 
     @classmethod
     def get_default_copy(cls):
-        """Return new instance of configuration.
+        """Deprecated. Please use `get_default` instead.
+
+        Deprecated. Please use `get_default` instead.
+
+        :return: The configuration object.
+        """
+        return cls.get_default()
+
+    @classmethod
+    def get_default(cls):
+        """Return the default configuration.
 
         This method returns newly created, based on default constructor,
         object of Configuration class or returns a copy of default
-        configuration passed by the set_default method.
+        configuration.
 
         :return: The configuration object.
         """
-        if cls._default is not None:
-            return copy.deepcopy(cls._default)
-        return Configuration()
+        if cls._default is None:
+            cls._default = Configuration()
+        return cls._default
 
     @property
     def logger_file(self):
@@ -293,15 +303,15 @@ def debug(self, value):
             # if debug status is True, turn on debug logging
             for _, logger in self.logger.items():
                 logger.setLevel(logging.DEBUG)
-            # turn on http_client debug
-            http_client.HTTPConnection.debuglevel = 1
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
         else:
             # if debug status is False, turn off debug logging,
             # setting log level to default `logging.WARNING`
             for _, logger in self.logger.items():
                 logger.setLevel(logging.WARNING)
-            # turn off http_client debug
-            http_client.HTTPConnection.debuglevel = 0
+            # turn off httplib debug
+            httplib.HTTPConnection.debuglevel = 0
 
     @property
     def logger_format(self):
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/exceptions.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/exceptions.py
index aef8e589..fd6f058c 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/exceptions.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/exceptions.py
@@ -3,12 +3,16 @@
 """
     Volumes manager API
 
-    CloudHarness Volumes manager API  # noqa: E501
+    CloudHarness Volumes manager API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
+from typing import Any, Optional
+from typing_extensions import Self
 
 class OpenApiException(Exception):
     """The base exception class for all OpenAPIExceptions"""
@@ -16,7 +20,7 @@ class OpenApiException(Exception):
 
 class ApiTypeError(OpenApiException, TypeError):
     def __init__(self, msg, path_to_item=None, valid_classes=None,
-                 key_type=None):
+                 key_type=None) -> None:
         """ Raises an exception for TypeErrors
 
         Args:
@@ -44,7 +48,7 @@ def __init__(self, msg, path_to_item=None, valid_classes=None,
 
 
 class ApiValueError(OpenApiException, ValueError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -62,7 +66,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiAttributeError(OpenApiException, AttributeError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Raised when an attribute reference or assignment fails.
 
@@ -81,7 +85,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiKeyError(OpenApiException, KeyError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -99,17 +103,56 @@ def __init__(self, msg, path_to_item=None):
 
 class ApiException(OpenApiException):
 
-    def __init__(self, status=None, reason=None, api_response: 'cloudharness_cli.volumemanager.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+    def __init__(
+        self, 
+        status=None, 
+        reason=None, 
+        http_resp=None,
+        *,
+        body: Optional[str] = None,
+        data: Optional[Any] = None,
+    ) -> None:
+        self.status = status
+        self.reason = reason
+        self.body = body
+        self.data = data
+        self.headers = None
+
+        if http_resp:
+            if self.status is None:
+                self.status = http_resp.status
+            if self.reason is None:
+                self.reason = http_resp.reason
+            if self.body is None:
+                try:
+                    self.body = http_resp.data.decode('utf-8')
+                except Exception:
+                    pass
+            self.headers = http_resp.getheaders()
+
+    @classmethod
+    def from_response(
+        cls, 
+        *, 
+        http_resp, 
+        body: Optional[str], 
+        data: Optional[Any],
+    ) -> Self:
+        if http_resp.status == 400:
+            raise BadRequestException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 401:
+            raise UnauthorizedException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 403:
+            raise ForbiddenException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 404:
+            raise NotFoundException(http_resp=http_resp, body=body, data=data)
+
+        if 500 <= http_resp.status <= 599:
+            raise ServiceException(http_resp=http_resp, body=body, data=data)
+        raise ApiException(http_resp=http_resp, body=body, data=data)
 
     def __str__(self):
         """Custom error messages for exception"""
@@ -119,12 +162,32 @@ def __str__(self):
             error_message += "HTTP response headers: {0}\n".format(
                 self.headers)
 
-        if self.body:
-            error_message += "HTTP response body: {0}\n".format(self.body)
+        if self.data or self.body:
+            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
 
         return error_message
 
 
+class BadRequestException(ApiException):
+    pass
+
+
+class NotFoundException(ApiException):
+    pass
+
+
+class UnauthorizedException(ApiException):
+    pass
+
+
+class ForbiddenException(ApiException):
+    pass
+
+
+class ServiceException(ApiException):
+    pass
+
+
 def render_path(path_to_item):
     """Returns a string representation of a path"""
     result = ""
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/__init__.py
deleted file mode 100644
index ba634dd0..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# we can not import model classes here because that would create a circular
-# reference which would not work in python2
-# do not import all models into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all models from one package, import them with
-# from cloudharness_cli.volumemanager.models import ModelA, ModelB
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.py
deleted file mode 100644
index 70f7f43f..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-
-class PersistentVolumeClaim(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            name = schemas.StrSchema
-            namespace = schemas.StrSchema
-            accessmode = schemas.StrSchema
-            size = schemas.StrSchema
-            __annotations__ = {
-                "name": name,
-                "namespace": namespace,
-                "accessmode": accessmode,
-                "size": size,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["namespace"]) -> MetaOapg.properties.namespace: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["accessmode"]) -> MetaOapg.properties.accessmode: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["size"]) -> MetaOapg.properties.size: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "namespace", "accessmode", "size", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["namespace"]) -> typing.Union[MetaOapg.properties.namespace, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["accessmode"]) -> typing.Union[MetaOapg.properties.accessmode, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["size"]) -> typing.Union[MetaOapg.properties.size, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "namespace", "accessmode", "size", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        namespace: typing.Union[MetaOapg.properties.namespace, str, schemas.Unset] = schemas.unset,
-        accessmode: typing.Union[MetaOapg.properties.accessmode, str, schemas.Unset] = schemas.unset,
-        size: typing.Union[MetaOapg.properties.size, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'PersistentVolumeClaim':
-        return super().__new__(
-            cls,
-            *args,
-            name=name,
-            namespace=namespace,
-            accessmode=accessmode,
-            size=size,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.pyi
deleted file mode 100644
index 70f7f43f..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim.pyi
+++ /dev/null
@@ -1,108 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-
-class PersistentVolumeClaim(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            name = schemas.StrSchema
-            namespace = schemas.StrSchema
-            accessmode = schemas.StrSchema
-            size = schemas.StrSchema
-            __annotations__ = {
-                "name": name,
-                "namespace": namespace,
-                "accessmode": accessmode,
-                "size": size,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["namespace"]) -> MetaOapg.properties.namespace: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["accessmode"]) -> MetaOapg.properties.accessmode: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["size"]) -> MetaOapg.properties.size: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "namespace", "accessmode", "size", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["namespace"]) -> typing.Union[MetaOapg.properties.namespace, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["accessmode"]) -> typing.Union[MetaOapg.properties.accessmode, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["size"]) -> typing.Union[MetaOapg.properties.size, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "namespace", "accessmode", "size", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        namespace: typing.Union[MetaOapg.properties.namespace, str, schemas.Unset] = schemas.unset,
-        accessmode: typing.Union[MetaOapg.properties.accessmode, str, schemas.Unset] = schemas.unset,
-        size: typing.Union[MetaOapg.properties.size, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'PersistentVolumeClaim':
-        return super().__new__(
-            cls,
-            *args,
-            name=name,
-            namespace=namespace,
-            accessmode=accessmode,
-            size=size,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.py
deleted file mode 100644
index d9c1eb7b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-
-class PersistentVolumeClaimCreate(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            name = schemas.StrSchema
-            size = schemas.StrSchema
-            __annotations__ = {
-                "name": name,
-                "size": size,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["size"]) -> MetaOapg.properties.size: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "size", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["size"]) -> typing.Union[MetaOapg.properties.size, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "size", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        size: typing.Union[MetaOapg.properties.size, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'PersistentVolumeClaimCreate':
-        return super().__new__(
-            cls,
-            *args,
-            name=name,
-            size=size,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.pyi
deleted file mode 100644
index d9c1eb7b..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/model/persistent_volume_claim_create.pyi
+++ /dev/null
@@ -1,88 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-
-class PersistentVolumeClaimCreate(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            name = schemas.StrSchema
-            size = schemas.StrSchema
-            __annotations__ = {
-                "name": name,
-                "size": size,
-            }
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["size"]) -> MetaOapg.properties.size: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "size", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["size"]) -> typing.Union[MetaOapg.properties.size, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "size", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        size: typing.Union[MetaOapg.properties.size, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'PersistentVolumeClaimCreate':
-        return super().__new__(
-            cls,
-            *args,
-            name=name,
-            size=size,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/__init__.py
index 564a51ba..677a3502 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/__init__.py
@@ -1,15 +1,18 @@
 # coding: utf-8
 
 # flake8: noqa
+"""
+    Volumes manager API
 
-# import all models into this package
-# if you have many models here with many references from one model to another this may
-# raise a RecursionError
-# to avoid this, import only the models that you directly need like:
-# from from cloudharness_cli.volumemanager.model.pet import Pet
-# or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
-
-from cloudharness_cli.volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from cloudharness_cli.volumemanager.model.persistent_volume_claim_create import PersistentVolumeClaimCreate
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+# import models into model package
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+from cloudharness_cli.volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim.py
new file mode 100644
index 00000000..ca2b7fc5
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim.py
@@ -0,0 +1,93 @@
+# coding: utf-8
+
+"""
+    Volumes manager API
+
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class PersistentVolumeClaim(BaseModel):
+    """
+    PersistentVolumeClaim
+    """ # noqa: E501
+    name: Optional[StrictStr] = Field(default=None, description="Unique name for the Persisten Volume Claim")
+    namespace: Optional[StrictStr] = Field(default=None, description="The namespace where the Persistent Volume Claim resides in")
+    accessmode: Optional[StrictStr] = Field(default=None, description="The accessmode of the Persistent Volume Claim")
+    size: Optional[StrictStr] = Field(default=None, description="The size of the Persistent Volume Claim.")
+    __properties: ClassVar[List[str]] = ["name", "namespace", "accessmode", "size"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of PersistentVolumeClaim from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of PersistentVolumeClaim from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "name": obj.get("name"),
+            "namespace": obj.get("namespace"),
+            "accessmode": obj.get("accessmode"),
+            "size": obj.get("size")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim_create.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim_create.py
new file mode 100644
index 00000000..1450db94
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/models/persistent_volume_claim_create.py
@@ -0,0 +1,89 @@
+# coding: utf-8
+
+"""
+    Volumes manager API
+
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class PersistentVolumeClaimCreate(BaseModel):
+    """
+    PersistentVolumeClaimCreate
+    """ # noqa: E501
+    name: Optional[StrictStr] = Field(default=None, description="Unique name for the Persisten Volume Claim to create.")
+    size: Optional[StrictStr] = Field(default=None, description="The size of the Persistent Volume Claim to create.")
+    __properties: ClassVar[List[str]] = ["name", "size"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of PersistentVolumeClaimCreate from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of PersistentVolumeClaimCreate from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "name": obj.get("name"),
+            "size": obj.get("size")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/__init__.py
deleted file mode 100644
index 4ae0da2f..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.volumemanager.apis.path_to_api import path_to_api
-
-import enum
-
-
-class PathValues(str, enum.Enum):
-    PVC = "/pvc"
-    PVC_NAME = "/pvc/{name}"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/__init__.py
deleted file mode 100644
index 62c450d5..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.volumemanager.paths.pvc import Api
-
-from cloudharness_cli.volumemanager.paths import PathValues
-
-path = PathValues.PVC
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.py
deleted file mode 100644
index 4dcc22ff..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.py
+++ /dev/null
@@ -1,347 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.volumemanager import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from cloudharness_cli/volumemanager.model.persistent_volume_claim_create import PersistentVolumeClaimCreate
-
-from . import path
-
-# body param
-SchemaForRequestBodyApplicationJson = PersistentVolumeClaimCreate
-
-
-request_body_persistent_volume_claim_create = api_client.RequestBody(
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaForRequestBodyApplicationJson),
-    },
-    required=True,
-)
-_auth = [
-    'bearerAuth',
-]
-SchemaFor201ResponseBodyApplicationJson = PersistentVolumeClaim
-
-
-@dataclass
-class ApiResponseFor201(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor201ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_201 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor201,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor201ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-_status_code_to_response = {
-    '201': _response_for_201,
-    '400': _response_for_400,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Create a Persistent Volume Claim in Kubernetes
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        if body is schemas.unset:
-            raise exceptions.ApiValueError(
-                'The required body parameter has an invalid value of: unset. Set a valid value instead')
-        _fields = None
-        _body = None
-        serialized_data = request_body_persistent_volume_claim_create.serialize(body, content_type)
-        _headers.add('Content-Type', content_type)
-        if 'fields' in serialized_data:
-            _fields = serialized_data['fields']
-        elif 'body' in serialized_data:
-            _body = serialized_data['body']
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='post'.upper(),
-            headers=_headers,
-            fields=_fields,
-            body=_body,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class PvcPost(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_post_oapg(
-            body=body,
-            content_type=content_type,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForpost(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_post_oapg(
-            body=body,
-            content_type=content_type,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.pyi
deleted file mode 100644
index 67697b9e..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc/post.pyi
+++ /dev/null
@@ -1,338 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.volumemanager import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from cloudharness_cli/volumemanager.model.persistent_volume_claim_create import PersistentVolumeClaimCreate
-
-# body param
-SchemaForRequestBodyApplicationJson = PersistentVolumeClaimCreate
-
-
-request_body_persistent_volume_claim_create = api_client.RequestBody(
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaForRequestBodyApplicationJson),
-    },
-    required=True,
-)
-SchemaFor201ResponseBodyApplicationJson = PersistentVolumeClaim
-
-
-@dataclass
-class ApiResponseFor201(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor201ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_201 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor201,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor201ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _pvc_post_oapg(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Create a Persistent Volume Claim in Kubernetes
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        used_path = path.value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        if body is schemas.unset:
-            raise exceptions.ApiValueError(
-                'The required body parameter has an invalid value of: unset. Set a valid value instead')
-        _fields = None
-        _body = None
-        serialized_data = request_body_persistent_volume_claim_create.serialize(body, content_type)
-        _headers.add('Content-Type', content_type)
-        if 'fields' in serialized_data:
-            _fields = serialized_data['fields']
-        elif 'body' in serialized_data:
-            _body = serialized_data['body']
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='post'.upper(),
-            headers=_headers,
-            fields=_fields,
-            body=_body,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class PvcPost(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def pvc_post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_post_oapg(
-            body=body,
-            content_type=content_type,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForpost(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: typing_extensions.Literal["application/json"] = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-    ]: ...
-
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        skip_deserialization: typing_extensions.Literal[True],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = ...,
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor201,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def post(
-        self,
-        body: typing.Union[SchemaForRequestBodyApplicationJson,],
-        content_type: str = 'application/json',
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_post_oapg(
-            body=body,
-            content_type=content_type,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/__init__.py
deleted file mode 100644
index 2a282a50..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.volumemanager.paths.pvc_name import Api
-
-from cloudharness_cli.volumemanager.paths import PathValues
-
-path = PathValues.PVC_NAME
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.py
deleted file mode 100644
index f912ab6c..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.py
+++ /dev/null
@@ -1,306 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.volumemanager import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-
-from . import path
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-_auth = [
-    'bearerAuth',
-]
-SchemaFor200ResponseBodyApplicationJson = PersistentVolumeClaim
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '404': _response_for_404,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _pvc_name_get_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _pvc_name_get_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _pvc_name_get_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _pvc_name_get_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Retrieve a Persistent Volume Claim from the Kubernetes repository.
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class PvcNameGet(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def pvc_name_get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def pvc_name_get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def pvc_name_get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def pvc_name_get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_name_get_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_name_get_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.pyi
deleted file mode 100644
index d75717b1..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/paths/pvc_name/get.pyi
+++ /dev/null
@@ -1,297 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.volumemanager import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.volumemanager import schemas  # noqa: F401
-
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyApplicationJson = PersistentVolumeClaim
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _pvc_name_get_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _pvc_name_get_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _pvc_name_get_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _pvc_name_get_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        Retrieve a Persistent Volume Claim from the Kubernetes repository.
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            auth_settings=_auth,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class PvcNameGet(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def pvc_name_get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def pvc_name_get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def pvc_name_get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def pvc_name_get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_name_get_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._pvc_name_get_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/test/common/test_paths/test_accounts_config/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/py.typed
similarity index 100%
rename from libraries/client/cloudharness_cli/test/common/test_paths/test_accounts_config/__init__.py
rename to libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/py.typed
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/rest.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/rest.py
index afef6544..656d7613 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/rest.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/rest.py
@@ -3,34 +3,66 @@
 """
     Volumes manager API
 
-    CloudHarness Volumes manager API  # noqa: E501
+    CloudHarness Volumes manager API
 
     The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
-import logging
+import io
+import json
+import re
 import ssl
-from urllib.parse import urlencode
-import typing
 
-import certifi
 import urllib3
-from urllib3._collections import HTTPHeaderDict
 
 from cloudharness_cli.volumemanager.exceptions import ApiException, ApiValueError
 
+SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"}
+RESTResponseType = urllib3.HTTPResponse
+
+
+def is_socks_proxy_url(url):
+    if url is None:
+        return False
+    split_section = url.split("://")
+    if len(split_section) < 2:
+        return False
+    else:
+        return split_section[0].lower() in SUPPORTED_SOCKS_PROXIES
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp) -> None:
+        self.response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = None
+
+    def read(self):
+        if self.data is None:
+            self.data = self.response.data
+        return self.data
+
+    def getheaders(self):
+        """Returns a dictionary of the response headers."""
+        return self.response.headers
 
-logger = logging.getLogger(__name__)
+    def getheader(self, name, default=None):
+        """Returns a given response header."""
+        return self.response.headers.get(name, default)
 
 
-class RESTClientObject(object):
+class RESTClientObject:
 
-    def __init__(self, configuration, pools_size=4, maxsize=None):
+    def __init__(self, configuration) -> None:
         # urllib3.PoolManager will pass all kw parameters to connectionpool
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
-        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
         # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
 
         # cert_reqs
@@ -39,140 +71,167 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         else:
             cert_reqs = ssl.CERT_NONE
 
-        # ca_certs
-        if configuration.ssl_ca_cert:
-            ca_certs = configuration.ssl_ca_cert
-        else:
-            # if not set certificate file, use Mozilla's root certificates.
-            ca_certs = certifi.where()
-
-        addition_pool_args = {}
+        pool_args = {
+            "cert_reqs": cert_reqs,
+            "ca_certs": configuration.ssl_ca_cert,
+            "cert_file": configuration.cert_file,
+            "key_file": configuration.key_file,
+        }
         if configuration.assert_hostname is not None:
-            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+            pool_args['assert_hostname'] = (
+                configuration.assert_hostname
+            )
 
         if configuration.retries is not None:
-            addition_pool_args['retries'] = configuration.retries
+            pool_args['retries'] = configuration.retries
+
+        if configuration.tls_server_name:
+            pool_args['server_hostname'] = configuration.tls_server_name
+
 
         if configuration.socket_options is not None:
-            addition_pool_args['socket_options'] = configuration.socket_options
+            pool_args['socket_options'] = configuration.socket_options
 
-        if maxsize is None:
-            if configuration.connection_pool_maxsize is not None:
-                maxsize = configuration.connection_pool_maxsize
-            else:
-                maxsize = 4
+        if configuration.connection_pool_maxsize is not None:
+            pool_args['maxsize'] = configuration.connection_pool_maxsize
 
         # https pool manager
+        self.pool_manager: urllib3.PoolManager
+
         if configuration.proxy:
-            self.pool_manager = urllib3.ProxyManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                proxy_url=configuration.proxy,
-                proxy_headers=configuration.proxy_headers,
-                **addition_pool_args
-            )
+            if is_socks_proxy_url(configuration.proxy):
+                from urllib3.contrib.socks import SOCKSProxyManager
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["headers"] = configuration.proxy_headers
+                self.pool_manager = SOCKSProxyManager(**pool_args)
+            else:
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["proxy_headers"] = configuration.proxy_headers
+                self.pool_manager = urllib3.ProxyManager(**pool_args)
         else:
-            self.pool_manager = urllib3.PoolManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                **addition_pool_args
-            )
+            self.pool_manager = urllib3.PoolManager(**pool_args)
 
     def request(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, typing.Any], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
+        method,
+        url,
+        headers=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ):
         """Perform requests.
 
         :param method: http request method
         :param url: http request url
         :param headers: http request headers
-        :param body: request body, for other types
-        :param fields: request parameters for
-                                `application/x-www-form-urlencoded`
-                                or `multipart/form-data`
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                be returned without reading/decoding response
-                                data. Default is False.
-        :param timeout: timeout setting for this request. If one
-                                number provided, it will be total request
-                                timeout. It can also be a pair (tuple) of
-                                (connection, read) timeouts.
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencoded`
+                            and `multipart/form-data`
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
-                          'PATCH', 'OPTIONS']
-
-        if fields and body:
+        assert method in [
+            'GET',
+            'HEAD',
+            'DELETE',
+            'POST',
+            'PUT',
+            'PATCH',
+            'OPTIONS'
+        ]
+
+        if post_params and body:
             raise ApiValueError(
-                "body parameter cannot be used with fields parameter."
+                "body parameter cannot be used with post_params parameter."
             )
 
-        fields = fields or {}
+        post_params = post_params or {}
         headers = headers or {}
 
-        if timeout:
-            if isinstance(timeout, (int, float)):  # noqa: E501,F821
-                timeout = urllib3.Timeout(total=timeout)
-            elif (isinstance(timeout, tuple) and
-                  len(timeout) == 2):
-                timeout = urllib3.Timeout(connect=timeout[0], read=timeout[1])
+        timeout = None
+        if _request_timeout:
+            if isinstance(_request_timeout, (int, float)):
+                timeout = urllib3.Timeout(total=_request_timeout)
+            elif (
+                    isinstance(_request_timeout, tuple)
+                    and len(_request_timeout) == 2
+                ):
+                timeout = urllib3.Timeout(
+                    connect=_request_timeout[0],
+                    read=_request_timeout[1]
+                )
 
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
             if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
-                if 'Content-Type' not in headers and body is None:
+
+                # no content type provided or payload is json
+                content_type = headers.get('Content-Type')
+                if (
+                    not content_type
+                    or re.search('json', content_type, re.IGNORECASE)
+                ):
+                    request_body = None
+                    if body is not None:
+                        request_body = json.dumps(body)
                     r = self.pool_manager.request(
                         method,
                         url,
-                        preload_content=not stream,
+                        body=request_body,
                         timeout=timeout,
-                        headers=headers
+                        headers=headers,
+                        preload_content=False
                     )
-                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                elif content_type == 'application/x-www-form-urlencoded':
                     r = self.pool_manager.request(
-                        method, url,
-                        body=body,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=False,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
-                elif headers['Content-Type'] == 'multipart/form-data':
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif content_type == 'multipart/form-data':
                     # must del headers['Content-Type'], or the correct
                     # Content-Type which generated by urllib3 will be
                     # overwritten.
                     del headers['Content-Type']
+                    # Ensures that dict objects are serialized
+                    post_params = [(a, json.dumps(b)) if isinstance(b, dict) else (a,b) for a, b in post_params]
                     r = self.pool_manager.request(
-                        method, url,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=True,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
+                        headers=headers,
+                        preload_content=False
+                    )
                 # Pass a `string` parameter directly in the body to support
-                # other content types than Json when `body` argument is
-                # provided in serialized form
+                # other content types than JSON when `body` argument is
+                # provided in serialized form.
                 elif isinstance(body, str) or isinstance(body, bytes):
-                    request_body = body
                     r = self.pool_manager.request(
-                        method, url,
+                        method,
+                        url,
+                        body=body,
+                        timeout=timeout,
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif headers['Content-Type'] == 'text/plain' and isinstance(body, bool):
+                    request_body = "true" if body else "false"
+                    r = self.pool_manager.request(
+                        method,
+                        url,
                         body=request_body,
-                        preload_content=not stream,
+                        preload_content=False,
                         timeout=timeout,
                         headers=headers)
                 else:
@@ -183,72 +242,16 @@ def request(
                     raise ApiException(status=0, reason=msg)
             # For `GET`, `HEAD`
             else:
-                r = self.pool_manager.request(method, url,
-                                              preload_content=not stream,
-                                              timeout=timeout,
-                                              headers=headers)
+                r = self.pool_manager.request(
+                    method,
+                    url,
+                    fields={},
+                    timeout=timeout,
+                    headers=headers,
+                    preload_content=False
+                )
         except urllib3.exceptions.SSLError as e:
-            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            msg = "\n".join([type(e).__name__, str(e)])
             raise ApiException(status=0, reason=msg)
 
-        if not stream:
-            # log response body
-            logger.debug("response body: %s", r.data)
-
-        return r
-
-    def GET(self, url, headers=None, stream=False,
-            timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("GET", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def HEAD(self, url, headers=None, stream=False,
-             timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("HEAD", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def OPTIONS(self, url, headers=None,
-                body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("OPTIONS", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def DELETE(self, url, headers=None, body=None,
-               stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("DELETE", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def POST(self, url, headers=None,
-             body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("POST", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PUT(self, url, headers=None,
-            body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PUT", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PATCH(self, url, headers=None,
-              body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PATCH", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
+        return RESTResponse(r)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/schemas.py b/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/schemas.py
deleted file mode 100644
index 1d49822a..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/volumemanager/schemas.py
+++ /dev/null
@@ -1,2462 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-from collections import defaultdict
-from datetime import date, datetime, timedelta  # noqa: F401
-import functools
-import decimal
-import io
-import re
-import types
-import typing
-import uuid
-
-from dateutil.parser.isoparser import isoparser, _takes_ascii
-import frozendict
-
-from cloudharness_cli.volumemanager.exceptions import (
-    ApiTypeError,
-    ApiValueError,
-)
-from cloudharness_cli.volumemanager.configuration import (
-    Configuration,
-)
-
-
-class Unset(object):
-    """
-    An instance of this class is set as the default value for object type(dict) properties that are optional
-    When a property has an unset value, that property will not be assigned in the dict
-    """
-    pass
-
-unset = Unset()
-
-none_type = type(None)
-file_type = io.IOBase
-
-
-class FileIO(io.FileIO):
-    """
-    A class for storing files
-    Note: this class is not immutable
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
-                raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
-            return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
-
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        pass
-
-
-def update(d: dict, u: dict):
-    """
-    Adds u to d
-    Where each dict is defaultdict(set)
-    """
-    if not u:
-        return d
-    for k, v in u.items():
-        if k not in d:
-            d[k] = v
-        else:
-            d[k] = d[k] | v
-
-
-class ValidationMetadata(frozendict.frozendict):
-    """
-    A class storing metadata that is needed to validate OpenApi Schema payloads
-    """
-    def __new__(
-        cls,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-        from_server: bool = False,
-        configuration: typing.Optional[Configuration] = None,
-        seen_classes: typing.FrozenSet[typing.Type] = frozenset(),
-        validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]] = frozendict.frozendict()
-    ):
-        """
-        Args:
-            path_to_item: the path to the current data being instantiated.
-                For {'a': [1]} if the code is handling, 1, then the path is ('args[0]', 'a', 0)
-                This changes from location to location
-            from_server: whether or not this data came form the server
-                True when receiving server data
-                False when instantiating model with client side data not form the server
-                This does not change from location to location
-            configuration: the Configuration instance to use
-                This is needed because in Configuration:
-                - one can disable validation checking
-                This does not change from location to location
-            seen_classes: when deserializing data that matches multiple schemas, this is used to store
-                the schemas that have been traversed. This is used to stop processing when a cycle is seen.
-                This changes from location to location
-            validated_path_to_schemas: stores the already validated schema classes for a given path location
-                This does not change from location to location
-        """
-        return super().__new__(
-            cls,
-            path_to_item=path_to_item,
-            from_server=from_server,
-            configuration=configuration,
-            seen_classes=seen_classes,
-            validated_path_to_schemas=validated_path_to_schemas
-        )
-
-    def validation_ran_earlier(self, cls: type) -> bool:
-        validated_schemas = self.validated_path_to_schemas.get(self.path_to_item, set())
-        validation_ran_earlier = validated_schemas and cls in validated_schemas
-        if validation_ran_earlier:
-            return True
-        if cls in self.seen_classes:
-            return True
-        return False
-
-    @property
-    def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]:
-        return self.get('path_to_item')
-
-    @property
-    def from_server(self) -> bool:
-        return self.get('from_server')
-
-    @property
-    def configuration(self) -> typing.Optional[Configuration]:
-        return self.get('configuration')
-
-    @property
-    def seen_classes(self) -> typing.FrozenSet[typing.Type]:
-        return self.get('seen_classes')
-
-    @property
-    def validated_path_to_schemas(self) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]]:
-        return self.get('validated_path_to_schemas')
-
-
-class Singleton:
-    """
-    Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
-    """
-    _instances = {}
-
-    def __new__(cls, arg: typing.Any, **kwargs):
-        """
-        cls base classes: BoolClass, NoneClass, str, decimal.Decimal
-        The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
-        However 1.0  can also be ingested into that enum schema because 1.0 == 1 and
-        Decimal('1.0') == Decimal('1')
-        But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
-        and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
-        """
-        key = (cls, arg, str(arg))
-        if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
-                inst = super().__new__(cls)
-                cls._instances[key] = inst
-            else:
-                cls._instances[key] = super().__new__(cls, arg)
-        return cls._instances[key]
-
-    def __repr__(self):
-        if isinstance(self, NoneClass):
-            return f'<{self.__class__.__name__}: None>'
-        elif isinstance(self, BoolClass):
-            if bool(self):
-                return f'<{self.__class__.__name__}: True>'
-            return f'<{self.__class__.__name__}: False>'
-        return f'<{self.__class__.__name__}: {super().__repr__()}>'
-
-
-class classproperty:
-
-    def __init__(self, fget):
-        self.fget = fget
-
-    def __get__(self, owner_self, owner_cls):
-        return self.fget(owner_cls)
-
-
-class NoneClass(Singleton):
-    @classproperty
-    def NONE(cls):
-        return cls(None)
-
-    def __bool__(self) -> bool:
-        return False
-
-
-class BoolClass(Singleton):
-    @classproperty
-    def TRUE(cls):
-        return cls(True)
-
-    @classproperty
-    def FALSE(cls):
-        return cls(False)
-
-    @functools.lru_cache()
-    def __bool__(self) -> bool:
-        for key, instance in self._instances.items():
-            if self is instance:
-                return bool(key[1])
-        raise ValueError('Unable to find the boolean value of this instance')
-
-
-class MetaOapgTyped:
-    exclusive_maximum: typing.Union[int, float]
-    inclusive_maximum: typing.Union[int, float]
-    exclusive_minimum: typing.Union[int, float]
-    inclusive_minimum: typing.Union[int, float]
-    max_items: int
-    min_items: int
-    discriminator: typing.Dict[str, typing.Dict[str, typing.Type['Schema']]]
-
-
-    class properties:
-        # to hold object properties
-        pass
-
-    additional_properties: typing.Optional[typing.Type['Schema']]
-    max_properties: int
-    min_properties: int
-    all_of: typing.List[typing.Type['Schema']]
-    one_of: typing.List[typing.Type['Schema']]
-    any_of: typing.List[typing.Type['Schema']]
-    not_schema: typing.Type['Schema']
-    max_length: int
-    min_length: int
-    items: typing.Type['Schema']
-
-
-class Schema:
-    """
-    the base class of all swagger/openapi schemas/models
-    """
-    __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    _types: typing.Set[typing.Type]
-    MetaOapg = MetaOapgTyped
-
-    @staticmethod
-    def __get_valid_classes_phrase(input_classes):
-        """Returns a string phrase describing what types are allowed"""
-        all_classes = list(input_classes)
-        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-        all_class_names = [cls.__name__ for cls in all_classes]
-        if len(all_class_names) == 1:
-            return "is {0}".format(all_class_names[0])
-        return "is one of [{0}]".format(", ".join(all_class_names))
-
-    @staticmethod
-    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
-        if isinstance(item_cls, types.FunctionType):
-            # referenced schema
-            return item_cls()
-        elif isinstance(item_cls, staticmethod):
-            # referenced schema
-            return item_cls.__func__()
-        return item_cls
-
-    @classmethod
-    def __type_error_message(
-        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-    ):
-        """
-        Keyword Args:
-            var_value (any): the variable which has the type_error
-            var_name (str): the name of the variable which has the typ error
-            valid_classes (tuple): the accepted classes for current_item's
-                                      value
-            key_type (bool): False if our value is a value in a dict
-                             True if it is a key in a dict
-                             False if our item is an item in a tuple
-        """
-        key_or_value = "value"
-        if key_type:
-            key_or_value = "key"
-        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-        msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
-            var_name,
-            key_or_value,
-            valid_classes_phrase,
-            type(var_value).__name__,
-        )
-        return msg
-
-    @classmethod
-    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-        error_msg = cls.__type_error_message(
-            var_name=path_to_item[-1],
-            var_value=var_value,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-        return ApiTypeError(
-            error_msg,
-            path_to_item=path_to_item,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        Schema _validate_oapg
-        All keyword validation except for type checking was done in calling stack frames
-        If those validations passed, the validated classes are collected in path_to_schemas
-
-        Returns:
-            path_to_schemas: a map of path to schemas
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        base_class = type(arg)
-        if base_class not in cls._types:
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                cls._types,
-                key_type=False,
-            )
-
-        path_to_schemas = {validation_metadata.path_to_item: set()}
-        path_to_schemas[validation_metadata.path_to_item].add(cls)
-        path_to_schemas[validation_metadata.path_to_item].add(base_class)
-        return path_to_schemas
-
-    @staticmethod
-    def _process_schema_classes_oapg(
-        schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
-    ):
-        """
-        Processes and mutates schema_classes
-        If a SomeSchema is a subclass of DictSchema then remove DictSchema because it is already included
-        """
-        if len(schema_classes) < 2:
-            return
-        if len(schema_classes) > 2 and UnsetAnyTypeSchema in schema_classes:
-            schema_classes.remove(UnsetAnyTypeSchema)
-        x_schema = schema_type_classes & schema_classes
-        if not x_schema:
-            return
-        x_schema = x_schema.pop()
-        if any(c is not x_schema and issubclass(c, x_schema) for c in schema_classes):
-            # needed to not have a mro error in get_new_class
-            schema_classes.remove(x_schema)
-
-    @classmethod
-    def __get_new_cls(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]:
-        """
-        Make a new dynamic class and return an instance of that class
-        We are making an instance of cls, but instead of making cls
-        make a new class, new_cls
-        which includes dynamic bases including cls
-        return an instance of that new class
-
-        Dict property + List Item Assignment Use cases:
-        1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
-            where the key is the path to the item, and the value will be the required manufactured class
-            made out of the matching schemas
-        2. value is an instance of the the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
-            because value is of the correct type, and validation was run earlier when the instance was created
-        """
-        _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(_path_to_schemas, other_path_to_schemas)
-        # loop through it make a new class for each entry
-        # do not modify the returned result because it is cached and we would be modifying the cached value
-        path_to_schemas = {}
-        for path, schema_classes in _path_to_schemas.items():
-            """
-            Use cases
-            1. N number of schema classes + enum + type != bool/None, classes in path_to_schemas: tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-                needs Singleton added
-            2. N number of schema classes + enum + type == bool/None, classes in path_to_schemas: BoolClass/NoneClass
-                Singleton already added
-            3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-            """
-            cls._process_schema_classes_oapg(schema_classes)
-            enum_schema = any(
-                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
-            inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
-            chosen_schema_classes = schema_classes - inheritable_primitive_type
-            suffix = tuple(inheritable_primitive_type)
-            if enum_schema and suffix[0] not in {NoneClass, BoolClass}:
-                suffix = (Singleton,) + suffix
-
-            used_classes = tuple(sorted(chosen_schema_classes, key=lambda a_cls: a_cls.__name__)) + suffix
-            mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes)
-            path_to_schemas[path] = mfg_cls
-
-        return path_to_schemas
-
-    @classmethod
-    def _get_new_instance_without_conversion_oapg(
-        cls,
-        arg: typing.Any,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        # We have a Dynamic class and we are making an instance of it
-        if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, properties)
-        elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, items)
-        """
-        str = openapi str, date, and datetime
-        decimal.Decimal = openapi int and float
-        FileIO = openapi binary type and the user inputs a file
-        bytes = openapi binary type and the user inputs bytes
-        """
-        return super(Schema, cls).__new__(cls, arg)
-
-    @classmethod
-    def from_openapi_data_oapg(
-        cls,
-        arg: typing.Union[
-            str,
-            date,
-            datetime,
-            int,
-            float,
-            decimal.Decimal,
-            bool,
-            None,
-            'Schema',
-            dict,
-            frozendict.frozendict,
-            tuple,
-            list,
-            io.FileIO,
-            io.BufferedReader,
-            bytes
-        ],
-        _configuration: typing.Optional[Configuration]
-    ):
-        """
-        Schema from_openapi_data_oapg
-        """
-        from_server = True
-        validated_path_to_schemas = {}
-        arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas)
-        validation_metadata = ValidationMetadata(
-            from_server=from_server, configuration=_configuration, validated_path_to_schemas=validated_path_to_schemas)
-        path_to_schemas = cls.__get_new_cls(arg, validation_metadata)
-        new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
-            arg,
-            validation_metadata.path_to_item,
-            path_to_schemas
-        )
-        return new_inst
-
-    @staticmethod
-    def __get_input_dict(*args, **kwargs) -> frozendict.frozendict:
-        input_dict = {}
-        if args and isinstance(args[0], (dict, frozendict.frozendict)):
-            input_dict.update(args[0])
-        if kwargs:
-            input_dict.update(kwargs)
-        return frozendict.frozendict(input_dict)
-
-    @staticmethod
-    def __remove_unsets(kwargs):
-        return {key: val for key, val in kwargs.items() if val is not unset}
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
-        """
-        Schema __new__
-
-        Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
-            kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the Configuration that enables json schema validation keywords
-                like minItems, minLength etc
-
-        Note: double underscores are used here because pycharm thinks that these variables
-        are instance properties if they are named normally :(
-        """
-        __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
-            raise TypeError(
-                'No input given. args or kwargs must be given.'
-            )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
-        else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
-        __from_server = False
-        __validated_path_to_schemas = {}
-        __arg = cast_to_allowed_types(
-            __arg, __from_server, __validated_path_to_schemas)
-        __validation_metadata = ValidationMetadata(
-            configuration=_configuration, from_server=__from_server, validated_path_to_schemas=__validated_path_to_schemas)
-        __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata)
-        __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
-            __arg,
-            __validation_metadata.path_to_item,
-            __path_to_schemas
-        )
-
-    def __init__(
-        self,
-        *args: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[Configuration] = None,
-        **kwargs: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
-        ]
-    ):
-        """
-        this is needed to fix 'Unexpected argument' warning in pycharm
-        this code does nothing because all Schema instances are immutable
-        this means that all input data is passed into and used in new, and after the new instance is made
-        no new attributes are assigned and init is not used
-        """
-        pass
-
-"""
-import itertools
-data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-type_to_cls = {
-    'None': 'NoneClass',
-    'FrozenDict': 'frozendict.frozendict',
-    'Tuple': 'tuple',
-    'Str': 'str',
-    'Decimal': 'decimal.Decimal',
-    'Bool': 'BoolClass'
-}
-cls_tuples = [v for v in itertools.combinations(data_types, 5)]
-typed_classes = [f"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\n    pass" for cls_tuple in cls_tuples]
-for cls in typed_classes:
-    print(cls)
-object_classes = [f"{''.join(cls_tuple)}Mixin = object" for cls_tuple in cls_tuples]
-for cls in object_classes:
-    print(cls)
-"""
-if typing.TYPE_CHECKING:
-    # qty 1
-    NoneMixin = NoneClass
-    FrozenDictMixin = frozendict.frozendict
-    TupleMixin = tuple
-    StrMixin = str
-    DecimalMixin = decimal.Decimal
-    BoolMixin = BoolClass
-    BytesMixin = bytes
-    FileMixin = FileIO
-    # qty 2
-    class BinaryMixin(bytes, FileIO):
-        pass
-    class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
-        pass
-    class NoneTupleMixin(NoneClass, tuple):
-        pass
-    class NoneStrMixin(NoneClass, str):
-        pass
-    class NoneDecimalMixin(NoneClass, decimal.Decimal):
-        pass
-    class NoneBoolMixin(NoneClass, BoolClass):
-        pass
-    class FrozenDictTupleMixin(frozendict.frozendict, tuple):
-        pass
-    class FrozenDictStrMixin(frozendict.frozendict, str):
-        pass
-    class FrozenDictDecimalMixin(frozendict.frozendict, decimal.Decimal):
-        pass
-    class FrozenDictBoolMixin(frozendict.frozendict, BoolClass):
-        pass
-    class TupleStrMixin(tuple, str):
-        pass
-    class TupleDecimalMixin(tuple, decimal.Decimal):
-        pass
-    class TupleBoolMixin(tuple, BoolClass):
-        pass
-    class StrDecimalMixin(str, decimal.Decimal):
-        pass
-    class StrBoolMixin(str, BoolClass):
-        pass
-    class DecimalBoolMixin(decimal.Decimal, BoolClass):
-        pass
-    # qty 3
-    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
-        pass
-    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
-        pass
-    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
-        pass
-    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
-        pass
-    class NoneTupleStrMixin(NoneClass, tuple, str):
-        pass
-    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
-        pass
-    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
-        pass
-    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
-        pass
-    class NoneStrBoolMixin(NoneClass, str, BoolClass):
-        pass
-    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
-        pass
-    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
-        pass
-    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
-        pass
-    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
-        pass
-    class TupleStrBoolMixin(tuple, str, BoolClass):
-        pass
-    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
-        pass
-    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
-        pass
-    # qty 4
-    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
-        pass
-    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
-        pass
-    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
-        pass
-    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
-        pass
-    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
-        pass
-else:
-    # qty 1
-    class NoneMixin:
-        _types = {NoneClass}
-    class FrozenDictMixin:
-        _types = {frozendict.frozendict}
-    class TupleMixin:
-        _types = {tuple}
-    class StrMixin:
-        _types = {str}
-    class DecimalMixin:
-        _types = {decimal.Decimal}
-    class BoolMixin:
-        _types = {BoolClass}
-    class BytesMixin:
-        _types = {bytes}
-    class FileMixin:
-        _types = {FileIO}
-    # qty 2
-    class BinaryMixin:
-        _types = {bytes, FileIO}
-    class NoneFrozenDictMixin:
-        _types = {NoneClass, frozendict.frozendict}
-    class NoneTupleMixin:
-        _types = {NoneClass, tuple}
-    class NoneStrMixin:
-        _types = {NoneClass, str}
-    class NoneDecimalMixin:
-        _types = {NoneClass, decimal.Decimal}
-    class NoneBoolMixin:
-        _types = {NoneClass, BoolClass}
-    class FrozenDictTupleMixin:
-        _types = {frozendict.frozendict, tuple}
-    class FrozenDictStrMixin:
-        _types = {frozendict.frozendict, str}
-    class FrozenDictDecimalMixin:
-        _types = {frozendict.frozendict, decimal.Decimal}
-    class FrozenDictBoolMixin:
-        _types = {frozendict.frozendict, BoolClass}
-    class TupleStrMixin:
-        _types = {tuple, str}
-    class TupleDecimalMixin:
-        _types = {tuple, decimal.Decimal}
-    class TupleBoolMixin:
-        _types = {tuple, BoolClass}
-    class StrDecimalMixin:
-        _types = {str, decimal.Decimal}
-    class StrBoolMixin:
-        _types = {str, BoolClass}
-    class DecimalBoolMixin:
-        _types = {decimal.Decimal, BoolClass}
-    # qty 3
-    class NoneFrozenDictTupleMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple}
-    class NoneFrozenDictStrMixin:
-        _types = {NoneClass, frozendict.frozendict, str}
-    class NoneFrozenDictDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
-    class NoneFrozenDictBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, BoolClass}
-    class NoneTupleStrMixin:
-        _types = {NoneClass, tuple, str}
-    class NoneTupleDecimalMixin:
-        _types = {NoneClass, tuple, decimal.Decimal}
-    class NoneTupleBoolMixin:
-        _types = {NoneClass, tuple, BoolClass}
-    class NoneStrDecimalMixin:
-        _types = {NoneClass, str, decimal.Decimal}
-    class NoneStrBoolMixin:
-        _types = {NoneClass, str, BoolClass}
-    class NoneDecimalBoolMixin:
-        _types = {NoneClass, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrMixin:
-        _types = {frozendict.frozendict, tuple, str}
-    class FrozenDictTupleDecimalMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal}
-    class FrozenDictTupleBoolMixin:
-        _types = {frozendict.frozendict, tuple, BoolClass}
-    class FrozenDictStrDecimalMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal}
-    class FrozenDictStrBoolMixin:
-        _types = {frozendict.frozendict, str, BoolClass}
-    class FrozenDictDecimalBoolMixin:
-        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
-    class TupleStrDecimalMixin:
-        _types = {tuple, str, decimal.Decimal}
-    class TupleStrBoolMixin:
-        _types = {tuple, str, BoolClass}
-    class TupleDecimalBoolMixin:
-        _types = {tuple, decimal.Decimal, BoolClass}
-    class StrDecimalBoolMixin:
-        _types = {str, decimal.Decimal, BoolClass}
-    # qty 4
-    class NoneFrozenDictTupleStrMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str}
-    class NoneFrozenDictTupleDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
-    class NoneFrozenDictTupleBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
-    class NoneFrozenDictStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
-    class NoneFrozenDictStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
-    class NoneFrozenDictDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal}
-    class NoneTupleStrBoolMixin:
-        _types = {NoneClass, tuple, str, BoolClass}
-    class NoneTupleDecimalBoolMixin:
-        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
-    class NoneStrDecimalBoolMixin:
-        _types = {NoneClass, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
-    class FrozenDictTupleStrBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, BoolClass}
-    class FrozenDictTupleDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class FrozenDictStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class TupleStrDecimalBoolMixin:
-        _types = {tuple, str, decimal.Decimal, BoolClass}
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
-    class NoneFrozenDictTupleStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
-    class NoneFrozenDictTupleDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class NoneFrozenDictStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalBoolMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
-
-
-class ValidatorBase:
-    @staticmethod
-    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
-        """Returns true if JSON schema validation is enabled for the specified
-        validation keyword. This can be used to skip JSON schema structural validation
-        as requested in the configuration.
-        Note: the suffix _oapg stands for openapi python (experimental) generator and
-        it has been added to prevent collisions with other methods and properties
-
-        Args:
-            schema_keyword (string): the name of a JSON schema validation keyword.
-            configuration (Configuration): the configuration class.
-        """
-
-        return (configuration is None or
-            not hasattr(configuration, '_disabled_client_side_validations') or
-            schema_keyword not in configuration._disabled_client_side_validations)
-
-    @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
-        raise ApiValueError(
-            "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
-                value=value,
-                constraint_msg=constraint_msg,
-                constraint_value=constraint_value,
-                additional_txt=additional_txt,
-                path_to_item=path_to_item,
-            )
-        )
-
-
-class EnumBase:
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        EnumBase _validate_oapg
-        Validates that arg is in the enum's allowed values
-        """
-        try:
-            cls.MetaOapg.enum_value_to_name[arg]
-        except KeyError:
-            raise ApiValueError("Invalid value {} passed in to {}, allowed_values={}".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class BoolBase:
-    def is_true_oapg(self) -> bool:
-        """
-        A replacement for x is True
-        True if the instance is a BoolClass True Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self)
-
-    def is_false_oapg(self) -> bool:
-        """
-        A replacement for x is False
-        True if the instance is a BoolClass False Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self) is False
-
-
-class NoneBase:
-    def is_none_oapg(self) -> bool:
-        """
-        A replacement for x is None
-        True if the instance is a NoneClass None Singleton
-        """
-        if issubclass(self.__class__, NoneClass):
-            return True
-        return False
-
-
-class StrBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_str_oapg(self) -> str:
-        return self
-
-    @property
-    def as_date_oapg(self) -> date:
-        raise Exception('not implemented')
-
-    @property
-    def as_datetime_oapg(self) -> datetime:
-        raise Exception('not implemented')
-
-    @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        raise Exception('not implemented')
-
-    @property
-    def as_uuid_oapg(self) -> uuid.UUID:
-        raise Exception('not implemented')
-
-    @classmethod
-    def __check_str_validations(
-        cls,
-        arg: str,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_length') and
-                len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_length') and
-                len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('pattern', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'regex')):
-            for regex_dict in cls.MetaOapg.regex:
-                flags = regex_dict.get('flags', 0)
-                if not re.search(regex_dict['pattern'], arg, flags=flags):
-                    if flags != 0:
-                        # Don't print the regex flags if the flags are not
-                        # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
-                            value=arg,
-                            constraint_msg="must match regular expression",
-                            constraint_value=regex_dict['pattern'],
-                            path_to_item=validation_metadata.path_to_item,
-                            additional_txt=" with flags=`{}`".format(flags)
-                        )
-                    cls._raise_validation_errror_message_oapg(
-                        value=arg,
-                        constraint_msg="must match regular expression",
-                        constraint_value=regex_dict['pattern'],
-                        path_to_item=validation_metadata.path_to_item
-                    )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        StrBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, str):
-            cls.__check_str_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class UUIDBase:
-    @property
-    @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
-        return uuid.UUID(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                uuid.UUID(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Invalid value '{}' for type UUID at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        UUIDBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class CustomIsoparser(isoparser):
-
-    @_takes_ascii
-    def parse_isodatetime(self, dt_str):
-        components, pos = self._parse_isodate(dt_str)
-        if len(dt_str) > pos:
-            if self._sep is None or dt_str[pos:pos + 1] == self._sep:
-                components += self._parse_isotime(dt_str[pos + 1:])
-            else:
-                raise ValueError('String contains unknown ISO components')
-
-        if len(components) > 3 and components[3] == 24:
-            components[3] = 0
-            return datetime(*components) + timedelta(days=1)
-
-        if len(components) <= 3:
-            raise ValueError('Value is not a datetime')
-
-        return datetime(*components)
-
-    @_takes_ascii
-    def parse_isodate(self, datestr):
-        components, pos = self._parse_isodate(datestr)
-
-        if len(datestr) > pos:
-            raise ValueError('String contains invalid time components')
-
-        if len(components) > 3:
-            raise ValueError('String contains invalid time components')
-
-        return date(*components)
-
-
-DEFAULT_ISOPARSER = CustomIsoparser()
-
-
-class DateBase:
-    @property
-    @functools.lru_cache()
-    def as_date_oapg(self) -> date:
-        return DEFAULT_ISOPARSER.parse_isodate(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodate(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 date format. "
-                    "Invalid value '{}' for type date at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        DateBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DateTimeBase:
-    @property
-    @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime:
-        return DEFAULT_ISOPARSER.parse_isodatetime(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodatetime(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 datetime format. "
-                    "Invalid value '{}' for type datetime at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DateTimeBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DecimalBase:
-    """
-    A class for storing decimals that are sent over the wire as strings
-    These schemas must remain based on StrBase rather than NumberBase
-    because picking base classes must be deterministic
-    """
-
-    @property
-    @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        return decimal.Decimal(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                decimal.Decimal(arg)
-                return True
-            except decimal.InvalidOperation:
-                raise ApiValueError(
-                    "Value cannot be converted to a decimal. "
-                    "Invalid value '{}' for type decimal at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DecimalBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class NumberBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            """
-            Note: for some numbers like 9.0 they could be represented as an
-            integer but our code chooses to store them as
-            >>> Decimal('9.0').as_tuple()
-            DecimalTuple(sign=0, digits=(9, 0), exponent=-1)
-            so we can tell that the value came from a float and convert it back to a float
-            during later serialization
-            """
-            if self.as_tuple().exponent < 0:
-                # this could be represented as an integer but should be represented as a float
-                # because that's what it was serialized from
-                raise ApiValueError(f'{self} is not an integer')
-            self._as_int = int(self)
-            return self._as_int
-
-    @property
-    def as_float_oapg(self) -> float:
-        try:
-            return self._as_float
-        except AttributeError:
-            if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
-            self._as_float = float(self)
-            return self._as_float
-
-    @classmethod
-    def __check_numeric_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if cls._is_json_validation_enabled_oapg('multipleOf',
-                                      validation_metadata.configuration) and hasattr(cls.MetaOapg, 'multiple_of'):
-            multiple_of_value = cls.MetaOapg.multiple_of
-            if (not (float(arg) / multiple_of_value).is_integer()):
-                # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="value must be a multiple of",
-                    constraint_value=multiple_of_value,
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-        checking_max_or_min_values = any(
-            hasattr(cls.MetaOapg, validation_key) for validation_key in {
-                'exclusive_maximum',
-                'inclusive_maximum',
-                'exclusive_minimum',
-                'inclusive_minimum',
-            }
-        )
-        if not checking_max_or_min_values:
-            return
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_maximum') and
-                arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_maximum') and
-                arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_minimum') and
-                arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_minimum') and
-                arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_minimum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        NumberBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, decimal.Decimal):
-            cls.__check_numeric_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class ListBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def __validate_items(cls, list_items, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for items are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            list_items: the input list of items
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-
-        # if we have definitions for an items schema, use it
-        # otherwise accept anything
-        item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
-        item_cls = cls._get_class_oapg(item_cls)
-        path_to_schemas = {}
-        for i, value in enumerate(list_items):
-            item_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=validation_metadata.path_to_item+(i,),
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if item_validation_metadata.validation_ran_earlier(item_cls):
-                continue
-            other_path_to_schemas = item_cls._validate_oapg(
-                value, validation_metadata=item_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_tuple_validations(
-            cls, arg,
-            validation_metadata: ValidationMetadata):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_items') and
-                len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_items') and
-                len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('uniqueItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
-            unique_items = set(arg)
-            if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
-                    constraint_value='unique_items==True',
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        ListBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, tuple):
-            cls.__check_tuple_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, tuple):
-            return _path_to_schemas
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        other_path_to_schemas = cls.__validate_items(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_items_oapg(
-        cls: 'Schema',
-        arg: typing.List[typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        '''
-        ListBase _get_items_oapg
-        '''
-        cast_items = []
-
-        for i, value in enumerate(arg):
-            item_path_to_item = path_to_item + (i,)
-            item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
-                value,
-                item_path_to_item,
-                path_to_schemas
-            )
-            cast_items.append(new_value)
-
-        return cast_items
-
-
-class Discriminable:
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def _ensure_discriminator_value_present_oapg(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args):
-        if not args or args and disc_property_name not in args[0]:
-            # The input data does not contain the discriminator property
-            raise ApiValueError(
-                "Cannot deserialize input data due to missing discriminator. "
-                "The discriminator property '{}' is missing at path: {}".format(disc_property_name, validation_metadata.path_to_item)
-            )
-
-    @classmethod
-    def get_discriminated_class_oapg(cls, disc_property_name: str, disc_payload_value: str):
-        """
-        Used in schemas with discriminators
-        """
-        if not hasattr(cls.MetaOapg, 'discriminator'):
-            return None
-        disc = cls.MetaOapg.discriminator()
-        if disc_property_name not in disc:
-            return None
-        discriminated_cls = disc[disc_property_name].get(disc_payload_value)
-        if discriminated_cls is not None:
-            return discriminated_cls
-        if not hasattr(cls, 'MetaOapg'):
-            return None
-        elif not (
-            hasattr(cls.MetaOapg, 'all_of') or
-            hasattr(cls.MetaOapg, 'one_of') or
-            hasattr(cls.MetaOapg, 'any_of')
-        ):
-            return None
-        # TODO stop traveling if a cycle is hit
-        if hasattr(cls.MetaOapg, 'all_of'):
-            for allof_cls in cls.MetaOapg.all_of():
-                discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'one_of'):
-            for oneof_cls in cls.MetaOapg.one_of():
-                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'any_of'):
-            for anyof_cls in cls.MetaOapg.any_of():
-                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        return None
-
-
-class DictBase(Discriminable, ValidatorBase):
-
-    @classmethod
-    def __validate_arg_presence(cls, arg):
-        """
-        Ensures that:
-        - all required arguments are passed in
-        - the input variable names are valid
-            - present in properties or
-            - accepted because additionalProperties exists
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-            - a var_name is invalid if additional_properties == NotAnyTypeSchema
-            and var_name not in properties.__annotations__
-        - required properties were not passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        seen_required_properties = set()
-        invalid_arguments = []
-        required_property_names = getattr(cls.MetaOapg, 'required', set())
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name in arg:
-            if property_name in required_property_names:
-                seen_required_properties.add(property_name)
-            elif property_name in property_annotations:
-                continue
-            elif additional_properties is not NotAnyTypeSchema:
-                continue
-            else:
-                invalid_arguments.append(property_name)
-        missing_required_arguments = list(required_property_names - seen_required_properties)
-        if missing_required_arguments:
-            missing_required_arguments.sort()
-            raise ApiTypeError(
-                "{} is missing {} required argument{}: {}".format(
-                    cls.__name__,
-                    len(missing_required_arguments),
-                    "s" if len(missing_required_arguments) > 1 else "",
-                    missing_required_arguments
-                )
-            )
-        if invalid_arguments:
-            invalid_arguments.sort()
-            raise ApiTypeError(
-                "{} was passed {} invalid argument{}: {}".format(
-                    cls.__name__,
-                    len(invalid_arguments),
-                    "s" if len(invalid_arguments) > 1 else "",
-                    invalid_arguments
-                )
-            )
-
-    @classmethod
-    def __validate_args(cls, arg, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for properties are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        path_to_schemas = {}
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name, value in arg.items():
-            path_to_item = validation_metadata.path_to_item+(property_name,)
-            if property_name in property_annotations:
-                schema = property_annotations[property_name]
-            elif additional_properties is not NotAnyTypeSchema:
-                if additional_properties is UnsetAnyTypeSchema:
-                    """
-                    If additionalProperties is unset and this path_to_item does not yet have
-                    any validations on it, validate it.
-                    If it already has validations on it, skip this validation.
-                    """
-                    if path_to_item in path_to_schemas:
-                        continue
-                schema = additional_properties
-            else:
-                raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
-                    value, cls, validation_metadata.path_to_item+(property_name,)
-                ))
-            schema = cls._get_class_oapg(schema)
-            arg_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=path_to_item,
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if arg_validation_metadata.validation_ran_earlier(schema):
-                continue
-            other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_dict_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_properties') and
-                len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_properties') and
-                len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DictBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, frozendict.frozendict):
-            cls.__check_dict_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, frozendict.frozendict):
-            return _path_to_schemas
-        cls.__validate_arg_presence(arg)
-        other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
-        update(_path_to_schemas, other_path_to_schemas)
-        try:
-            discriminator = cls.MetaOapg.discriminator()
-        except AttributeError:
-            return _path_to_schemas
-        # discriminator exists
-        disc_prop_name = list(discriminator.keys())[0]
-        cls._ensure_discriminator_value_present_oapg(disc_prop_name, validation_metadata, arg)
-        discriminated_cls = cls.get_discriminated_class_oapg(
-            disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name])
-        if discriminated_cls is None:
-            raise ApiValueError(
-                "Invalid discriminator value was passed in to {}.{} Only the values {} are allowed at {}".format(
-                    cls.__name__,
-                    disc_prop_name,
-                    list(discriminator[disc_prop_name].keys()),
-                    validation_metadata.path_to_item + (disc_prop_name,)
-                )
-            )
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        if updated_vm.validation_ran_earlier(discriminated_cls):
-            return _path_to_schemas
-        other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_properties_oapg(
-        cls,
-        arg: typing.Dict[str, typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        """
-        DictBase _get_properties_oapg, this is how properties are set
-        These values already passed validation
-        """
-        dict_items = {}
-
-        for property_name_js, value in arg.items():
-            property_path_to_item = path_to_item + (property_name_js,)
-            property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
-                value,
-                property_path_to_item,
-                path_to_schemas
-            )
-            dict_items[property_name_js] = new_value
-
-        return dict_items
-
-    def __setattr__(self, name: str, value: typing.Any):
-        if not isinstance(self, FileIO):
-            raise AttributeError('property setting not supported on immutable instances')
-
-    def __getattr__(self, name: str):
-        """
-        for instance.name access
-        Properties are only type hinted for required properties
-        so that hasattr(instance, 'optionalProp') is False when that key is not present
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        if name not in self.__class__.__annotations__:
-            raise AttributeError(f"{self} has no attribute '{name}'")
-        try:
-            value = self[name]
-            return value
-        except KeyError as ex:
-            raise AttributeError(str(ex))
-
-    def __getitem__(self, name: str):
-        """
-        dict_instance[name] accessor
-        key errors thrown
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        return super().__getitem__(name)
-
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
-        # dict_instance[name] accessor
-        if not isinstance(self, frozendict.frozendict):
-            raise NotImplementedError()
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return unset
-
-
-def cast_to_allowed_types(
-    arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict.frozendict, list, tuple, bytes, Schema, io.FileIO, io.BufferedReader],
-    from_server: bool,
-    validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]],
-    path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-) -> typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO]:
-    """
-    Casts the input payload arg into the allowed types
-    The input validated_path_to_schemas is mutated by running this function
-
-    When from_server is False then
-    - date/datetime is cast to str
-    - int/float is cast to Decimal
-
-    If a Schema instance is passed in it is converted back to a primitive instance because
-    One may need to validate that data to the original Schema class AND additional different classes
-    those additional classes will need to be added to the new manufactured class for that payload
-    If the code didn't do this and kept the payload as a Schema instance it would fail to validate to other
-    Schema classes and the code wouldn't be able to mfg a new class that includes all valid schemas
-    TODO: store the validated schema classes in validation_metadata
-
-    Args:
-        arg: the payload
-        from_server: whether this payload came from the server or not
-        validated_path_to_schemas: a dict that stores the validated classes at any path location in the payload
-    """
-    if isinstance(arg, Schema):
-        # store the already run validations
-        schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            """
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            """
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
-        validated_path_to_schemas[path_to_item] = schema_classes
-
-    type_error = ApiTypeError(f"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}")
-    if isinstance(arg, str):
-        return str(arg)
-    elif isinstance(arg, (dict, frozendict.frozendict)):
-        return frozendict.frozendict({key: cast_to_allowed_types(val, from_server, validated_path_to_schemas, path_to_item + (key,)) for key, val in arg.items()})
-    elif isinstance(arg, (bool, BoolClass)):
-        """
-        this check must come before isinstance(arg, (int, float))
-        because isinstance(True, int) is True
-        """
-        if arg:
-            return BoolClass.TRUE
-        return BoolClass.FALSE
-    elif isinstance(arg, int):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, float):
-        decimal_from_float = decimal.Decimal(arg)
-        if decimal_from_float.as_integer_ratio()[1] == 1:
-            # 9.0 -> Decimal('9.0')
-            # 3.4028234663852886e+38 -> Decimal('340282346638528859811704183484516925440.0')
-            return decimal.Decimal(str(decimal_from_float)+'.0')
-        return decimal_from_float
-    elif isinstance(arg, (tuple, list)):
-        return tuple([cast_to_allowed_types(item, from_server, validated_path_to_schemas, path_to_item + (i,)) for i, item in enumerate(arg)])
-    elif isinstance(arg, (none_type, NoneClass)):
-        return NoneClass.NONE
-    elif isinstance(arg, (date, datetime)):
-        if not from_server:
-            return arg.isoformat()
-        raise type_error
-    elif isinstance(arg, uuid.UUID):
-        if not from_server:
-            return str(arg)
-        raise type_error
-    elif isinstance(arg, decimal.Decimal):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, bytes):
-        return bytes(arg)
-    elif isinstance(arg, (io.FileIO, io.BufferedReader)):
-        return FileIO(arg)
-    raise ValueError('Invalid type passed in got input={} type={}'.format(arg, type(arg)))
-
-
-class ComposedBase(Discriminable):
-
-    @classmethod
-    def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
-        path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of():
-            if validation_metadata.validation_ran_earlier(allof_cls):
-                continue
-            other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __get_oneof_class(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata,
-    ):
-        oneof_classes = []
-        path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of():
-            if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
-                oneof_classes.append(oneof_cls)
-                continue
-            if validation_metadata.validation_ran_earlier(oneof_cls):
-                oneof_classes.append(oneof_cls)
-                continue
-            try:
-                path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and oneof_cls is discriminated_cls:
-                    raise ex
-                continue
-            oneof_classes.append(oneof_cls)
-        if not oneof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the oneOf schemas matched the input data.".format(cls)
-            )
-        elif len(oneof_classes) > 1:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. Multiple "
-                "oneOf schemas {} matched the inputs, but a max of one is allowed.".format(cls, oneof_classes)
-            )
-        # exactly one class matches
-        return path_to_schemas
-
-    @classmethod
-    def __get_anyof_classes(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata
-    ):
-        anyof_classes = []
-        path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of():
-            if validation_metadata.validation_ran_earlier(anyof_cls):
-                anyof_classes.append(anyof_cls)
-                continue
-
-            try:
-                other_path_to_schemas = anyof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and anyof_cls is discriminated_cls:
-                    raise ex
-                continue
-            anyof_classes.append(anyof_cls)
-            update(path_to_schemas, other_path_to_schemas)
-        if not anyof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the anyOf schemas matched the input data.".format(cls)
-            )
-        return path_to_schemas
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        ComposedBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        # validation checking on types, validations, and enums
-        path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-
-        # process composed schema
-        discriminator = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
-            discriminator = cls.MetaOapg.discriminator()
-        discriminated_cls = None
-        if discriminator and arg and isinstance(arg, frozendict.frozendict):
-            disc_property_name = list(discriminator.keys())[0]
-            cls._ensure_discriminator_value_present_oapg(disc_property_name, updated_vm, arg)
-            # get discriminated_cls by looking at the dict in the current class
-            discriminated_cls = cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name])
-            if discriminated_cls is None:
-                raise ApiValueError(
-                    "Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}".format(
-                        arg[disc_property_name],
-                        cls.__name__,
-                        disc_property_name,
-                        list(discriminator[disc_property_name].keys()),
-                        updated_vm.path_to_item + (disc_property_name,)
-                    )
-                )
-
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'all_of'):
-            other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm)
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'one_of'):
-            other_path_to_schemas = cls.__get_oneof_class(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'any_of'):
-            other_path_to_schemas = cls.__get_anyof_classes(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        not_cls = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
-            not_cls = cls.MetaOapg.not_schema
-            not_cls = cls._get_class_oapg(not_cls)
-        if not_cls:
-            other_path_to_schemas = None
-            not_exception = ApiValueError(
-                "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
-                    arg,
-                    cls.__name__,
-                    not_cls.__name__,
-                )
-            )
-            if updated_vm.validation_ran_earlier(not_cls):
-                raise not_exception
-
-            try:
-                other_path_to_schemas = not_cls._validate_oapg(arg, validation_metadata=updated_vm)
-            except (ApiValueError, ApiTypeError):
-                pass
-            if other_path_to_schemas:
-                raise not_exception
-
-        if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
-            # TODO use an exception from this package here
-            assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
-        return path_to_schemas
-
-
-# DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
-class ComposedSchema(
-    ComposedBase,
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
-        if not args:
-            if not kwargs:
-                raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__))
-            args = (kwargs, )
-        return super().from_openapi_data_oapg(args[0], _configuration=_configuration)
-
-
-class ListSchema(
-    ListBase,
-    Schema,
-    TupleMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NoneSchema(
-    NoneBase,
-    Schema,
-    NoneMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NumberSchema(
-    NumberBase,
-    Schema,
-    DecimalMixin
-):
-    """
-    This is used for type: number with no format
-    Both integers AND floats are accepted
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class IntBase:
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            self._as_int = int(self)
-            return self._as_int
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-
-            denominator = arg.as_integer_ratio()[-1]
-            if denominator != 1:
-                raise ApiValueError(
-                    "Invalid value '{}' for type integer at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        IntBase _validate_oapg
-        TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class IntSchema(IntBase, NumberSchema):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class Int32Base:
-    __inclusive_minimum = decimal.Decimal(-2147483648)
-    __inclusive_maximum = decimal.Decimal(2147483647)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int32 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int32Schema(
-    Int32Base,
-    IntSchema
-):
-    pass
-
-
-class Int64Base:
-    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
-    __inclusive_maximum = decimal.Decimal(9223372036854775807)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int64 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int64Schema(
-    Int64Base,
-    IntSchema
-):
-    pass
-
-
-class Float32Base:
-    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type float at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Float32Schema(
-    Float32Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class Float64Base:
-    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type double at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-class Float64Schema(
-    Float64Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        # todo check format
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class StrSchema(
-    StrBase,
-    Schema,
-    StrMixin
-):
-    """
-    date + datetime string types must inherit from this class
-    That is because one can validate a str payload as both:
-    - type: string (format unset)
-    - type: string, format: date
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class UUIDSchema(UUIDBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateSchema(DateBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateTimeSchema(DateTimeBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DecimalSchema(DecimalBase, StrSchema):
-
-    def __new__(cls, arg: str, **kwargs: Configuration):
-        """
-        Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
-        which can be simple (str) or complex (dicts or lists with nested values)
-        Because casting is only done once and recursively casts all values prior to validation then for a potential
-        client side Decimal input if Decimal was accepted as an input in DecimalSchema then one would not know
-        if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
-        where it should stay as Decimal.
-        """
-        return super().__new__(cls, arg, **kwargs)
-
-
-class BytesSchema(
-    Schema,
-    BytesMixin
-):
-    """
-    this class will subclass bytes and is immutable
-    """
-    def __new__(cls, arg: bytes, **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class FileSchema(
-    Schema,
-    FileMixin
-):
-    """
-    This class is NOT immutable
-    Dynamic classes are built using it for example when AnyType allows in binary data
-    Al other schema classes ARE immutable
-    If one wanted to make this immutable one could make this a DictSchema with required properties:
-    - data = BytesSchema (which would be an immutable bytes based schema)
-    - file_name = StrSchema
-    and cast_to_allowed_types would convert bytes and file instances into dicts containing data + file_name
-    The downside would be that data would be stored in memory which one may not want to do for very large files
-
-    The developer is responsible for closing this file and deleting it
-
-    This class was kept as mutable:
-    - to allow file reading and writing to disk
-    - to be able to preserve file name info
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class BinaryBase:
-    pass
-
-
-class BinarySchema(
-    ComposedBase,
-    BinaryBase,
-    Schema,
-    BinaryMixin
-):
-    class MetaOapg:
-        @staticmethod
-        def one_of():
-            return [
-                BytesSchema,
-                FileSchema,
-            ]
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
-
-
-class BoolSchema(
-    BoolBase,
-    Schema,
-    BoolMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class AnyTypeSchema(
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
-):
-    # Python representation of a schema defined as true or {}
-    pass
-
-
-class UnsetAnyTypeSchema(AnyTypeSchema):
-    # Used when additionalProperties/items was not explicitly defined and a defining schema is needed
-    pass
-
-
-class NotAnyTypeSchema(
-    ComposedSchema,
-):
-    """
-    Python representation of a schema defined as false or {'not': {}}
-    Does not allow inputs in of AnyType
-    Note: validations on this class are never run because the code knows that no inputs will ever validate
-    """
-
-    class MetaOapg:
-        not_schema = AnyTypeSchema
-
-    def __new__(
-        cls,
-        *args,
-        _configuration: typing.Optional[Configuration] = None,
-    ) -> 'NotAnyTypeSchema':
-        return super().__new__(
-            cls,
-            *args,
-            _configuration=_configuration,
-        )
-
-
-class DictSchema(
-    DictBase,
-    Schema,
-    FrozenDictMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *args, **kwargs)
-
-
-schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
-
-
-@functools.lru_cache()
-def get_new_class(
-    class_name: str,
-    bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
-) -> typing.Type[Schema]:
-    """
-    Returns a new class that is made with the subclass bases
-    """
-    new_cls: typing.Type[Schema] = type(class_name, bases, {})
-    return new_cls
-
-
-LOG_CACHE_USAGE = False
-
-
-def log_cache_usage(cache_fn):
-    if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/__init__.py
index 7f19a3f9..2ee03a01 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/__init__.py
@@ -5,25 +5,34 @@
 """
     Workflows API
 
-    Workflows API  # noqa: E501
+    Workflows API
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 __version__ = "1.0.0"
 
+# import apis into sdk package
+from cloudharness_cli.workflows.api.create_and_access_api import CreateAndAccessApi
+
 # import ApiClient
+from cloudharness_cli.workflows.api_response import ApiResponse
 from cloudharness_cli.workflows.api_client import ApiClient
-
-# import Configuration
 from cloudharness_cli.workflows.configuration import Configuration
-
-# import exceptions
 from cloudharness_cli.workflows.exceptions import OpenApiException
-from cloudharness_cli.workflows.exceptions import ApiAttributeError
 from cloudharness_cli.workflows.exceptions import ApiTypeError
 from cloudharness_cli.workflows.exceptions import ApiValueError
 from cloudharness_cli.workflows.exceptions import ApiKeyError
+from cloudharness_cli.workflows.exceptions import ApiAttributeError
 from cloudharness_cli.workflows.exceptions import ApiException
+
+# import models into sdk package
+from cloudharness_cli.workflows.models.operation import Operation
+from cloudharness_cli.workflows.models.operation_search_result import OperationSearchResult
+from cloudharness_cli.workflows.models.operation_status import OperationStatus
+from cloudharness_cli.workflows.models.search_result_data import SearchResultData
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/__init__.py
new file mode 100644
index 00000000..3f8eef11
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/__init__.py
@@ -0,0 +1,5 @@
+# flake8: noqa
+
+# import apis into api package
+from cloudharness_cli.workflows.api.create_and_access_api import CreateAndAccessApi
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/create_and_access_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/create_and_access_api.py
new file mode 100644
index 00000000..c7fa472f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api/create_and_access_api.py
@@ -0,0 +1,1120 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import Field, StrictStr, field_validator
+from typing import Optional
+from typing_extensions import Annotated
+from cloudharness_cli.workflows.models.operation_search_result import OperationSearchResult
+from cloudharness_cli.workflows.models.operation_status import OperationStatus
+
+from cloudharness_cli.workflows.api_client import ApiClient, RequestSerialized
+from cloudharness_cli.workflows.api_response import ApiResponse
+from cloudharness_cli.workflows.rest import RESTResponseType
+
+
+class CreateAndAccessApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def delete_operation(
+        self,
+        name: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> None:
+        """deletes operation by name
+
+        delete operation by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._delete_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def delete_operation_with_http_info(
+        self,
+        name: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[None]:
+        """deletes operation by name
+
+        delete operation by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._delete_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def delete_operation_without_preload_content(
+        self,
+        name: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """deletes operation by name
+
+        delete operation by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._delete_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _delete_operation_serialize(
+        self,
+        name,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if name is not None:
+            _path_params['name'] = name
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='DELETE',
+            resource_path='/operations/{name}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def get_operation(
+        self,
+        name: Annotated[str, Field(strict=True)],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> str:
+        """get operation by name
+
+        retrieves an operation by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def get_operation_with_http_info(
+        self,
+        name: Annotated[str, Field(strict=True)],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[str]:
+        """get operation by name
+
+        retrieves an operation by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def get_operation_without_preload_content(
+        self,
+        name: Annotated[str, Field(strict=True)],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """get operation by name
+
+        retrieves an operation by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._get_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _get_operation_serialize(
+        self,
+        name,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if name is not None:
+            _path_params['name'] = name
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/operations/{name}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def list_operations(
+        self,
+        status: Annotated[Optional[OperationStatus], Field(description="filter by status")] = None,
+        previous_search_token: Annotated[Optional[StrictStr], Field(description="continue previous search (pagination chunks)")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=50, strict=True, ge=1)]], Field(description="maximum number of records to return per page")] = None,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> OperationSearchResult:
+        """lists operations
+
+        see all operations for the user 
+
+        :param status: filter by status
+        :type status: OperationStatus
+        :param previous_search_token: continue previous search (pagination chunks)
+        :type previous_search_token: str
+        :param limit: maximum number of records to return per page
+        :type limit: int
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._list_operations_serialize(
+            status=status,
+            previous_search_token=previous_search_token,
+            limit=limit,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "OperationSearchResult",
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def list_operations_with_http_info(
+        self,
+        status: Annotated[Optional[OperationStatus], Field(description="filter by status")] = None,
+        previous_search_token: Annotated[Optional[StrictStr], Field(description="continue previous search (pagination chunks)")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=50, strict=True, ge=1)]], Field(description="maximum number of records to return per page")] = None,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[OperationSearchResult]:
+        """lists operations
+
+        see all operations for the user 
+
+        :param status: filter by status
+        :type status: OperationStatus
+        :param previous_search_token: continue previous search (pagination chunks)
+        :type previous_search_token: str
+        :param limit: maximum number of records to return per page
+        :type limit: int
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._list_operations_serialize(
+            status=status,
+            previous_search_token=previous_search_token,
+            limit=limit,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "OperationSearchResult",
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def list_operations_without_preload_content(
+        self,
+        status: Annotated[Optional[OperationStatus], Field(description="filter by status")] = None,
+        previous_search_token: Annotated[Optional[StrictStr], Field(description="continue previous search (pagination chunks)")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=50, strict=True, ge=1)]], Field(description="maximum number of records to return per page")] = None,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """lists operations
+
+        see all operations for the user 
+
+        :param status: filter by status
+        :type status: OperationStatus
+        :param previous_search_token: continue previous search (pagination chunks)
+        :type previous_search_token: str
+        :param limit: maximum number of records to return per page
+        :type limit: int
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._list_operations_serialize(
+            status=status,
+            previous_search_token=previous_search_token,
+            limit=limit,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "OperationSearchResult",
+            '400': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _list_operations_serialize(
+        self,
+        status,
+        previous_search_token,
+        limit,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        if status is not None:
+            
+            _query_params.append(('status', status.value))
+            
+        if previous_search_token is not None:
+            
+            _query_params.append(('previous_search_token', previous_search_token))
+            
+        if limit is not None:
+            
+            _query_params.append(('limit', limit))
+            
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/operations',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
+    @validate_call
+    def log_operation(
+        self,
+        name: Annotated[str, Field(strict=True)],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> str:
+        """get operation by name
+
+        retrieves an operation log by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._log_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def log_operation_with_http_info(
+        self,
+        name: Annotated[str, Field(strict=True)],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[str]:
+        """get operation by name
+
+        retrieves an operation log by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._log_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def log_operation_without_preload_content(
+        self,
+        name: Annotated[str, Field(strict=True)],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """get operation by name
+
+        retrieves an operation log by its name 
+
+        :param name: (required)
+        :type name: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._log_operation_serialize(
+            name=name,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "str",
+            '400': None,
+            '404': None,
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _log_operation_serialize(
+        self,
+        name,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if name is not None:
+            _path_params['name'] = name
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'text/plain'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+        ]
+
+        return self.api_client.param_serialize(
+            method='GET',
+            resource_path='/operations/{name}/logs',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_client.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_client.py
index d06655e2..7c3ba6fd 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_client.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_client.py
@@ -1,1500 +1,782 @@
 # coding: utf-8
+
 """
     Workflows API
 
-    Workflows API  # noqa: E501
+    Workflows API
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
-from dataclasses import dataclass
-from decimal import Decimal
-import enum
-import email
+
+import datetime
+from dateutil.parser import parse
+from enum import Enum
 import json
+import mimetypes
 import os
-import io
-import atexit
-from multiprocessing.pool import ThreadPool
 import re
 import tempfile
-import typing
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-from urllib.parse import urlparse, quote
-from urllib3.fields import RequestField as RequestFieldBase
 
-import frozendict
+from urllib.parse import quote
+from typing import Tuple, Optional, List, Dict, Union
+from pydantic import SecretStr
 
-from cloudharness_cli.workflows import rest
 from cloudharness_cli.workflows.configuration import Configuration
-from cloudharness_cli.workflows.exceptions import ApiTypeError, ApiValueError
-from cloudharness_cli.workflows.schemas import (
-    NoneClass,
-    BoolClass,
-    Schema,
-    FileIO,
-    BinarySchema,
-    date,
-    datetime,
-    none_type,
-    Unset,
-    unset,
+from cloudharness_cli.workflows.api_response import ApiResponse, T as ApiResponseT
+import cloudharness_cli.workflows.models
+from cloudharness_cli.workflows import rest
+from cloudharness_cli.workflows.exceptions import (
+    ApiValueError,
+    ApiException,
+    BadRequestException,
+    UnauthorizedException,
+    ForbiddenException,
+    NotFoundException,
+    ServiceException
 )
 
+RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]
 
-class RequestField(RequestFieldBase):
-    def __eq__(self, other):
-        if not isinstance(other, RequestField):
-            return False
-        return self.__dict__ == other.__dict__
-
-
-class JSONEncoder(json.JSONEncoder):
-    compact_separators = (',', ':')
-
-    def default(self, obj):
-        if isinstance(obj, str):
-            return str(obj)
-        elif isinstance(obj, float):
-            return float(obj)
-        elif isinstance(obj, int):
-            return int(obj)
-        elif isinstance(obj, Decimal):
-            if obj.as_tuple().exponent >= 0:
-                return int(obj)
-            return float(obj)
-        elif isinstance(obj, NoneClass):
-            return None
-        elif isinstance(obj, BoolClass):
-            return bool(obj)
-        elif isinstance(obj, (dict, frozendict.frozendict)):
-            return {key: self.default(val) for key, val in obj.items()}
-        elif isinstance(obj, (list, tuple)):
-            return [self.default(item) for item in obj]
-        raise ApiValueError('Unable to prepare type {} for serialization'.format(obj.__class__.__name__))
-
-
-class ParameterInType(enum.Enum):
-    QUERY = 'query'
-    HEADER = 'header'
-    PATH = 'path'
-    COOKIE = 'cookie'
-
-
-class ParameterStyle(enum.Enum):
-    MATRIX = 'matrix'
-    LABEL = 'label'
-    FORM = 'form'
-    SIMPLE = 'simple'
-    SPACE_DELIMITED = 'spaceDelimited'
-    PIPE_DELIMITED = 'pipeDelimited'
-    DEEP_OBJECT = 'deepObject'
-
-
-class PrefixSeparatorIterator:
-    # A class to store prefixes and separators for rfc6570 expansions
-
-    def __init__(self, prefix: str, separator: str):
-        self.prefix = prefix
-        self.separator = separator
-        self.first = True
-        if separator in {'.', '|', '%20'}:
-            item_separator = separator
-        else:
-            item_separator = ','
-        self.item_separator = item_separator
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.first:
-            self.first = False
-            return self.prefix
-        return self.separator
-
-
-class ParameterSerializerBase:
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        return False
-
-    @staticmethod
-    def __ref6570_item_value(in_data: typing.Any, percent_encode: bool):
-        """
-        Get representation if str/float/int/None/items in list/ values in dict
-        None is returned if an item is undefined, use cases are value=
-        - None
-        - []
-        - {}
-        - [None, None None]
-        - {'a': None, 'b': None}
-        """
-        if type(in_data) in {str, float, int}:
-            if percent_encode:
-                return quote(str(in_data))
-            return str(in_data)
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, list) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        elif isinstance(in_data, dict) and not in_data:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return None
-        raise ApiValueError('Unable to generate a ref6570 item representation of {}'.format(in_data))
+class ApiClient:
+    """Generic API client for OpenAPI client library builds.
 
-    @staticmethod
-    def _to_dict(name: str, value: str):
-        return {name: value}
+    OpenAPI generic API client. This client handles the client-
+    server communication, and is invariant across implementations. Specifics of
+    the methods and models for each application are generated from the OpenAPI
+    templates.
 
-    @classmethod
-    def __ref6570_str_float_int_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_value = cls.__ref6570_item_value(in_data, percent_encode)
-        if item_value is None or (item_value == '' and prefix_separator_iterator.separator == ';'):
-            return next(prefix_separator_iterator) + var_name_piece
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        return next(prefix_separator_iterator) + var_name_piece + value_pair_equals + item_value
+    :param configuration: .Configuration object for this client
+    :param header_name: a header to pass when making calls to the API.
+    :param header_value: a header value to pass when making calls to
+        the API.
+    :param cookie: a cookie to include in the header when making calls
+        to the API
+    """
 
-    @classmethod
-    def __ref6570_list_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        item_values = [cls.__ref6570_item_value(v, percent_encode) for v in in_data]
-        item_values = [v for v in item_values if v is not None]
-        if not item_values:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece +
-                value_pair_equals +
-                prefix_separator_iterator.item_separator.join(item_values)
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [var_name_piece + value_pair_equals + val for val in item_values]
-        )
+    PRIMITIVE_TYPES = (float, bool, bytes, str, int)
+    NATIVE_TYPES_MAPPING = {
+        'int': int,
+        'long': int, # TODO remove as only py3 is supported?
+        'float': float,
+        'str': str,
+        'bool': bool,
+        'date': datetime.date,
+        'datetime': datetime.datetime,
+        'object': object,
+    }
+    _pool = None
 
-    @classmethod
-    def __ref6570_dict_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator,
-        var_name_piece: str,
-        named_parameter_expansion: bool
-    ) -> str:
-        in_data_transformed = {key: cls.__ref6570_item_value(val, percent_encode) for key, val in in_data.items()}
-        in_data_transformed = {key: val for key, val in in_data_transformed.items() if val is not None}
-        if not in_data_transformed:
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        value_pair_equals = '=' if named_parameter_expansion else ''
-        if not explode:
-            return (
-                next(prefix_separator_iterator) +
-                var_name_piece + value_pair_equals +
-                prefix_separator_iterator.item_separator.join(
-                    prefix_separator_iterator.item_separator.join(
-                        item_pair
-                    ) for item_pair in in_data_transformed.items()
-                )
-            )
-        # exploded
-        return next(prefix_separator_iterator) + next(prefix_separator_iterator).join(
-            [key + '=' + val for key, val in in_data_transformed.items()]
-        )
+    def __init__(
+        self,
+        configuration=None,
+        header_name=None,
+        header_value=None,
+        cookie=None
+    ) -> None:
+        # use default configuration if none is provided
+        if configuration is None:
+            configuration = Configuration.get_default()
+        self.configuration = configuration
 
-    @classmethod
-    def _ref6570_expansion(
-        cls,
-        variable_name: str,
-        in_data: typing.Any,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: PrefixSeparatorIterator
-    ) -> str:
-        """
-        Separator is for separate variables like dict with explode true, not for array item separation
-        """
-        named_parameter_expansion = prefix_separator_iterator.separator in {'&', ';'}
-        var_name_piece = variable_name if named_parameter_expansion else ''
-        if type(in_data) in {str, float, int}:
-            return cls.__ref6570_str_float_int_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, none_type):
-            # ignored by the expansion process https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.1
-            return ""
-        elif isinstance(in_data, list):
-            return cls.__ref6570_list_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        elif isinstance(in_data, dict):
-            return cls.__ref6570_dict_expansion(
-                variable_name,
-                in_data,
-                explode,
-                percent_encode,
-                prefix_separator_iterator,
-                var_name_piece,
-                named_parameter_expansion
-            )
-        # bool, bytes, etc
-        raise ApiValueError('Unable to generate a ref6570 representation of {}'.format(in_data))
+        self.rest_client = rest.RESTClientObject(configuration)
+        self.default_headers = {}
+        if header_name is not None:
+            self.default_headers[header_name] = header_value
+        self.cookie = cookie
+        # Set default User-Agent.
+        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+        self.client_side_validation = configuration.client_side_validation
 
+    def __enter__(self):
+        return self
 
-class StyleFormSerializer(ParameterSerializerBase):
-    @classmethod
-    def _get_default_explode(cls, style: ParameterStyle) -> bool:
-        if style is ParameterStyle.FORM:
-            return True
-        return super()._get_default_explode(style)
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass
 
-    def _serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool,
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> str:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = PrefixSeparatorIterator('', '&')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
+    @property
+    def user_agent(self):
+        """User agent for this API client"""
+        return self.default_headers['User-Agent']
 
+    @user_agent.setter
+    def user_agent(self, value):
+        self.default_headers['User-Agent'] = value
 
-class StyleSimpleSerializer(ParameterSerializerBase):
+    def set_default_header(self, header_name, header_value):
+        self.default_headers[header_name] = header_value
 
-    def _serialize_simple(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        name: str,
-        explode: bool,
-        percent_encode: bool
-    ) -> str:
-        prefix_separator_iterator = PrefixSeparatorIterator('', ',')
-        return self._ref6570_expansion(
-            variable_name=name,
-            in_data=in_data,
-            explode=explode,
-            percent_encode=percent_encode,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
 
-
-class JSONDetector:
-    """
-    Works for:
-    application/json
-    application/json; charset=UTF-8
-    application/json-patch+json
-    application/geo+json
-    """
-    __json_content_type_pattern = re.compile("application/[^+]*[+]?(json);?.*")
-
-    @classmethod
-    def _content_type_is_json(cls, content_type: str) -> bool:
-        if cls.__json_content_type_pattern.match(content_type):
-            return True
-        return False
-
-
-@dataclass
-class ParameterBase(JSONDetector):
-    name: str
-    in_type: ParameterInType
-    required: bool
-    style: typing.Optional[ParameterStyle]
-    explode: typing.Optional[bool]
-    allow_reserved: typing.Optional[bool]
-    schema: typing.Optional[typing.Type[Schema]]
-    content: typing.Optional[typing.Dict[str, typing.Type[Schema]]]
-
-    __style_to_in_type = {
-        ParameterStyle.MATRIX: {ParameterInType.PATH},
-        ParameterStyle.LABEL: {ParameterInType.PATH},
-        ParameterStyle.FORM: {ParameterInType.QUERY, ParameterInType.COOKIE},
-        ParameterStyle.SIMPLE: {ParameterInType.PATH, ParameterInType.HEADER},
-        ParameterStyle.SPACE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.PIPE_DELIMITED: {ParameterInType.QUERY},
-        ParameterStyle.DEEP_OBJECT: {ParameterInType.QUERY},
-    }
-    __in_type_to_default_style = {
-        ParameterInType.QUERY: ParameterStyle.FORM,
-        ParameterInType.PATH: ParameterStyle.SIMPLE,
-        ParameterInType.HEADER: ParameterStyle.SIMPLE,
-        ParameterInType.COOKIE: ParameterStyle.FORM,
-    }
-    __disallowed_header_names = {'Accept', 'Content-Type', 'Authorization'}
-    _json_encoder = JSONEncoder()
+    _default = None
 
     @classmethod
-    def __verify_style_to_in_type(cls, style: typing.Optional[ParameterStyle], in_type: ParameterInType):
-        if style is None:
-            return
-        in_type_set = cls.__style_to_in_type[style]
-        if in_type not in in_type_set:
-            raise ValueError(
-                'Invalid style and in_type combination. For style={} only in_type={} are allowed'.format(
-                    style, in_type_set
-                )
-            )
-
-    def __init__(
-        self,
-        name: str,
-        in_type: ParameterInType,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        if schema is None and content is None:
-            raise ValueError('Value missing; Pass in either schema or content')
-        if schema and content:
-            raise ValueError('Too many values provided. Both schema and content were provided. Only one may be input')
-        if name in self.__disallowed_header_names and in_type is ParameterInType.HEADER:
-            raise ValueError('Invalid name, name may not be one of {}'.format(self.__disallowed_header_names))
-        self.__verify_style_to_in_type(style, in_type)
-        if content is None and style is None:
-            style = self.__in_type_to_default_style[in_type]
-        if content is not None and in_type in self.__in_type_to_default_style and len(content) != 1:
-            raise ValueError('Invalid content length, content length must equal 1')
-        self.in_type = in_type
-        self.name = name
-        self.required = required
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-        self.schema = schema
-        self.content = content
-
-    def _serialize_json(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        eliminate_whitespace: bool = False
-    ) -> str:
-        if eliminate_whitespace:
-            return json.dumps(in_data, separators=self._json_encoder.compact_separators)
-        return json.dumps(in_data)
+    def get_default(cls):
+        """Return new instance of ApiClient.
 
+        This method returns newly created, based on default constructor,
+        object of ApiClient class or returns a copy of default
+        ApiClient.
 
-class PathParameter(ParameterBase, StyleSimpleSerializer):
+        :return: The ApiClient object.
+        """
+        if cls._default is None:
+            cls._default = ApiClient()
+        return cls._default
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.PATH,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+    @classmethod
+    def set_default(cls, default):
+        """Set default instance of ApiClient.
 
-    def __serialize_label(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator('.', '.')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        It stores default ApiClient.
 
-    def __serialize_matrix(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list]
-    ) -> typing.Dict[str, str]:
-        prefix_separator_iterator = PrefixSeparatorIterator(';', ';')
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        :param default: object of ApiClient.
+        """
+        cls._default = default
 
-    def __serialize_simple(
+    def param_serialize(
         self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-    ) -> typing.Dict[str, str]:
-        value = self._serialize_simple(
-            in_data=in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True
-        )
-        return self._to_dict(self.name, value)
+        method,
+        resource_path,
+        path_params=None,
+        query_params=None,
+        header_params=None,
+        body=None,
+        post_params=None,
+        files=None, auth_settings=None,
+        collection_formats=None,
+        _host=None,
+        _request_auth=None
+    ) -> RequestSerialized:
+
+        """Builds the HTTP request params needed by the request.
+        :param method: Method to call.
+        :param resource_path: Path to method endpoint.
+        :param path_params: Path parameters in the url.
+        :param query_params: Query parameters in the url.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param auth_settings list: Auth Settings names for the request.
+        :param files dict: key -> filename, value -> filepath,
+            for `multipart/form-data`.
+        :param collection_formats: dict of collection formats for path, query,
+            header, and post parameters.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :return: tuple of form (path, http_method, query_params, header_params,
+            body, post_params, files)
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> path
-                path:
-                    returns path_params: dict
-            label -> path
-                returns path_params
-            matrix -> path
-                returns path_params
-            """
-            if self.style:
-                if self.style is ParameterStyle.SIMPLE:
-                    return self.__serialize_simple(cast_in_data)
-                elif self.style is ParameterStyle.LABEL:
-                    return self.__serialize_label(cast_in_data)
-                elif self.style is ParameterStyle.MATRIX:
-                    return self.__serialize_matrix(cast_in_data)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class QueryParameter(ParameterBase, StyleFormSerializer):
+        config = self.configuration
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.QUERY,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
+        # header parameters
+        header_params = header_params or {}
+        header_params.update(self.default_headers)
+        if self.cookie:
+            header_params['Cookie'] = self.cookie
+        if header_params:
+            header_params = self.sanitize_for_serialization(header_params)
+            header_params = dict(
+                self.parameters_to_tuples(header_params,collection_formats)
+            )
 
-    def __serialize_space_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # path parameters
+        if path_params:
+            path_params = self.sanitize_for_serialization(path_params)
+            path_params = self.parameters_to_tuples(
+                path_params,
+                collection_formats
+            )
+            for k, v in path_params:
+                # specified safe chars, encode everything
+                resource_path = resource_path.replace(
+                    '{%s}' % k,
+                    quote(str(v), safe=config.safe_chars_for_path_param)
+                )
 
-    def __serialize_pipe_delimited(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._ref6570_expansion(
-            variable_name=self.name,
-            in_data=in_data,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
-        )
-        return self._to_dict(self.name, value)
+        # post parameters
+        if post_params or files:
+            post_params = post_params if post_params else []
+            post_params = self.sanitize_for_serialization(post_params)
+            post_params = self.parameters_to_tuples(
+                post_params,
+                collection_formats
+            )
+            if files:
+                post_params.extend(self.files_parameters(files))
 
-    def __serialize_form(
-        self,
-        in_data: typing.Union[None, int, float, str, bool, dict, list],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator]
-    ) -> typing.Dict[str, str]:
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        value = self._serialize_form(
-            in_data,
-            name=self.name,
-            explode=self.explode,
-            percent_encode=True,
-            prefix_separator_iterator=prefix_separator_iterator
+        # auth setting
+        self.update_params_for_auth(
+            header_params,
+            query_params,
+            auth_settings,
+            resource_path,
+            method,
+            body,
+            request_auth=_request_auth
         )
-        return self._to_dict(self.name, value)
 
-    def get_prefix_separator_iterator(self) -> typing.Optional[PrefixSeparatorIterator]:
-        if self.style is ParameterStyle.FORM:
-            return PrefixSeparatorIterator('?', '&')
-        elif self.style is ParameterStyle.SPACE_DELIMITED:
-            return PrefixSeparatorIterator('', '%20')
-        elif self.style is ParameterStyle.PIPE_DELIMITED:
-            return PrefixSeparatorIterator('', '|')
-
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
-        prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> query
-                query:
-                    - GET/HEAD/DELETE: could use fields
-                    - PUT/POST: must use urlencode to send parameters
-                    returns fields: tuple
-            spaceDelimited -> query
-                returns fields
-            pipeDelimited -> query
-                returns fields
-            deepObject -> query, https://github.com/OAI/OpenAPI-Specification/issues/1706
-                returns fields
-            """
-            if self.style:
-                # TODO update query ones to omit setting values when [] {} or None is input
-                if self.style is ParameterStyle.FORM:
-                    return self.__serialize_form(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.SPACE_DELIMITED:
-                    return self.__serialize_space_delimited(cast_in_data, prefix_separator_iterator)
-                elif self.style is ParameterStyle.PIPE_DELIMITED:
-                    return self.__serialize_pipe_delimited(cast_in_data, prefix_separator_iterator)
-        # self.content will be length one
-        if prefix_separator_iterator is None:
-            prefix_separator_iterator = self.get_prefix_separator_iterator()
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data, eliminate_whitespace=True)
-                return self._to_dict(
-                    self.name,
-                    next(prefix_separator_iterator) + self.name + '=' + quote(value)
-                )
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
+        # body
+        if body:
+            body = self.sanitize_for_serialization(body)
 
+        # request url
+        if _host is None or self.configuration.ignore_operation_servers:
+            url = self.configuration.host + resource_path
+        else:
+            # use server/host defined in path or operation instead
+            url = _host + resource_path
+
+        # query parameters
+        if query_params:
+            query_params = self.sanitize_for_serialization(query_params)
+            url_query = self.parameters_to_url_query(
+                query_params,
+                collection_formats
+            )
+            url += "?" + url_query
 
-class CookieParameter(ParameterBase, StyleFormSerializer):
+        return method, url, header_params, body, post_params
 
-    def __init__(
-        self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: typing.Optional[bool] = None,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        used_style = ParameterStyle.FORM if style is None and content is None and schema else style
-        used_explode = self._get_default_explode(used_style) if explode is None else explode
-
-        super().__init__(
-            name,
-            in_type=ParameterInType.COOKIE,
-            required=required,
-            style=used_style,
-            explode=used_explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> typing.Dict[str, str]:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            form -> cookie
-                returns fields: tuple
-            """
-            if self.style:
-                """
-                TODO add escaping of comma, space, equals
-                or turn encoding on
-                """
-                value = self._serialize_form(
-                    cast_in_data,
-                    explode=self.explode,
-                    name=self.name,
-                    percent_encode=False,
-                    prefix_separator_iterator=PrefixSeparatorIterator('', '&')
-                )
-                return self._to_dict(self.name, value)
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self._to_dict(self.name, value)
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class HeaderParameter(ParameterBase, StyleSimpleSerializer):
-    def __init__(
+    def call_api(
         self,
-        name: str,
-        required: bool = False,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: typing.Optional[bool] = None,
-        schema: typing.Optional[typing.Type[Schema]] = None,
-        content: typing.Optional[typing.Dict[str, typing.Type[Schema]]] = None
-    ):
-        super().__init__(
-            name,
-            in_type=ParameterInType.HEADER,
-            required=required,
-            style=style,
-            explode=explode,
-            allow_reserved=allow_reserved,
-            schema=schema,
-            content=content
-        )
-
-    @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
-        data = tuple(t for t in in_data if t)
-        headers = HTTPHeaderDict()
-        if not data:
-            return headers
-        headers.extend(data)
-        return headers
+        method,
+        url,
+        header_params=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ) -> rest.RESTResponse:
+        """Makes the HTTP request (synchronous)
+        :param method: Method to call.
+        :param url: Path to method endpoint.
+        :param header_params: Header parameters to be
+            placed in the request header.
+        :param body: Request body.
+        :param post_params dict: Request post form parameters,
+            for `application/x-www-form-urlencoded`, `multipart/form-data`.
+        :param _request_timeout: timeout setting for this request.
+        :return: RESTResponse
+        """
 
-    def serialize(
-        self,
-        in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict:
-        if self.schema:
-            cast_in_data = self.schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            """
-            simple -> header
-                headers: PoolManager needs a mapping, tuple is close
-                    returns headers: dict
-            """
-            if self.style:
-                value = self._serialize_simple(cast_in_data, self.name, self.explode, False)
-                return self.__to_headers(((self.name, value),))
-        # self.content will be length one
-        for content_type, schema in self.content.items():
-            cast_in_data = schema(in_data)
-            cast_in_data = self._json_encoder.default(cast_in_data)
-            if self._content_type_is_json(content_type):
-                value = self._serialize_json(cast_in_data)
-                return self.__to_headers(((self.name, value),))
-            raise NotImplementedError('Serialization of {} has not yet been implemented'.format(content_type))
-
-
-class Encoding:
-    def __init__(
-        self,
-        content_type: str,
-        headers: typing.Optional[typing.Dict[str, HeaderParameter]] = None,
-        style: typing.Optional[ParameterStyle] = None,
-        explode: bool = False,
-        allow_reserved: bool = False,
-    ):
-        self.content_type = content_type
-        self.headers = headers
-        self.style = style
-        self.explode = explode
-        self.allow_reserved = allow_reserved
-
-
-@dataclass
-class MediaType:
-    """
-    Used to store request and response body schema information
-    encoding:
-        A map between a property name and its encoding information.
-        The key, being the property name, MUST exist in the schema as a property.
-        The encoding object SHALL only apply to requestBody objects when the media type is
-        multipart or application/x-www-form-urlencoded.
-    """
-    schema: typing.Optional[typing.Type[Schema]] = None
-    encoding: typing.Optional[typing.Dict[str, Encoding]] = None
+        try:
+            # perform request and return response
+            response_data = self.rest_client.request(
+                method, url,
+                headers=header_params,
+                body=body, post_params=post_params,
+                _request_timeout=_request_timeout
+            )
 
+        except ApiException as e:
+            raise e
 
-@dataclass
-class ApiResponse:
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, Schema]
-    headers: typing.Union[Unset, typing.List[HeaderParameter]]
+        return response_data
 
-    def __init__(
+    def response_deserialize(
         self,
-        response: urllib3.HTTPResponse,
-        body: typing.Union[Unset, typing.Type[Schema]],
-        headers: typing.Union[Unset, typing.List[HeaderParameter]]
-    ):
-        """
-        pycharm needs this to prevent 'Unexpected argument' warnings
+        response_data: rest.RESTResponse,
+        response_types_map: Optional[Dict[str, ApiResponseT]]=None
+    ) -> ApiResponse[ApiResponseT]:
+        """Deserializes response into an object.
+        :param response_data: RESTResponse object to be deserialized.
+        :param response_types_map: dict of response types.
+        :return: ApiResponse
         """
-        self.response = response
-        self.body = body
-        self.headers = headers
 
+        msg = "RESTResponse.read() must be called before passing it to response_deserialize()"
+        assert response_data.data is not None, msg
 
-@dataclass
-class ApiResponseWithoutDeserialization(ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]] = unset
-    headers: typing.Union[Unset, typing.List[HeaderParameter]] = unset
+        response_type = response_types_map.get(str(response_data.status), None)
+        if not response_type and isinstance(response_data.status, int) and 100 <= response_data.status <= 599:
+            # if not found, look for '1XX', '2XX', etc.
+            response_type = response_types_map.get(str(response_data.status)[0] + "XX", None)
 
+        # deserialize response data
+        response_text = None
+        return_data = None
+        try:
+            if response_type == "bytearray":
+                return_data = response_data.data
+            elif response_type == "file":
+                return_data = self.__deserialize_file(response_data)
+            elif response_type is not None:
+                match = None
+                content_type = response_data.getheader('content-type')
+                if content_type is not None:
+                    match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
+                encoding = match.group(1) if match else "utf-8"
+                response_text = response_data.data.decode(encoding)
+                return_data = self.deserialize(response_text, response_type, content_type)
+        finally:
+            if not 200 <= response_data.status <= 299:
+                raise ApiException.from_response(
+                    http_resp=response_data,
+                    body=response_text,
+                    data=return_data,
+                )
 
-class OpenApiResponse(JSONDetector):
-    __filename_content_disposition_pattern = re.compile('filename="(.+?)"')
+        return ApiResponse(
+            status_code = response_data.status,
+            data = return_data,
+            headers = response_data.getheaders(),
+            raw_data = response_data.data
+        )
 
-    def __init__(
-        self,
-        response_cls: typing.Type[ApiResponse] = ApiResponse,
-        content: typing.Optional[typing.Dict[str, MediaType]] = None,
-        headers: typing.Optional[typing.List[HeaderParameter]] = None,
-    ):
-        self.headers = headers
-        if content is not None and len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-        self.response_cls = response_cls
-
-    @staticmethod
-    def __deserialize_json(response: urllib3.HTTPResponse) -> typing.Any:
-        # python must be >= 3.9 so we can pass in bytes into json.loads
-        return json.loads(response.data)
-
-    @staticmethod
-    def __file_name_from_response_url(response_url: typing.Optional[str]) -> typing.Optional[str]:
-        if response_url is None:
-            return None
-        url_path = urlparse(response_url).path
-        if url_path:
-            path_basename = os.path.basename(url_path)
-            if path_basename:
-                _filename, ext = os.path.splitext(path_basename)
-                if ext:
-                    return path_basename
-        return None
+    def sanitize_for_serialization(self, obj):
+        """Builds a JSON POST object.
 
-    @classmethod
-    def __file_name_from_content_disposition(cls, content_disposition: typing.Optional[str]) -> typing.Optional[str]:
-        if content_disposition is None:
-            return None
-        match = cls.__filename_content_disposition_pattern.search(content_disposition)
-        if not match:
-            return None
-        return match.group(1)
+        If obj is None, return None.
+        If obj is SecretStr, return obj.get_secret_value()
+        If obj is str, int, long, float, bool, return directly.
+        If obj is datetime.datetime, datetime.date
+            convert to string in iso8601 format.
+        If obj is list, sanitize each element in the list.
+        If obj is dict, return the dict.
+        If obj is OpenAPI model, return the properties dict.
 
-    def __deserialize_application_octet_stream(
-        self, response: urllib3.HTTPResponse
-    ) -> typing.Union[bytes, io.BufferedReader]:
-        """
-        urllib3 use cases:
-        1. when preload_content=True (stream=False) then supports_chunked_reads is False and bytes are returned
-        2. when preload_content=False (stream=True) then supports_chunked_reads is True and
-            a file will be written and returned
+        :param obj: The data to serialize.
+        :return: The serialized form of data.
         """
-        if response.supports_chunked_reads():
-            file_name = (
-                self.__file_name_from_content_disposition(response.headers.get('content-disposition'))
-                or self.__file_name_from_response_url(response.geturl())
+        if obj is None:
+            return None
+        elif isinstance(obj, Enum):
+            return obj.value
+        elif isinstance(obj, SecretStr):
+            return obj.get_secret_value()
+        elif isinstance(obj, self.PRIMITIVE_TYPES):
+            return obj
+        elif isinstance(obj, list):
+            return [
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
+            ]
+        elif isinstance(obj, tuple):
+            return tuple(
+                self.sanitize_for_serialization(sub_obj) for sub_obj in obj
             )
+        elif isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
 
-            if file_name is None:
-                _fd, path = tempfile.mkstemp()
-            else:
-                path = os.path.join(tempfile.gettempdir(), file_name)
-
-            with open(path, 'wb') as new_file:
-                chunk_size = 1024
-                while True:
-                    data = response.read(chunk_size)
-                    if not data:
-                        break
-                    new_file.write(data)
-            # release_conn is needed for streaming connections only
-            response.release_conn()
-            new_file = open(path, 'rb')
-            return new_file
+        elif isinstance(obj, dict):
+            obj_dict = obj
         else:
-            return response.data
+            # Convert model obj to dict except
+            # attributes `openapi_types`, `attribute_map`
+            # and attributes which value is not None.
+            # Convert attribute name to json key in
+            # model definition for request.
+            if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
+                obj_dict = obj.to_dict()
+            else:
+                obj_dict = obj.__dict__
 
-    @staticmethod
-    def __deserialize_multipart_form_data(
-        response: urllib3.HTTPResponse
-    ) -> typing.Dict[str, typing.Any]:
-        msg = email.message_from_bytes(response.data)
         return {
-            part.get_param("name", header="Content-Disposition"): part.get_payload(
-                decode=True
-            ).decode(part.get_content_charset())
-            if part.get_content_charset()
-            else part.get_payload()
-            for part in msg.get_payload()
+            key: self.sanitize_for_serialization(val)
+            for key, val in obj_dict.items()
         }
 
-    def deserialize(self, response: urllib3.HTTPResponse, configuration: Configuration) -> ApiResponse:
-        content_type = response.getheader('content-type')
-        deserialized_body = unset
-        streamed = response.supports_chunked_reads()
-
-        deserialized_headers = unset
-        if self.headers is not None:
-            # TODO add header deserialiation here
-            pass
-
-        if self.content is not None:
-            if content_type not in self.content:
-                raise ApiValueError(
-                    f"Invalid content_type returned. Content_type='{content_type}' was returned "
-                    f"when only {str(set(self.content))} are defined for status_code={str(response.status)}"
-                )
-            body_schema = self.content[content_type].schema
-            if body_schema is None:
-                # some specs do not define response content media type schemas
-                return self.response_cls(
-                    response=response,
-                    headers=deserialized_headers,
-                    body=unset
-                )
+    def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
+        """Deserializes response into an object.
+
+        :param response: RESTResponse object to be deserialized.
+        :param response_type: class literal for
+            deserialized object, or string of class name.
+        :param content_type: content type of response.
+
+        :return: deserialized object.
+        """
 
-            if self._content_type_is_json(content_type):
-                body_data = self.__deserialize_json(response)
-            elif content_type == 'application/octet-stream':
-                body_data = self.__deserialize_application_octet_stream(response)
-            elif content_type.startswith('multipart/form-data'):
-                body_data = self.__deserialize_multipart_form_data(response)
-                content_type = 'multipart/form-data'
+        # fetch data from response object
+        if content_type is None:
+            try:
+                data = json.loads(response_text)
+            except ValueError:
+                data = response_text
+        elif content_type.startswith("application/json"):
+            if response_text == "":
+                data = ""
             else:
-                raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
-        elif streamed:
-            response.release_conn()
-
-        return self.response_cls(
-            response=response,
-            headers=deserialized_headers,
-            body=deserialized_body
-        )
+                data = json.loads(response_text)
+        elif content_type.startswith("text/plain"):
+            data = response_text
+        else:
+            raise ApiException(
+                status=0,
+                reason="Unsupported content type: {0}".format(content_type)
+            )
 
+        return self.__deserialize(data, response_type)
 
-class ApiClient:
-    """Generic API client for OpenAPI client library builds.
+    def __deserialize(self, data, klass):
+        """Deserializes dict, list, str into an object.
 
-    OpenAPI generic API client. This client handles the client-
-    server communication, and is invariant across implementations. Specifics of
-    the methods and models for each application are generated from the OpenAPI
-    templates.
+        :param data: dict, list or str.
+        :param klass: class literal, or string of class name.
 
-    NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
+        :return: object.
+        """
+        if data is None:
+            return None
 
-    :param configuration: .Configuration object for this client
-    :param header_name: a header to pass when making calls to the API.
-    :param header_value: a header value to pass when making calls to
-        the API.
-    :param cookie: a cookie to include in the header when making calls
-        to the API
-    :param pool_threads: The number of threads to use for async requests
-        to the API. More threads means more concurrent API requests.
-    """
+        if isinstance(klass, str):
+            if klass.startswith('List['):
+                m = re.match(r'List\[(.*)]', klass)
+                assert m is not None, "Malformed List type definition"
+                sub_kls = m.group(1)
+                return [self.__deserialize(sub_data, sub_kls)
+                        for sub_data in data]
+
+            if klass.startswith('Dict['):
+                m = re.match(r'Dict\[([^,]*), (.*)]', klass)
+                assert m is not None, "Malformed Dict type definition"
+                sub_kls = m.group(2)
+                return {k: self.__deserialize(v, sub_kls)
+                        for k, v in data.items()}
+
+            # convert str to class
+            if klass in self.NATIVE_TYPES_MAPPING:
+                klass = self.NATIVE_TYPES_MAPPING[klass]
+            else:
+                klass = getattr(cloudharness_cli.workflows.models, klass)
+
+        if klass in self.PRIMITIVE_TYPES:
+            return self.__deserialize_primitive(data, klass)
+        elif klass == object:
+            return self.__deserialize_object(data)
+        elif klass == datetime.date:
+            return self.__deserialize_date(data)
+        elif klass == datetime.datetime:
+            return self.__deserialize_datetime(data)
+        elif issubclass(klass, Enum):
+            return self.__deserialize_enum(data, klass)
+        else:
+            return self.__deserialize_model(data, klass)
 
-    _pool = None
+    def parameters_to_tuples(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __init__(
-        self,
-        configuration: typing.Optional[Configuration] = None,
-        header_name: typing.Optional[str] = None,
-        header_value: typing.Optional[str] = None,
-        cookie: typing.Optional[str] = None,
-        pool_threads: int = 1
-    ):
-        if configuration is None:
-            configuration = Configuration()
-        self.configuration = configuration
-        self.pool_threads = pool_threads
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: Parameters as list of tuples, collections formatted
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, value) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(str(value) for value in v)))
+            else:
+                new_params.append((k, v))
+        return new_params
 
-        self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = HTTPHeaderDict()
-        if header_name is not None:
-            self.default_headers[header_name] = header_value
-        self.cookie = cookie
-        # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.0.0/python'
+    def parameters_to_url_query(self, params, collection_formats):
+        """Get parameters as list of tuples, formatting collections.
 
-    def __enter__(self):
-        return self
+        :param params: Parameters as dict or list of two-tuples
+        :param dict collection_formats: Parameter collection formats
+        :return: URL query string (e.g. a=Hello%20World&b=123)
+        """
+        new_params: List[Tuple[str, str]] = []
+        if collection_formats is None:
+            collection_formats = {}
+        for k, v in params.items() if isinstance(params, dict) else params:
+            if isinstance(v, bool):
+                v = str(v).lower()
+            if isinstance(v, (int, float)):
+                v = str(v)
+            if isinstance(v, dict):
+                v = json.dumps(v)
+
+            if k in collection_formats:
+                collection_format = collection_formats[k]
+                if collection_format == 'multi':
+                    new_params.extend((k, str(value)) for value in v)
+                else:
+                    if collection_format == 'ssv':
+                        delimiter = ' '
+                    elif collection_format == 'tsv':
+                        delimiter = '\t'
+                    elif collection_format == 'pipes':
+                        delimiter = '|'
+                    else:  # csv is the default
+                        delimiter = ','
+                    new_params.append(
+                        (k, delimiter.join(quote(str(value)) for value in v))
+                    )
+            else:
+                new_params.append((k, quote(str(v))))
 
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.close()
+        return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def close(self):
-        if self._pool:
-            self._pool.close()
-            self._pool.join()
-            self._pool = None
-            if hasattr(atexit, 'unregister'):
-                atexit.unregister(self.close)
+    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
+        """Builds form parameters.
 
-    @property
-    def pool(self):
-        """Create thread pool on first request
-         avoids instantiating unused threadpool for blocking clients.
+        :param files: File parameters.
+        :return: Form parameters with files.
         """
-        if self._pool is None:
-            atexit.register(self.close)
-            self._pool = ThreadPool(self.pool_threads)
-        return self._pool
-
-    @property
-    def user_agent(self):
-        """User agent for this API client"""
-        return self.default_headers['User-Agent']
+        params = []
+        for k, v in files.items():
+            if isinstance(v, str):
+                with open(v, 'rb') as f:
+                    filename = os.path.basename(f.name)
+                    filedata = f.read()
+            elif isinstance(v, bytes):
+                filename = k
+                filedata = v
+            else:
+                raise ValueError("Unsupported file value")
+            mimetype = (
+                mimetypes.guess_type(filename)[0]
+                or 'application/octet-stream'
+            )
+            params.append(
+                tuple([k, tuple([filename, filedata, mimetype])])
+            )
+        return params
 
-    @user_agent.setter
-    def user_agent(self, value):
-        self.default_headers['User-Agent'] = value
+    def select_header_accept(self, accepts: List[str]) -> Optional[str]:
+        """Returns `Accept` based on an array of accepts provided.
 
-    def set_default_header(self, header_name, header_value):
-        self.default_headers[header_name] = header_value
+        :param accepts: List of headers.
+        :return: Accept (e.g. application/json).
+        """
+        if not accepts:
+            return None
 
-    def __call_api(
-        self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
+        for accept in accepts:
+            if re.search('json', accept, re.IGNORECASE):
+                return accept
 
-        # header parameters
-        used_headers = HTTPHeaderDict(self.default_headers)
-        if self.cookie:
-            headers['Cookie'] = self.cookie
+        return accepts[0]
 
-        # auth setting
-        self.update_params_for_auth(used_headers,
-                                    auth_settings, resource_path, method, body)
+    def select_header_content_type(self, content_types):
+        """Returns `Content-Type` based on an array of content_types provided.
 
-        # must happen after cookie setting and auth setting in case user is overriding those
-        if headers:
-            used_headers.update(headers)
+        :param content_types: List of content-types.
+        :return: Content-Type (e.g. application/json).
+        """
+        if not content_types:
+            return None
 
-        # request url
-        if host is None:
-            url = self.configuration.host + resource_path
-        else:
-            # use server/host defined in path or operation instead
-            url = host + resource_path
+        for content_type in content_types:
+            if re.search('json', content_type, re.IGNORECASE):
+                return content_type
 
-        # perform request and return response
-        response = self.request(
-            method,
-            url,
-            headers=used_headers,
-            fields=fields,
-            body=body,
-            stream=stream,
-            timeout=timeout,
-        )
-        return response
+        return content_types[0]
 
-    def call_api(
+    def update_params_for_auth(
         self,
-        resource_path: str,
-        method: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        auth_settings: typing.Optional[typing.List[str]] = None,
-        async_req: typing.Optional[bool] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        host: typing.Optional[str] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request (synchronous) and returns deserialized data.
-
-        To make an async_req request, set the async_req parameter.
+        headers,
+        queries,
+        auth_settings,
+        resource_path,
+        method,
+        body,
+        request_auth=None
+    ) -> None:
+        """Updates header and query params based on authentication setting.
 
-        :param resource_path: Path to method endpoint.
-        :param method: Method to call.
-        :param headers: Header parameters to be
-            placed in the request header.
-        :param body: Request body.
-        :param fields: Request post form parameters,
-            for `application/x-www-form-urlencoded`, `multipart/form-data`.
-        :param auth_settings: Auth Settings names for the request.
-        :param async_req: execute request asynchronously
-        :type async_req: bool, optional TODO remove, unused
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                 be returned without reading/decoding response
-                                 data. Also when True, if the openapi spec describes a file download,
-                                 the data will be written to a local filesystme file and the BinarySchema
-                                 instance will also inherit from FileSchema and FileIO
-                                 Default is False.
-        :type stream: bool, optional
-        :param timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param host: api endpoint host
-        :return:
-            If async_req parameter is True,
-            the request will be called asynchronously.
-            The method will return the request thread.
-            If parameter async_req is False or missing,
-            then the method will return the response directly.
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :param auth_settings: Authentication setting identifiers list.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param request_auth: if set, the provided settings will
+                             override the token in the configuration.
         """
+        if not auth_settings:
+            return
 
-        if not async_req:
-            return self.__call_api(
-                resource_path,
-                method,
+        if request_auth:
+            self._apply_auth_params(
                 headers,
-                body,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
-            )
-
-        return self.pool.apply_async(
-            self.__call_api,
-            (
+                queries,
                 resource_path,
                 method,
-                headers,
                 body,
-                json,
-                fields,
-                auth_settings,
-                stream,
-                timeout,
-                host,
+                request_auth
             )
-        )
-
-    def request(
+        else:
+            for auth in auth_settings:
+                auth_setting = self.configuration.auth_settings().get(auth)
+                if auth_setting:
+                    self._apply_auth_params(
+                        headers,
+                        queries,
+                        resource_path,
+                        method,
+                        body,
+                        auth_setting
+                    )
+
+    def _apply_auth_params(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, str], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
-        """Makes the HTTP request using RESTClient."""
-        if method == "GET":
-            return self.rest_client.GET(url,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        headers=headers)
-        elif method == "HEAD":
-            return self.rest_client.HEAD(url,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         headers=headers)
-        elif method == "OPTIONS":
-            return self.rest_client.OPTIONS(url,
-                                            headers=headers,
-                                            fields=fields,
-                                            stream=stream,
-                                            timeout=timeout,
-                                            body=body)
-        elif method == "POST":
-            return self.rest_client.POST(url,
-                                         headers=headers,
-                                         fields=fields,
-                                         stream=stream,
-                                         timeout=timeout,
-                                         body=body)
-        elif method == "PUT":
-            return self.rest_client.PUT(url,
-                                        headers=headers,
-                                        fields=fields,
-                                        stream=stream,
-                                        timeout=timeout,
-                                        body=body)
-        elif method == "PATCH":
-            return self.rest_client.PATCH(url,
-                                          headers=headers,
-                                          fields=fields,
-                                          stream=stream,
-                                          timeout=timeout,
-                                          body=body)
-        elif method == "DELETE":
-            return self.rest_client.DELETE(url,
-                                           headers=headers,
-                                           stream=stream,
-                                           timeout=timeout,
-                                           body=body)
+        headers,
+        queries,
+        resource_path,
+        method,
+        body,
+        auth_setting
+    ) -> None:
+        """Updates the request parameters based on a single auth_setting
+
+        :param headers: Header parameters dict to be updated.
+        :param queries: Query parameters tuple list to be updated.
+        :resource_path: A string representation of the HTTP request resource path.
+        :method: A string representation of the HTTP request method.
+        :body: A object representing the body of the HTTP request.
+        The object type is the return value of sanitize_for_serialization().
+        :param auth_setting: auth settings for the endpoint
+        """
+        if auth_setting['in'] == 'cookie':
+            headers['Cookie'] = auth_setting['value']
+        elif auth_setting['in'] == 'header':
+            if auth_setting['type'] != 'http-signature':
+                headers[auth_setting['key']] = auth_setting['value']
+        elif auth_setting['in'] == 'query':
+            queries.append((auth_setting['key'], auth_setting['value']))
         else:
             raise ApiValueError(
-                "http method must be `GET`, `HEAD`, `OPTIONS`,"
-                " `POST`, `PATCH`, `PUT` or `DELETE`."
+                'Authentication token must be in `query` or `header`'
             )
 
-    def update_params_for_auth(self, headers, auth_settings,
-                               resource_path, method, body):
-        """Updates header and query params based on authentication setting.
+    def __deserialize_file(self, response):
+        """Deserializes body to file
 
-        :param headers: Header parameters dict to be updated.
-        :param auth_settings: Authentication setting identifiers list.
-        :param resource_path: A string representation of the HTTP request resource path.
-        :param method: A string representation of the HTTP request method.
-        :param body: A object representing the body of the HTTP request.
-            The object type is the return value of _encoder.default().
-        """
-        if not auth_settings:
-            return
+        Saves response body into a file in a temporary folder,
+        using the filename from the `Content-Disposition` header if provided.
 
-        for auth in auth_settings:
-            auth_setting = self.configuration.auth_settings().get(auth)
-            if not auth_setting:
-                continue
-            if auth_setting['in'] == 'cookie':
-                headers.add('Cookie', auth_setting['value'])
-            elif auth_setting['in'] == 'header':
-                if auth_setting['type'] != 'http-signature':
-                    headers.add(auth_setting['key'], auth_setting['value'])
-            elif auth_setting['in'] == 'query':
-                """ TODO implement auth in query
-                need to pass in prefix_separator_iterator
-                and need to output resource_path with query params added
-                """
-                raise ApiValueError("Auth in query not yet implemented")
-            else:
-                raise ApiValueError(
-                    'Authentication token must be in `query` or `header`'
-                )
+        handle file downloading
+        save response body into a tmp file and return the instance
 
+        :param response:  RESTResponse.
+        :return: file path.
+        """
+        fd, path = tempfile.mkstemp(dir=self.configuration.temp_folder_path)
+        os.close(fd)
+        os.remove(path)
+
+        content_disposition = response.getheader("Content-Disposition")
+        if content_disposition:
+            m = re.search(
+                r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                content_disposition
+            )
+            assert m is not None, "Unexpected 'content-disposition' header value"
+            filename = m.group(1)
+            path = os.path.join(os.path.dirname(path), filename)
 
-class Api:
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
+        with open(path, "wb") as f:
+            f.write(response.data)
 
-    Do not edit the class manually.
-    """
+        return path
+
+    def __deserialize_primitive(self, data, klass):
+        """Deserializes string to primitive type.
 
-    def __init__(self, api_client: typing.Optional[ApiClient] = None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
+        :param data: str.
+        :param klass: class literal.
 
-    @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+        :return: int, long, float, str, bool.
         """
-        Ensures that:
-        - required keys are present
-        - additional properties are not input
-        - value stored under required keys do not have the value unset
-        Note: detailed value checking is done in schema classes
+        try:
+            return klass(data)
+        except UnicodeEncodeError:
+            return str(data)
+        except TypeError:
+            return data
+
+    def __deserialize_object(self, value):
+        """Return an original value.
+
+        :return: object.
         """
-        missing_required_keys = []
-        required_keys_with_unset_values = []
-        for required_key in cls.__required_keys__:
-            if required_key not in data:
-                missing_required_keys.append(required_key)
-                continue
-            value = data[required_key]
-            if value is unset:
-                required_keys_with_unset_values.append(required_key)
-        if missing_required_keys:
-            raise ApiTypeError(
-                '{} missing {} required arguments: {}'.format(
-                    cls.__name__, len(missing_required_keys), missing_required_keys
-                 )
-             )
-        if required_keys_with_unset_values:
-            raise ApiValueError(
-                '{} contains invalid unset values for {} required keys: {}'.format(
-                    cls.__name__, len(required_keys_with_unset_values), required_keys_with_unset_values
-                )
-            )
+        return value
 
-        disallowed_additional_keys = []
-        for key in data:
-            if key in cls.__required_keys__ or key in cls.__optional_keys__:
-                continue
-            disallowed_additional_keys.append(key)
-        if disallowed_additional_keys:
-            raise ApiTypeError(
-                '{} got {} unexpected keyword arguments: {}'.format(
-                    cls.__name__, len(disallowed_additional_keys), disallowed_additional_keys
-                )
-            )
+    def __deserialize_date(self, string):
+        """Deserializes string to date.
 
-    def _get_host_oapg(
-        self,
-        operation_id: str,
-        servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
-        host_index: typing.Optional[int] = None
-    ) -> typing.Optional[str]:
-        configuration = self.api_client.configuration
+        :param string: str.
+        :return: date.
+        """
         try:
-            if host_index is None:
-                index = configuration.server_operation_index.get(
-                    operation_id, configuration.server_index
-                )
-            else:
-                index = host_index
-            server_variables = configuration.server_operation_variables.get(
-                operation_id, configuration.server_variables
-            )
-            host = configuration.get_host_from_settings(
-                index, variables=server_variables, servers=servers
+            return parse(string).date()
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason="Failed to parse `{0}` as date object".format(string)
             )
-        except IndexError:
-            if servers:
-                raise ApiValueError(
-                    "Invalid host index. Must be 0 <= index < %s" %
-                    len(servers)
-                )
-            host = None
-        return host
-
-
-class SerializedRequestBody(typing_extensions.TypedDict, total=False):
-    body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
+    def __deserialize_datetime(self, string):
+        """Deserializes string to datetime.
 
-class RequestBody(StyleFormSerializer, JSONDetector):
-    """
-    A request body parameter
-    content: content_type to MediaType Schema info
-    """
-    __json_encoder = JSONEncoder()
+        The string should be in iso8601 datetime format.
 
-    def __init__(
-        self,
-        content: typing.Dict[str, MediaType],
-        required: bool = False,
-    ):
-        self.required = required
-        if len(content) == 0:
-            raise ValueError('Invalid value for content, the content dict must have >= 1 entry')
-        self.content = content
-
-    def __serialize_json(
-        self,
-        in_data: typing.Any
-    ) -> typing.Dict[str, bytes]:
-        in_data = self.__json_encoder.default(in_data)
-        json_str = json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode(
-            "utf-8"
-        )
-        return dict(body=json_str)
-
-    @staticmethod
-    def __serialize_text_plain(in_data: typing.Any) -> typing.Dict[str, str]:
-        if isinstance(in_data, frozendict.frozendict):
-            raise ValueError('Unable to serialize type frozendict.frozendict to text/plain')
-        elif isinstance(in_data, tuple):
-            raise ValueError('Unable to serialize type tuple to text/plain')
-        elif isinstance(in_data, NoneClass):
-            raise ValueError('Unable to serialize type NoneClass to text/plain')
-        elif isinstance(in_data, BoolClass):
-            raise ValueError('Unable to serialize type BoolClass to text/plain')
-        return dict(body=str(in_data))
-
-    def __multipart_json_item(self, key: str, value: Schema) -> RequestField:
-        json_value = self.__json_encoder.default(value)
-        return RequestField(name=key, data=json.dumps(json_value), headers={'Content-Type': 'application/json'})
-
-    def __multipart_form_item(self, key: str, value: Schema) -> RequestField:
-        if isinstance(value, str):
-            return RequestField(name=key, data=str(value), headers={'Content-Type': 'text/plain'})
-        elif isinstance(value, bytes):
-            return RequestField(name=key, data=value, headers={'Content-Type': 'application/octet-stream'})
-        elif isinstance(value, FileIO):
-            request_field = RequestField(
-                name=key,
-                data=value.read(),
-                filename=os.path.basename(value.name),
-                headers={'Content-Type': 'application/octet-stream'}
+        :param string: str.
+        :return: datetime.
+        """
+        try:
+            return parse(string)
+        except ImportError:
+            return string
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as datetime object"
+                    .format(string)
+                )
             )
-            value.close()
-            return request_field
-        else:
-            return self.__multipart_json_item(key=key, value=value)
 
-    def __serialize_multipart_form_data(
-        self, in_data: Schema
-    ) -> typing.Dict[str, typing.Tuple[RequestField, ...]]:
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(f'Unable to serialize {in_data} to multipart/form-data because it is not a dict of data')
+    def __deserialize_enum(self, data, klass):
+        """Deserializes primitive type to enum.
+
+        :param data: primitive type.
+        :param klass: class literal.
+        :return: enum value.
         """
-        In a multipart/form-data request body, each schema property, or each element of a schema array property,
-        takes a section in the payload with an internal header as defined by RFC7578. The serialization strategy
-        for each property of a multipart/form-data request body can be specified in an associated Encoding Object.
+        try:
+            return klass(data)
+        except ValueError:
+            raise rest.ApiException(
+                status=0,
+                reason=(
+                    "Failed to parse `{0}` as `{1}`"
+                    .format(data, klass)
+                )
+            )
 
-        When passing in multipart types, boundaries MAY be used to separate sections of the content being
-        transferred – thus, the following default Content-Types are defined for multipart:
+    def __deserialize_model(self, data, klass):
+        """Deserializes list or dict to model.
 
-        If the (object) property is a primitive, or an array of primitive values, the default Content-Type is text/plain
-        If the property is complex, or an array of complex values, the default Content-Type is application/json
-            Question: how is the array of primitives encoded?
-        If the property is a type: string with a contentEncoding, the default Content-Type is application/octet-stream
-        """
-        fields = []
-        for key, value in in_data.items():
-            if isinstance(value, tuple):
-                if value:
-                    # values use explode = True, so the code makes a RequestField for each item with name=key
-                    for item in value:
-                        request_field = self.__multipart_form_item(key=key, value=item)
-                        fields.append(request_field)
-                else:
-                    # send an empty array as json because exploding will not send it
-                    request_field = self.__multipart_json_item(key=key, value=value)
-                    fields.append(request_field)
-            else:
-                request_field = self.__multipart_form_item(key=key, value=value)
-                fields.append(request_field)
-
-        return dict(fields=tuple(fields))
-
-    def __serialize_application_octet_stream(self, in_data: BinarySchema) -> typing.Dict[str, bytes]:
-        if isinstance(in_data, bytes):
-            return dict(body=in_data)
-        # FileIO type
-        result = dict(body=in_data.read())
-        in_data.close()
-        return result
-
-    def __serialize_application_x_www_form_data(
-        self, in_data: typing.Any
-    ) -> SerializedRequestBody:
+        :param data: dict, list.
+        :param klass: class literal.
+        :return: model object.
         """
-        POST submission of form data in body
-        """
-        if not isinstance(in_data, frozendict.frozendict):
-            raise ValueError(
-                f'Unable to serialize {in_data} to application/x-www-form-urlencoded because it is not a dict of data')
-        cast_in_data = self.__json_encoder.default(in_data)
-        value = self._serialize_form(cast_in_data, name='', explode=True, percent_encode=True)
-        return dict(body=value)
-
-    def serialize(
-        self, in_data: typing.Any, content_type: str
-    ) -> SerializedRequestBody:
-        """
-        If a str is returned then the result will be assigned to data when making the request
-        If a tuple is returned then the result will be used as fields input in encode_multipart_formdata
-        Return a tuple of
 
-        The key of the return dict is
-        - body for application/json
-        - encode_multipart and fields for multipart/form-data
-        """
-        media_type = self.content[content_type]
-        if isinstance(in_data, media_type.schema):
-            cast_in_data = in_data
-        elif isinstance(in_data, (dict, frozendict.frozendict)) and in_data:
-            cast_in_data = media_type.schema(**in_data)
-        else:
-            cast_in_data = media_type.schema(in_data)
-        # TODO check for and use encoding if it exists
-        # and content_type is multipart or application/x-www-form-urlencoded
-        if self._content_type_is_json(content_type):
-            return self.__serialize_json(cast_in_data)
-        elif content_type == 'text/plain':
-            return self.__serialize_text_plain(cast_in_data)
-        elif content_type == 'multipart/form-data':
-            return self.__serialize_multipart_form_data(cast_in_data)
-        elif content_type == 'application/x-www-form-urlencoded':
-            return self.__serialize_application_x_www_form_data(cast_in_data)
-        elif content_type == 'application/octet-stream':
-            return self.__serialize_application_octet_stream(cast_in_data)
-        raise NotImplementedError('Serialization has not yet been implemented for {}'.format(content_type))
+        return klass.from_dict(data)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_response.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_response.py
new file mode 100644
index 00000000..9bc7c11f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/api_response.py
@@ -0,0 +1,21 @@
+"""API response object."""
+
+from __future__ import annotations
+from typing import Optional, Generic, Mapping, TypeVar
+from pydantic import Field, StrictInt, StrictBytes, BaseModel
+
+T = TypeVar("T")
+
+class ApiResponse(BaseModel, Generic[T]):
+    """
+    API response object
+    """
+
+    status_code: StrictInt = Field(description="HTTP status code")
+    headers: Optional[Mapping[str, str]] = Field(None, description="HTTP headers")
+    data: T = Field(description="Deserialized data given the data type")
+    raw_data: StrictBytes = Field(description="Raw data (HTTP response body)")
+
+    model_config = {
+        "arbitrary_types_allowed": True
+    }
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/__init__.py
deleted file mode 100644
index 7840f772..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints then import them from
-# tags, paths, or path_to_api, or tag_to_api
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/path_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/path_to_api.py
deleted file mode 100644
index c453deff..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/path_to_api.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.workflows.paths import PathValues
-from cloudharness_cli.workflows.apis.paths.operations import Operations
-from cloudharness_cli.workflows.apis.paths.operations_name import OperationsName
-from cloudharness_cli.workflows.apis.paths.operations_name_logs import OperationsNameLogs
-
-PathToApi = typing_extensions.TypedDict(
-    'PathToApi',
-    {
-        PathValues.OPERATIONS: Operations,
-        PathValues.OPERATIONS_NAME: OperationsName,
-        PathValues.OPERATIONS_NAME_LOGS: OperationsNameLogs,
-    }
-)
-
-path_to_api = PathToApi(
-    {
-        PathValues.OPERATIONS: Operations,
-        PathValues.OPERATIONS_NAME: OperationsName,
-        PathValues.OPERATIONS_NAME_LOGS: OperationsNameLogs,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/__init__.py
deleted file mode 100644
index e0642734..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.workflows.apis.path_to_api import path_to_api
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations.py
deleted file mode 100644
index 317fd596..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.workflows.paths.operations.get import ApiForget
-
-
-class Operations(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name.py
deleted file mode 100644
index 698ea588..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from cloudharness_cli.workflows.paths.operations_name.get import ApiForget
-from cloudharness_cli.workflows.paths.operations_name.delete import ApiFordelete
-
-
-class OperationsName(
-    ApiForget,
-    ApiFordelete,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name_logs.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name_logs.py
deleted file mode 100644
index beaf0d74..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/paths/operations_name_logs.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from cloudharness_cli.workflows.paths.operations_name_logs.get import ApiForget
-
-
-class OperationsNameLogs(
-    ApiForget,
-):
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tag_to_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tag_to_api.py
deleted file mode 100644
index 25c14c70..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tag_to_api.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import typing_extensions
-
-from cloudharness_cli.workflows.apis.tags import TagValues
-from cloudharness_cli.workflows.apis.tags.create_and_access_api import CreateAndAccessApi
-
-TagToApi = typing_extensions.TypedDict(
-    'TagToApi',
-    {
-        TagValues.CREATE_AND_ACCESS: CreateAndAccessApi,
-    }
-)
-
-tag_to_api = TagToApi(
-    {
-        TagValues.CREATE_AND_ACCESS: CreateAndAccessApi,
-    }
-)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/__init__.py
deleted file mode 100644
index dfc112ae..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.workflows.apis.tag_to_api import tag_to_api
-
-import enum
-
-
-class TagValues(str, enum.Enum):
-    CREATE_AND_ACCESS = "Create and Access"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/create_and_access_api.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/create_and_access_api.py
deleted file mode 100644
index a1ffaffb..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/apis/tags/create_and_access_api.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from cloudharness_cli.workflows.paths.operations_name.delete import DeleteOperation
-from cloudharness_cli.workflows.paths.operations_name.get import GetOperation
-from cloudharness_cli.workflows.paths.operations.get import ListOperations
-from cloudharness_cli.workflows.paths.operations_name_logs.get import LogOperation
-
-
-class CreateAndAccessApi(
-    DeleteOperation,
-    GetOperation,
-    ListOperations,
-    LogOperation,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    pass
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/configuration.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/configuration.py
index 690e7a3c..a82a0012 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/configuration.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/configuration.py
@@ -3,70 +3,49 @@
 """
     Workflows API
 
-    Workflows API  # noqa: E501
+    Workflows API
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
 
 import copy
 import logging
+from logging import FileHandler
 import multiprocessing
 import sys
+from typing import Optional
 import urllib3
 
-from http import client as http_client
-from cloudharness_cli.workflows.exceptions import ApiValueError
-
+import http.client as httplib
 
 JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'multipleOf', 'maximum', 'exclusiveMaximum',
     'minimum', 'exclusiveMinimum', 'maxLength',
-    'minLength', 'pattern', 'maxItems', 'minItems',
-    'uniqueItems', 'maxProperties', 'minProperties',
+    'minLength', 'pattern', 'maxItems', 'minItems'
 }
 
-class Configuration(object):
-    """NOTE: This class is auto generated by OpenAPI Generator
+class Configuration:
+    """This class contains various settings of the API client.
 
-    Ref: https://openapi-generator.tech
-    Do not edit the class manually.
-
-    :param host: Base url
+    :param host: Base url.
+    :param ignore_operation_servers
+      Boolean to ignore operation servers for the API client.
+      Config will use `host` as the base url regardless of the operation servers.
     :param api_key: Dict to store API key(s).
       Each entry in the dict specifies an API key.
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is the API key secret.
-    :param api_key_prefix: Dict to store API prefix (e.g. Bearer)
+    :param api_key_prefix: Dict to store API prefix (e.g. Bearer).
       The dict key is the name of the security scheme in the OAS specification.
       The dict value is an API key prefix when generating the auth data.
-    :param username: Username for HTTP basic authentication
-    :param password: Password for HTTP basic authentication
-    :param discard_unknown_keys: Boolean value indicating whether to discard
-      unknown properties. A server may send a response that includes additional
-      properties that are not known by the client in the following scenarios:
-      1. The OpenAPI document is incomplete, i.e. it does not match the server
-         implementation.
-      2. The client was generated using an older version of the OpenAPI document
-         and the server has been upgraded since then.
-      If a schema in the OpenAPI document defines the additionalProperties attribute,
-      then all undeclared properties received by the server are injected into the
-      additional properties map. In that case, there are undeclared properties, and
-      nothing to discard.
-    :param disabled_client_side_validations (string): Comma-separated list of
-      JSON schema validation keywords to disable JSON schema structural validation
-      rules. The following keywords may be specified: multipleOf, maximum,
-      exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
-      maxItems, minItems.
-      By default, the validation is performed for data generated locally by the client
-      and data received from the server, independent of any validation performed by
-      the server side. If the input data does not satisfy the JSON schema validation
-      rules specified in the OpenAPI document, an exception is raised.
-      If disabled_client_side_validations is set, structural validation is
-      disabled. This can be useful to troubleshoot data validation problem, such as
-      when the OpenAPI document validation rules do not match the actual API data
-      received by the server.
+    :param username: Username for HTTP basic authentication.
+    :param password: Password for HTTP basic authentication.
+    :param access_token: Access token.
     :param server_index: Index to servers configuration.
     :param server_variables: Mapping with string values to replace variables in
       templated server configuration. The validation of enums is performed for
@@ -75,7 +54,11 @@ class Configuration(object):
       configuration.
     :param server_operation_variables: Mapping from operation ID to a mapping with
       string values to replace variables in templated server configuration.
-      The validation of enums is performed for variables with defined enum values before.
+      The validation of enums is performed for variables with defined enum
+      values before.
+    :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
+      in PEM format.
+    :param retries: Number of retries for API requests.
 
     """
 
@@ -84,14 +67,18 @@ class Configuration(object):
     def __init__(self, host=None,
                  api_key=None, api_key_prefix=None,
                  username=None, password=None,
-                 discard_unknown_keys=False,
-                 disabled_client_side_validations="",
+                 access_token=None,
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
-                 ):
+                 ignore_operation_servers=False,
+                 ssl_ca_cert=None,
+                 retries=None,
+                 *,
+                 debug: Optional[bool] = None
+                 ) -> None:
         """Constructor
         """
-        self._base_path = "https://workflows.cloudharness.metacell.us/api" if host is None else host
+        self._base_path = "/api" if host is None else host
         """Default Base url
         """
         self.server_index = 0 if server_index is None and host is None else server_index
@@ -102,6 +89,9 @@ def __init__(self, host=None,
         self.server_operation_variables = server_operation_variables or {}
         """Default server variables
         """
+        self.ignore_operation_servers = ignore_operation_servers
+        """Ignore operation servers
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -125,8 +115,9 @@ def __init__(self, host=None,
         self.password = password
         """Password for HTTP basic authentication
         """
-        self.discard_unknown_keys = discard_unknown_keys
-        self.disabled_client_side_validations = disabled_client_side_validations
+        self.access_token = access_token
+        """Access token
+        """
         self.logger = {}
         """Logging Settings
         """
@@ -138,13 +129,16 @@ def __init__(self, host=None,
         self.logger_stream_handler = None
         """Log stream handler
         """
-        self.logger_file_handler = None
+        self.logger_file_handler: Optional[FileHandler] = None
         """Log file handler
         """
         self.logger_file = None
         """Debug file location
         """
-        self.debug = False
+        if debug is not None:
+            self.debug = debug
+        else:
+            self.__debug = False
         """Debug switch
         """
 
@@ -153,7 +147,7 @@ def __init__(self, host=None,
            Set this to false to skip verifying SSL certificate when calling API
            from https server.
         """
-        self.ssl_ca_cert = None
+        self.ssl_ca_cert = ssl_ca_cert
         """Set this to customize the certificate file to verify the peer.
         """
         self.cert_file = None
@@ -165,6 +159,10 @@ def __init__(self, host=None,
         self.assert_hostname = None
         """Set this to True/False to enable/disable SSL hostname verification.
         """
+        self.tls_server_name = None
+        """SSL/TLS Server Name Indication (SNI)
+           Set this to the SNI value expected by the server.
+        """
 
         self.connection_pool_maxsize = multiprocessing.cpu_count() * 5
         """urllib3 connection pool's maximum number of connections saved
@@ -174,7 +172,7 @@ def __init__(self, host=None,
            cpu_count * 5 is used as default value to increase performance.
         """
 
-        self.proxy = None
+        self.proxy: Optional[str] = None
         """Proxy URL
         """
         self.proxy_headers = None
@@ -183,14 +181,23 @@ def __init__(self, host=None,
         self.safe_chars_for_path_param = ''
         """Safe chars for path_param
         """
-        self.retries = None
+        self.retries = retries
         """Adding retries to override urllib3 default value 3
         """
         # Enable client side validation
         self.client_side_validation = True
 
-        # Options to pass down to the underlying urllib3 socket
         self.socket_options = None
+        """Options to pass down to the underlying urllib3 socket
+        """
+
+        self.datetime_format = "%Y-%m-%dT%H:%M:%S.%f%z"
+        """datetime format
+        """
+
+        self.date_format = "%Y-%m-%d"
+        """date format
+        """
 
     def __deepcopy__(self, memo):
         cls = self.__class__
@@ -208,13 +215,6 @@ def __deepcopy__(self, memo):
 
     def __setattr__(self, name, value):
         object.__setattr__(self, name, value)
-        if name == 'disabled_client_side_validations':
-            s = set(filter(None, value.split(',')))
-            for v in s:
-                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
-                    raise ApiValueError(
-                        "Invalid keyword: '{0}''".format(v))
-            self._disabled_client_side_validations = s
 
     @classmethod
     def set_default(cls, default):
@@ -225,21 +225,31 @@ def set_default(cls, default):
 
         :param default: object of Configuration
         """
-        cls._default = copy.deepcopy(default)
+        cls._default = default
 
     @classmethod
     def get_default_copy(cls):
-        """Return new instance of configuration.
+        """Deprecated. Please use `get_default` instead.
+
+        Deprecated. Please use `get_default` instead.
+
+        :return: The configuration object.
+        """
+        return cls.get_default()
+
+    @classmethod
+    def get_default(cls):
+        """Return the default configuration.
 
         This method returns newly created, based on default constructor,
         object of Configuration class or returns a copy of default
-        configuration passed by the set_default method.
+        configuration.
 
         :return: The configuration object.
         """
-        if cls._default is not None:
-            return copy.deepcopy(cls._default)
-        return Configuration()
+        if cls._default is None:
+            cls._default = Configuration()
+        return cls._default
 
     @property
     def logger_file(self):
@@ -293,15 +303,15 @@ def debug(self, value):
             # if debug status is True, turn on debug logging
             for _, logger in self.logger.items():
                 logger.setLevel(logging.DEBUG)
-            # turn on http_client debug
-            http_client.HTTPConnection.debuglevel = 1
+            # turn on httplib debug
+            httplib.HTTPConnection.debuglevel = 1
         else:
             # if debug status is False, turn off debug logging,
             # setting log level to default `logging.WARNING`
             for _, logger in self.logger.items():
                 logger.setLevel(logging.WARNING)
-            # turn off http_client debug
-            http_client.HTTPConnection.debuglevel = 0
+            # turn off httplib debug
+            httplib.HTTPConnection.debuglevel = 0
 
     @property
     def logger_format(self):
@@ -385,7 +395,7 @@ def get_host_settings(self):
         """
         return [
             {
-                'url': "https://workflows.cloudharness.metacell.us/api",
+                'url': "/api",
                 'description': "Metacell host",
             }
         ]
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/exceptions.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/exceptions.py
index c870fefc..df9d589f 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/exceptions.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/exceptions.py
@@ -3,13 +3,17 @@
 """
     Workflows API
 
-    Workflows API  # noqa: E501
+    Workflows API
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
 
+    Do not edit the class manually.
+"""  # noqa: E501
+
+from typing import Any, Optional
+from typing_extensions import Self
 
 class OpenApiException(Exception):
     """The base exception class for all OpenAPIExceptions"""
@@ -17,7 +21,7 @@ class OpenApiException(Exception):
 
 class ApiTypeError(OpenApiException, TypeError):
     def __init__(self, msg, path_to_item=None, valid_classes=None,
-                 key_type=None):
+                 key_type=None) -> None:
         """ Raises an exception for TypeErrors
 
         Args:
@@ -45,7 +49,7 @@ def __init__(self, msg, path_to_item=None, valid_classes=None,
 
 
 class ApiValueError(OpenApiException, ValueError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -63,7 +67,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiAttributeError(OpenApiException, AttributeError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Raised when an attribute reference or assignment fails.
 
@@ -82,7 +86,7 @@ def __init__(self, msg, path_to_item=None):
 
 
 class ApiKeyError(OpenApiException, KeyError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -100,17 +104,56 @@ def __init__(self, msg, path_to_item=None):
 
 class ApiException(OpenApiException):
 
-    def __init__(self, status=None, reason=None, api_response: 'cloudharness_cli.workflows.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+    def __init__(
+        self, 
+        status=None, 
+        reason=None, 
+        http_resp=None,
+        *,
+        body: Optional[str] = None,
+        data: Optional[Any] = None,
+    ) -> None:
+        self.status = status
+        self.reason = reason
+        self.body = body
+        self.data = data
+        self.headers = None
+
+        if http_resp:
+            if self.status is None:
+                self.status = http_resp.status
+            if self.reason is None:
+                self.reason = http_resp.reason
+            if self.body is None:
+                try:
+                    self.body = http_resp.data.decode('utf-8')
+                except Exception:
+                    pass
+            self.headers = http_resp.getheaders()
+
+    @classmethod
+    def from_response(
+        cls, 
+        *, 
+        http_resp, 
+        body: Optional[str], 
+        data: Optional[Any],
+    ) -> Self:
+        if http_resp.status == 400:
+            raise BadRequestException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 401:
+            raise UnauthorizedException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 403:
+            raise ForbiddenException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 404:
+            raise NotFoundException(http_resp=http_resp, body=body, data=data)
+
+        if 500 <= http_resp.status <= 599:
+            raise ServiceException(http_resp=http_resp, body=body, data=data)
+        raise ApiException(http_resp=http_resp, body=body, data=data)
 
     def __str__(self):
         """Custom error messages for exception"""
@@ -120,12 +163,32 @@ def __str__(self):
             error_message += "HTTP response headers: {0}\n".format(
                 self.headers)
 
-        if self.body:
-            error_message += "HTTP response body: {0}\n".format(self.body)
+        if self.data or self.body:
+            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
 
         return error_message
 
 
+class BadRequestException(ApiException):
+    pass
+
+
+class NotFoundException(ApiException):
+    pass
+
+
+class UnauthorizedException(ApiException):
+    pass
+
+
+class ForbiddenException(ApiException):
+    pass
+
+
+class ServiceException(ApiException):
+    pass
+
+
 def render_path(path_to_item):
     """Returns a string representation of a path"""
     result = ""
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/__init__.py
deleted file mode 100644
index c138ded7..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# we can not import model classes here because that would create a circular
-# reference which would not work in python2
-# do not import all models into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all models from one package, import them with
-# from cloudharness_cli.workflows.models import ModelA, ModelB
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.py
deleted file mode 100644
index 5013d4a4..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class Operation(
-    schemas.AnyTypeSchema,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-
-    represents the status of a distributed API call
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            message = schemas.StrSchema
-            name = schemas.StrSchema
-            createTime = schemas.DateTimeSchema
-        
-            @staticmethod
-            def status() -> typing.Type['OperationStatus']:
-                return OperationStatus
-            workflow = schemas.StrSchema
-            __annotations__ = {
-                "message": message,
-                "name": name,
-                "createTime": createTime,
-                "status": status,
-                "workflow": workflow,
-            }
-
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["message"]) -> MetaOapg.properties.message: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["createTime"]) -> MetaOapg.properties.createTime: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> 'OperationStatus': ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["workflow"]) -> MetaOapg.properties.workflow: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["message", "name", "createTime", "status", "workflow", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["createTime"]) -> typing.Union[MetaOapg.properties.createTime, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union['OperationStatus', schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["workflow"]) -> typing.Union[MetaOapg.properties.workflow, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["message", "name", "createTime", "status", "workflow", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        createTime: typing.Union[MetaOapg.properties.createTime, str, datetime, schemas.Unset] = schemas.unset,
-        status: typing.Union['OperationStatus', schemas.Unset] = schemas.unset,
-        workflow: typing.Union[MetaOapg.properties.workflow, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'Operation':
-        return super().__new__(
-            cls,
-            *args,
-            message=message,
-            name=name,
-            createTime=createTime,
-            status=status,
-            workflow=workflow,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-from cloudharness_cli/workflows.model.operation_status import OperationStatus
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.pyi
deleted file mode 100644
index 5013d4a4..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation.pyi
+++ /dev/null
@@ -1,127 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class Operation(
-    schemas.AnyTypeSchema,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-
-    represents the status of a distributed API call
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            message = schemas.StrSchema
-            name = schemas.StrSchema
-            createTime = schemas.DateTimeSchema
-        
-            @staticmethod
-            def status() -> typing.Type['OperationStatus']:
-                return OperationStatus
-            workflow = schemas.StrSchema
-            __annotations__ = {
-                "message": message,
-                "name": name,
-                "createTime": createTime,
-                "status": status,
-                "workflow": workflow,
-            }
-
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["message"]) -> MetaOapg.properties.message: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["createTime"]) -> MetaOapg.properties.createTime: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> 'OperationStatus': ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["workflow"]) -> MetaOapg.properties.workflow: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["message", "name", "createTime", "status", "workflow", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["createTime"]) -> typing.Union[MetaOapg.properties.createTime, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union['OperationStatus', schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["workflow"]) -> typing.Union[MetaOapg.properties.workflow, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["message", "name", "createTime", "status", "workflow", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
-        name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
-        createTime: typing.Union[MetaOapg.properties.createTime, str, datetime, schemas.Unset] = schemas.unset,
-        status: typing.Union['OperationStatus', schemas.Unset] = schemas.unset,
-        workflow: typing.Union[MetaOapg.properties.workflow, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'Operation':
-        return super().__new__(
-            cls,
-            *args,
-            message=message,
-            name=name,
-            createTime=createTime,
-            status=status,
-            workflow=workflow,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-from cloudharness_cli/workflows.model.operation_status import OperationStatus
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.py
deleted file mode 100644
index 10294339..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class OperationSearchResult(
-    schemas.AnyTypeSchema,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-
-    a list of operations with meta data about the result
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-        
-            @staticmethod
-            def meta() -> typing.Type['SearchResultData']:
-                return SearchResultData
-            
-            
-            class items(
-                schemas.ListSchema
-            ):
-            
-            
-                class MetaOapg:
-                    
-                    @staticmethod
-                    def items() -> typing.Type['Operation']:
-                        return Operation
-            
-                def __new__(
-                    cls,
-                    arg: typing.Union[typing.Tuple['Operation'], typing.List['Operation']],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'items':
-                    return super().__new__(
-                        cls,
-                        arg,
-                        _configuration=_configuration,
-                    )
-            
-                def __getitem__(self, i: int) -> 'Operation':
-                    return super().__getitem__(i)
-            __annotations__ = {
-                "meta": meta,
-                "items": items,
-            }
-
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["meta"]) -> 'SearchResultData': ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["items"]) -> MetaOapg.properties.items: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["meta", "items", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["meta"]) -> typing.Union['SearchResultData', schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["items"]) -> typing.Union[MetaOapg.properties.items, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["meta", "items", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        meta: typing.Union['SearchResultData', schemas.Unset] = schemas.unset,
-        items: typing.Union[MetaOapg.properties.items, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'OperationSearchResult':
-        return super().__new__(
-            cls,
-            *args,
-            meta=meta,
-            items=items,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-from cloudharness_cli/workflows.model.operation import Operation
-from cloudharness_cli/workflows.model.search_result_data import SearchResultData
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.pyi
deleted file mode 100644
index 10294339..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_search_result.pyi
+++ /dev/null
@@ -1,123 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class OperationSearchResult(
-    schemas.AnyTypeSchema,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-
-    a list of operations with meta data about the result
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-        
-            @staticmethod
-            def meta() -> typing.Type['SearchResultData']:
-                return SearchResultData
-            
-            
-            class items(
-                schemas.ListSchema
-            ):
-            
-            
-                class MetaOapg:
-                    
-                    @staticmethod
-                    def items() -> typing.Type['Operation']:
-                        return Operation
-            
-                def __new__(
-                    cls,
-                    arg: typing.Union[typing.Tuple['Operation'], typing.List['Operation']],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'items':
-                    return super().__new__(
-                        cls,
-                        arg,
-                        _configuration=_configuration,
-                    )
-            
-                def __getitem__(self, i: int) -> 'Operation':
-                    return super().__getitem__(i)
-            __annotations__ = {
-                "meta": meta,
-                "items": items,
-            }
-
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["meta"]) -> 'SearchResultData': ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["items"]) -> MetaOapg.properties.items: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["meta", "items", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["meta"]) -> typing.Union['SearchResultData', schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["items"]) -> typing.Union[MetaOapg.properties.items, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["meta", "items", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        meta: typing.Union['SearchResultData', schemas.Unset] = schemas.unset,
-        items: typing.Union[MetaOapg.properties.items, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'OperationSearchResult':
-        return super().__new__(
-            cls,
-            *args,
-            meta=meta,
-            items=items,
-            _configuration=_configuration,
-            **kwargs,
-        )
-
-from cloudharness_cli/workflows.model.operation import Operation
-from cloudharness_cli/workflows.model.search_result_data import SearchResultData
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.py
deleted file mode 100644
index f13417b3..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class OperationStatus(
-    schemas.EnumBase,
-    schemas.StrSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-        enum_value_to_name = {
-            "Pending": "PENDING",
-            "Running": "RUNNING",
-            "Error": "ERROR",
-            "Succeeded": "SUCCEEDED",
-            "Skipped": "SKIPPED",
-            "Failed": "FAILED",
-        }
-    
-    @schemas.classproperty
-    def PENDING(cls):
-        return cls("Pending")
-    
-    @schemas.classproperty
-    def RUNNING(cls):
-        return cls("Running")
-    
-    @schemas.classproperty
-    def ERROR(cls):
-        return cls("Error")
-    
-    @schemas.classproperty
-    def SUCCEEDED(cls):
-        return cls("Succeeded")
-    
-    @schemas.classproperty
-    def SKIPPED(cls):
-        return cls("Skipped")
-    
-    @schemas.classproperty
-    def FAILED(cls):
-        return cls("Failed")
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.pyi
deleted file mode 100644
index 168ddaf8..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/operation_status.pyi
+++ /dev/null
@@ -1,59 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class OperationStatus(
-    schemas.EnumBase,
-    schemas.StrSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-    
-    @schemas.classproperty
-    def PENDING(cls):
-        return cls("Pending")
-    
-    @schemas.classproperty
-    def RUNNING(cls):
-        return cls("Running")
-    
-    @schemas.classproperty
-    def ERROR(cls):
-        return cls("Error")
-    
-    @schemas.classproperty
-    def SUCCEEDED(cls):
-        return cls("Succeeded")
-    
-    @schemas.classproperty
-    def SKIPPED(cls):
-        return cls("Skipped")
-    
-    @schemas.classproperty
-    def FAILED(cls):
-        return cls("Failed")
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.py
deleted file mode 100644
index c446f3de..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class SearchResultData(
-    schemas.AnyTypeSchema,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-
-    describes a search
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            continueToken = schemas.StrSchema
-            __annotations__ = {
-                "continueToken": continueToken,
-            }
-
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["continueToken"]) -> MetaOapg.properties.continueToken: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["continueToken", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["continueToken"]) -> typing.Union[MetaOapg.properties.continueToken, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["continueToken", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        continueToken: typing.Union[MetaOapg.properties.continueToken, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'SearchResultData':
-        return super().__new__(
-            cls,
-            *args,
-            continueToken=continueToken,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.pyi
deleted file mode 100644
index c446f3de..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/model/search_result_data.pyi
+++ /dev/null
@@ -1,82 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-
-class SearchResultData(
-    schemas.AnyTypeSchema,
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-
-    describes a search
-    """
-
-
-    class MetaOapg:
-        
-        class properties:
-            continueToken = schemas.StrSchema
-            __annotations__ = {
-                "continueToken": continueToken,
-            }
-
-    
-    @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["continueToken"]) -> MetaOapg.properties.continueToken: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
-    
-    def __getitem__(self, name: typing.Union[typing_extensions.Literal["continueToken", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
-    
-    
-    @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["continueToken"]) -> typing.Union[MetaOapg.properties.continueToken, schemas.Unset]: ...
-    
-    @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
-    
-    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["continueToken", ], str]):
-        return super().get_item_oapg(name)
-    
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        continueToken: typing.Union[MetaOapg.properties.continueToken, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
-    ) -> 'SearchResultData':
-        return super().__new__(
-            cls,
-            *args,
-            continueToken=continueToken,
-            _configuration=_configuration,
-            **kwargs,
-        )
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/__init__.py
index 966c20a0..c8e68a3c 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/__init__.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/__init__.py
@@ -1,17 +1,21 @@
 # coding: utf-8
 
 # flake8: noqa
+"""
+    Workflows API
 
-# import all models into this package
-# if you have many models here with many references from one model to another this may
-# raise a RecursionError
-# to avoid this, import only the models that you directly need like:
-# from from cloudharness_cli.workflows.model.pet import Pet
-# or import this package, but before doing it, use:
-# import sys
-# sys.setrecursionlimit(n)
+    Workflows API
 
-from cloudharness_cli.workflows.model.operation import Operation
-from cloudharness_cli.workflows.model.operation_search_result import OperationSearchResult
-from cloudharness_cli.workflows.model.operation_status import OperationStatus
-from cloudharness_cli.workflows.model.search_result_data import SearchResultData
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+# import models into model package
+from cloudharness_cli.workflows.models.operation import Operation
+from cloudharness_cli.workflows.models.operation_search_result import OperationSearchResult
+from cloudharness_cli.workflows.models.operation_status import OperationStatus
+from cloudharness_cli.workflows.models.search_result_data import SearchResultData
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation.py
new file mode 100644
index 00000000..d5055072
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation.py
@@ -0,0 +1,100 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from datetime import datetime
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from cloudharness_cli.workflows.models.operation_status import OperationStatus
+from typing import Optional, Set
+from typing_extensions import Self
+
+class Operation(BaseModel):
+    """
+    represents the status of a distributed API call
+    """ # noqa: E501
+    message: Optional[StrictStr] = Field(default=None, description="usually set when an error occurred")
+    name: Optional[StrictStr] = Field(default=None, description="operation name")
+    create_time: Optional[datetime] = Field(default=None, alias="createTime")
+    status: Optional[OperationStatus] = OperationStatus.PENDING
+    workflow: Optional[StrictStr] = Field(default=None, description="low level representation as an Argo json")
+    __properties: ClassVar[List[str]] = ["message", "name", "createTime", "status", "workflow"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of Operation from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        * OpenAPI `readOnly` fields are excluded.
+        """
+        excluded_fields: Set[str] = set([
+            "create_time",
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of Operation from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "message": obj.get("message"),
+            "name": obj.get("name"),
+            "createTime": obj.get("createTime"),
+            "status": obj.get("status") if obj.get("status") is not None else OperationStatus.PENDING,
+            "workflow": obj.get("workflow")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_search_result.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_search_result.py
new file mode 100644
index 00000000..6ef72793
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_search_result.py
@@ -0,0 +1,102 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict
+from typing import Any, ClassVar, Dict, List, Optional
+from cloudharness_cli.workflows.models.operation import Operation
+from cloudharness_cli.workflows.models.search_result_data import SearchResultData
+from typing import Optional, Set
+from typing_extensions import Self
+
+class OperationSearchResult(BaseModel):
+    """
+    a list of operations with meta data about the result
+    """ # noqa: E501
+    meta: Optional[SearchResultData] = None
+    items: Optional[List[Operation]] = None
+    __properties: ClassVar[List[str]] = ["meta", "items"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of OperationSearchResult from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of meta
+        if self.meta:
+            _dict['meta'] = self.meta.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in items (list)
+        _items = []
+        if self.items:
+            for _item in self.items:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['items'] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of OperationSearchResult from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "meta": SearchResultData.from_dict(obj["meta"]) if obj.get("meta") is not None else None,
+            "items": [Operation.from_dict(_item) for _item in obj["items"]] if obj.get("items") is not None else None
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_status.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_status.py
new file mode 100644
index 00000000..229b22f3
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/operation_status.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
+
+
+class OperationStatus(str, Enum):
+    """
+    OperationStatus
+    """
+
+    """
+    allowed enum values
+    """
+    PENDING = 'Pending'
+    RUNNING = 'Running'
+    ERROR = 'Error'
+    SUCCEEDED = 'Succeeded'
+    SKIPPED = 'Skipped'
+    FAILED = 'Failed'
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of OperationStatus from a JSON string"""
+        return cls(json.loads(json_str))
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/search_result_data.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/search_result_data.py
new file mode 100644
index 00000000..b9f9766e
--- /dev/null
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/models/search_result_data.py
@@ -0,0 +1,88 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class SearchResultData(BaseModel):
+    """
+    describes a search
+    """ # noqa: E501
+    continue_token: Optional[StrictStr] = Field(default=None, description="token to use for pagination", alias="continueToken")
+    __properties: ClassVar[List[str]] = ["continueToken"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of SearchResultData from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of SearchResultData from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "continueToken": obj.get("continueToken")
+        })
+        return _obj
+
+
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/__init__.py
deleted file mode 100644
index a74c84d9..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.workflows.apis.path_to_api import path_to_api
-
-import enum
-
-
-class PathValues(str, enum.Enum):
-    OPERATIONS = "/operations"
-    OPERATIONS_NAME = "/operations/{name}"
-    OPERATIONS_NAME_LOGS = "/operations/{name}/logs"
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/__init__.py
deleted file mode 100644
index 6c469ed6..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.workflows.paths.operations import Api
-
-from cloudharness_cli.workflows.paths import PathValues
-
-path = PathValues.OPERATIONS
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.py
deleted file mode 100644
index c4a865c1..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.py
+++ /dev/null
@@ -1,330 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-from cloudharness_cli/workflows.model.operation_search_result import OperationSearchResult
-from cloudharness_cli/workflows.model.operation_status import OperationStatus
-
-from . import path
-
-# Query params
-StatusSchema = OperationStatus
-PreviousSearchTokenSchema = schemas.StrSchema
-
-
-class LimitSchema(
-    schemas.IntSchema
-):
-
-
-    class MetaOapg:
-        inclusive_maximum = 50
-        inclusive_minimum = 1
-RequestRequiredQueryParams = typing_extensions.TypedDict(
-    'RequestRequiredQueryParams',
-    {
-    }
-)
-RequestOptionalQueryParams = typing_extensions.TypedDict(
-    'RequestOptionalQueryParams',
-    {
-        'status': typing.Union[StatusSchema, ],
-        'previous_search_token': typing.Union[PreviousSearchTokenSchema, str, ],
-        'limit': typing.Union[LimitSchema, decimal.Decimal, int, ],
-    },
-    total=False
-)
-
-
-class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
-    pass
-
-
-request_query_status = api_client.QueryParameter(
-    name="status",
-    style=api_client.ParameterStyle.FORM,
-    schema=StatusSchema,
-    explode=True,
-)
-request_query_previous_search_token = api_client.QueryParameter(
-    name="previous_search_token",
-    style=api_client.ParameterStyle.FORM,
-    schema=PreviousSearchTokenSchema,
-    explode=True,
-)
-request_query_limit = api_client.QueryParameter(
-    name="limit",
-    style=api_client.ParameterStyle.FORM,
-    schema=LimitSchema,
-    explode=True,
-)
-SchemaFor200ResponseBodyApplicationJson = OperationSearchResult
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '400': _response_for_400,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _list_operations_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _list_operations_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _list_operations_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _list_operations_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        lists operations
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_status,
-            request_query_previous_search_token,
-            request_query_limit,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class ListOperations(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def list_operations(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def list_operations(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def list_operations(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def list_operations(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._list_operations_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._list_operations_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.pyi
deleted file mode 100644
index a7515a36..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations/get.pyi
+++ /dev/null
@@ -1,320 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-from cloudharness_cli/workflows.model.operation_search_result import OperationSearchResult
-from cloudharness_cli/workflows.model.operation_status import OperationStatus
-
-# Query params
-StatusSchema = OperationStatus
-PreviousSearchTokenSchema = schemas.StrSchema
-
-
-class LimitSchema(
-    schemas.IntSchema
-):
-    pass
-RequestRequiredQueryParams = typing_extensions.TypedDict(
-    'RequestRequiredQueryParams',
-    {
-    }
-)
-RequestOptionalQueryParams = typing_extensions.TypedDict(
-    'RequestOptionalQueryParams',
-    {
-        'status': typing.Union[StatusSchema, ],
-        'previous_search_token': typing.Union[PreviousSearchTokenSchema, str, ],
-        'limit': typing.Union[LimitSchema, decimal.Decimal, int, ],
-    },
-    total=False
-)
-
-
-class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams):
-    pass
-
-
-request_query_status = api_client.QueryParameter(
-    name="status",
-    style=api_client.ParameterStyle.FORM,
-    schema=StatusSchema,
-    explode=True,
-)
-request_query_previous_search_token = api_client.QueryParameter(
-    name="previous_search_token",
-    style=api_client.ParameterStyle.FORM,
-    schema=PreviousSearchTokenSchema,
-    explode=True,
-)
-request_query_limit = api_client.QueryParameter(
-    name="limit",
-    style=api_client.ParameterStyle.FORM,
-    schema=LimitSchema,
-    explode=True,
-)
-SchemaFor200ResponseBodyApplicationJson = OperationSearchResult
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor400(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_400 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor400,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _list_operations_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _list_operations_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _list_operations_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _list_operations_oapg(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        lists operations
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParams, query_params)
-        used_path = path.value
-
-        prefix_separator_iterator = None
-        for parameter in (
-            request_query_status,
-            request_query_previous_search_token,
-            request_query_limit,
-        ):
-            parameter_data = query_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            if prefix_separator_iterator is None:
-                prefix_separator_iterator = parameter.get_prefix_separator_iterator()
-            serialized_data = parameter.serialize(parameter_data, prefix_separator_iterator)
-            for serialized_value in serialized_data.values():
-                used_path += serialized_value
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class ListOperations(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def list_operations(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def list_operations(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def list_operations(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def list_operations(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._list_operations_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        query_params: RequestQueryParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._list_operations_oapg(
-            query_params=query_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/__init__.py
deleted file mode 100644
index 5eeb5819..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.workflows.paths.operations_name import Api
-
-from cloudharness_cli.workflows.paths import PathValues
-
-path = PathValues.OPERATIONS_NAME
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.py
deleted file mode 100644
index 9f6542f1..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.py
+++ /dev/null
@@ -1,269 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-from . import path
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '404': _response_for_404,
-}
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _delete_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _delete_operation_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _delete_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _delete_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        deletes operation by name
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-        # TODO add cookie handling
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='delete'.upper(),
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class DeleteOperation(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def delete_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def delete_operation(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_operation_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiFordelete(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def delete(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_operation_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.pyi
deleted file mode 100644
index caa9c4ac..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/delete.pyi
+++ /dev/null
@@ -1,263 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _delete_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _delete_operation_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _delete_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _delete_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        deletes operation by name
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-        # TODO add cookie handling
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='delete'.upper(),
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class DeleteOperation(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def delete_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def delete_operation(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_operation_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiFordelete(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def delete(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def delete(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._delete_operation_oapg(
-            path_params=path_params,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.py
deleted file mode 100644
index cfdd1c54..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.py
+++ /dev/null
@@ -1,327 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-from cloudharness_cli/workflows.model.operation import Operation
-
-from . import path
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-
-
-class SchemaFor200ResponseBodyApplicationJson(
-    schemas.ListSchema
-):
-
-
-    class MetaOapg:
-        
-        @staticmethod
-        def items() -> typing.Type['Operation']:
-            return Operation
-
-    def __new__(
-        cls,
-        arg: typing.Union[typing.Tuple['Operation'], typing.List['Operation']],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'SchemaFor200ResponseBodyApplicationJson':
-        return super().__new__(
-            cls,
-            arg,
-            _configuration=_configuration,
-        )
-
-    def __getitem__(self, i: int) -> 'Operation':
-        return super().__getitem__(i)
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '404': _response_for_404,
-}
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_operation_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        get operation by name
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetOperation(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_operation(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.pyi
deleted file mode 100644
index 6a9f5b25..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name/get.pyi
+++ /dev/null
@@ -1,321 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-from cloudharness_cli/workflows.model.operation import Operation
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-
-
-class SchemaFor200ResponseBodyApplicationJson(
-    schemas.ListSchema
-):
-
-
-    class MetaOapg:
-        
-        @staticmethod
-        def items() -> typing.Type['Operation']:
-            return Operation
-
-    def __new__(
-        cls,
-        arg: typing.Union[typing.Tuple['Operation'], typing.List['Operation']],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'SchemaFor200ResponseBodyApplicationJson':
-        return super().__new__(
-            cls,
-            arg,
-            _configuration=_configuration,
-        )
-
-    def __getitem__(self, i: int) -> 'Operation':
-        return super().__getitem__(i)
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyApplicationJson,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'application/json': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyApplicationJson),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_all_accept_content_types = (
-    'application/json',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _get_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _get_operation_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _get_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _get_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        get operation by name
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class GetOperation(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def get_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get_operation(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._get_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/__init__.py
deleted file mode 100644
index 30638ba2..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from cloudharness_cli.workflows.paths.operations_name_logs import Api
-
-from cloudharness_cli.workflows.paths import PathValues
-
-path = PathValues.OPERATIONS_NAME_LOGS
\ No newline at end of file
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.py
deleted file mode 100644
index 997c4e24..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.py
+++ /dev/null
@@ -1,300 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-from . import path
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyTextPlain = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyTextPlain,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'text/plain': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyTextPlain),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_status_code_to_response = {
-    '200': _response_for_200,
-    '404': _response_for_404,
-}
-_all_accept_content_types = (
-    'text/plain',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _log_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _log_operation_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _log_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _log_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        get operation by name
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class LogOperation(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def log_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def log_operation(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def log_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def log_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._log_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._log_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.pyi b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.pyi
deleted file mode 100644
index 1dd0e8a5..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/paths/operations_name_logs/get.pyi
+++ /dev/null
@@ -1,294 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-from dataclasses import dataclass
-import typing_extensions
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-from cloudharness_cli.workflows import api_client, exceptions
-from datetime import date, datetime  # noqa: F401
-import decimal  # noqa: F401
-import functools  # noqa: F401
-import io  # noqa: F401
-import re  # noqa: F401
-import typing  # noqa: F401
-import typing_extensions  # noqa: F401
-import uuid  # noqa: F401
-
-import frozendict  # noqa: F401
-
-from cloudharness_cli.workflows import schemas  # noqa: F401
-
-# Path params
-NameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing_extensions.TypedDict(
-    'RequestRequiredPathParams',
-    {
-        'name': typing.Union[NameSchema, str, ],
-    }
-)
-RequestOptionalPathParams = typing_extensions.TypedDict(
-    'RequestOptionalPathParams',
-    {
-    },
-    total=False
-)
-
-
-class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
-    pass
-
-
-request_path_name = api_client.PathParameter(
-    name="name",
-    style=api_client.ParameterStyle.SIMPLE,
-    schema=NameSchema,
-    required=True,
-)
-SchemaFor200ResponseBodyTextPlain = schemas.StrSchema
-
-
-@dataclass
-class ApiResponseFor200(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: typing.Union[
-        SchemaFor200ResponseBodyTextPlain,
-    ]
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_200 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor200,
-    content={
-        'text/plain': api_client.MediaType(
-            schema=SchemaFor200ResponseBodyTextPlain),
-    },
-)
-
-
-@dataclass
-class ApiResponseFor404(api_client.ApiResponse):
-    response: urllib3.HTTPResponse
-    body: schemas.Unset = schemas.unset
-    headers: schemas.Unset = schemas.unset
-
-
-_response_for_404 = api_client.OpenApiResponse(
-    response_cls=ApiResponseFor404,
-)
-_all_accept_content_types = (
-    'text/plain',
-)
-
-
-class BaseApi(api_client.Api):
-    @typing.overload
-    def _log_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def _log_operation_oapg(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def _log_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def _log_operation_oapg(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        """
-        get operation by name
-        :param skip_deserialization: If true then api_response.response will be set but
-            api_response.body and api_response.headers will not be deserialized into schema
-            class instances
-        """
-        self._verify_typed_dict_inputs_oapg(RequestPathParams, path_params)
-        used_path = path.value
-
-        _path_params = {}
-        for parameter in (
-            request_path_name,
-        ):
-            parameter_data = path_params.get(parameter.name, schemas.unset)
-            if parameter_data is schemas.unset:
-                continue
-            serialized_data = parameter.serialize(parameter_data)
-            _path_params.update(serialized_data)
-
-        for k, v in _path_params.items():
-            used_path = used_path.replace('{%s}' % k, v)
-
-        _headers = HTTPHeaderDict()
-        # TODO add cookie handling
-        if accept_content_types:
-            for accept_content_type in accept_content_types:
-                _headers.add('Accept', accept_content_type)
-
-        response = self.api_client.call_api(
-            resource_path=used_path,
-            method='get'.upper(),
-            headers=_headers,
-            stream=stream,
-            timeout=timeout,
-        )
-
-        if skip_deserialization:
-            api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-        else:
-            response_for_status = _status_code_to_response.get(str(response.status))
-            if response_for_status:
-                api_response = response_for_status.deserialize(response, self.api_client.configuration)
-            else:
-                api_response = api_client.ApiResponseWithoutDeserialization(response=response)
-
-        if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
-
-        return api_response
-
-
-class LogOperation(BaseApi):
-    # this class is used by api classes that refer to endpoints with operationId fn names
-
-    @typing.overload
-    def log_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def log_operation(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def log_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def log_operation(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._log_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
-class ApiForget(BaseApi):
-    # this class is used by api classes that refer to endpoints by path and http method names
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: typing_extensions.Literal[False] = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-    ]: ...
-
-    @typing.overload
-    def get(
-        self,
-        skip_deserialization: typing_extensions.Literal[True],
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> api_client.ApiResponseWithoutDeserialization: ...
-
-    @typing.overload
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = ...,
-    ) -> typing.Union[
-        ApiResponseFor200,
-        api_client.ApiResponseWithoutDeserialization,
-    ]: ...
-
-    def get(
-        self,
-        path_params: RequestPathParams = frozendict.frozendict(),
-        accept_content_types: typing.Tuple[str] = _all_accept_content_types,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-        skip_deserialization: bool = False,
-    ):
-        return self._log_operation_oapg(
-            path_params=path_params,
-            accept_content_types=accept_content_types,
-            stream=stream,
-            timeout=timeout,
-            skip_deserialization=skip_deserialization
-        )
-
-
diff --git a/libraries/client/cloudharness_cli/test/common/test_paths/test_sentry_getdsn_appname/__init__.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/py.typed
similarity index 100%
rename from libraries/client/cloudharness_cli/test/common/test_paths/test_sentry_getdsn_appname/__init__.py
rename to libraries/client/cloudharness_cli/cloudharness_cli/workflows/py.typed
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/rest.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/rest.py
index c2b38f9b..977cb4d0 100644
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/rest.py
+++ b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/rest.py
@@ -3,35 +3,67 @@
 """
     Workflows API
 
-    Workflows API  # noqa: E501
+    Workflows API
 
     The version of the OpenAPI document: 0.1.0
     Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
 
-import logging
+
+import io
+import json
+import re
 import ssl
-from urllib.parse import urlencode
-import typing
 
-import certifi
 import urllib3
-from urllib3._collections import HTTPHeaderDict
 
 from cloudharness_cli.workflows.exceptions import ApiException, ApiValueError
 
+SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"}
+RESTResponseType = urllib3.HTTPResponse
+
+
+def is_socks_proxy_url(url):
+    if url is None:
+        return False
+    split_section = url.split("://")
+    if len(split_section) < 2:
+        return False
+    else:
+        return split_section[0].lower() in SUPPORTED_SOCKS_PROXIES
+
+
+class RESTResponse(io.IOBase):
+
+    def __init__(self, resp) -> None:
+        self.response = resp
+        self.status = resp.status
+        self.reason = resp.reason
+        self.data = None
+
+    def read(self):
+        if self.data is None:
+            self.data = self.response.data
+        return self.data
+
+    def getheaders(self):
+        """Returns a dictionary of the response headers."""
+        return self.response.headers
 
-logger = logging.getLogger(__name__)
+    def getheader(self, name, default=None):
+        """Returns a given response header."""
+        return self.response.headers.get(name, default)
 
 
-class RESTClientObject(object):
+class RESTClientObject:
 
-    def __init__(self, configuration, pools_size=4, maxsize=None):
+    def __init__(self, configuration) -> None:
         # urllib3.PoolManager will pass all kw parameters to connectionpool
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
         # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
-        # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
         # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
 
         # cert_reqs
@@ -40,140 +72,167 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         else:
             cert_reqs = ssl.CERT_NONE
 
-        # ca_certs
-        if configuration.ssl_ca_cert:
-            ca_certs = configuration.ssl_ca_cert
-        else:
-            # if not set certificate file, use Mozilla's root certificates.
-            ca_certs = certifi.where()
-
-        addition_pool_args = {}
+        pool_args = {
+            "cert_reqs": cert_reqs,
+            "ca_certs": configuration.ssl_ca_cert,
+            "cert_file": configuration.cert_file,
+            "key_file": configuration.key_file,
+        }
         if configuration.assert_hostname is not None:
-            addition_pool_args['assert_hostname'] = configuration.assert_hostname  # noqa: E501
+            pool_args['assert_hostname'] = (
+                configuration.assert_hostname
+            )
 
         if configuration.retries is not None:
-            addition_pool_args['retries'] = configuration.retries
+            pool_args['retries'] = configuration.retries
+
+        if configuration.tls_server_name:
+            pool_args['server_hostname'] = configuration.tls_server_name
+
 
         if configuration.socket_options is not None:
-            addition_pool_args['socket_options'] = configuration.socket_options
+            pool_args['socket_options'] = configuration.socket_options
 
-        if maxsize is None:
-            if configuration.connection_pool_maxsize is not None:
-                maxsize = configuration.connection_pool_maxsize
-            else:
-                maxsize = 4
+        if configuration.connection_pool_maxsize is not None:
+            pool_args['maxsize'] = configuration.connection_pool_maxsize
 
         # https pool manager
+        self.pool_manager: urllib3.PoolManager
+
         if configuration.proxy:
-            self.pool_manager = urllib3.ProxyManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                proxy_url=configuration.proxy,
-                proxy_headers=configuration.proxy_headers,
-                **addition_pool_args
-            )
+            if is_socks_proxy_url(configuration.proxy):
+                from urllib3.contrib.socks import SOCKSProxyManager
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["headers"] = configuration.proxy_headers
+                self.pool_manager = SOCKSProxyManager(**pool_args)
+            else:
+                pool_args["proxy_url"] = configuration.proxy
+                pool_args["proxy_headers"] = configuration.proxy_headers
+                self.pool_manager = urllib3.ProxyManager(**pool_args)
         else:
-            self.pool_manager = urllib3.PoolManager(
-                num_pools=pools_size,
-                maxsize=maxsize,
-                cert_reqs=cert_reqs,
-                ca_certs=ca_certs,
-                cert_file=configuration.cert_file,
-                key_file=configuration.key_file,
-                **addition_pool_args
-            )
+            self.pool_manager = urllib3.PoolManager(**pool_args)
 
     def request(
         self,
-        method: str,
-        url: str,
-        headers: typing.Optional[HTTPHeaderDict] = None,
-        fields: typing.Optional[typing.Tuple[typing.Tuple[str, typing.Any], ...]] = None,
-        body: typing.Optional[typing.Union[str, bytes]] = None,
-        stream: bool = False,
-        timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
-    ) -> urllib3.HTTPResponse:
+        method,
+        url,
+        headers=None,
+        body=None,
+        post_params=None,
+        _request_timeout=None
+    ):
         """Perform requests.
 
         :param method: http request method
         :param url: http request url
         :param headers: http request headers
-        :param body: request body, for other types
-        :param fields: request parameters for
-                                `application/x-www-form-urlencoded`
-                                or `multipart/form-data`
-        :param stream: if True, the urllib3.HTTPResponse object will
-                                be returned without reading/decoding response
-                                data. Default is False.
-        :param timeout: timeout setting for this request. If one
-                                number provided, it will be total request
-                                timeout. It can also be a pair (tuple) of
-                                (connection, read) timeouts.
+        :param body: request json body, for `application/json`
+        :param post_params: request post parameters,
+                            `application/x-www-form-urlencoded`
+                            and `multipart/form-data`
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in ['GET', 'HEAD', 'DELETE', 'POST', 'PUT',
-                          'PATCH', 'OPTIONS']
-
-        if fields and body:
+        assert method in [
+            'GET',
+            'HEAD',
+            'DELETE',
+            'POST',
+            'PUT',
+            'PATCH',
+            'OPTIONS'
+        ]
+
+        if post_params and body:
             raise ApiValueError(
-                "body parameter cannot be used with fields parameter."
+                "body parameter cannot be used with post_params parameter."
             )
 
-        fields = fields or {}
+        post_params = post_params or {}
         headers = headers or {}
 
-        if timeout:
-            if isinstance(timeout, (int, float)):  # noqa: E501,F821
-                timeout = urllib3.Timeout(total=timeout)
-            elif (isinstance(timeout, tuple) and
-                  len(timeout) == 2):
-                timeout = urllib3.Timeout(connect=timeout[0], read=timeout[1])
+        timeout = None
+        if _request_timeout:
+            if isinstance(_request_timeout, (int, float)):
+                timeout = urllib3.Timeout(total=_request_timeout)
+            elif (
+                    isinstance(_request_timeout, tuple)
+                    and len(_request_timeout) == 2
+                ):
+                timeout = urllib3.Timeout(
+                    connect=_request_timeout[0],
+                    read=_request_timeout[1]
+                )
 
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
             if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
-                if 'Content-Type' not in headers and body is None:
+
+                # no content type provided or payload is json
+                content_type = headers.get('Content-Type')
+                if (
+                    not content_type
+                    or re.search('json', content_type, re.IGNORECASE)
+                ):
+                    request_body = None
+                    if body is not None:
+                        request_body = json.dumps(body)
                     r = self.pool_manager.request(
                         method,
                         url,
-                        preload_content=not stream,
+                        body=request_body,
                         timeout=timeout,
-                        headers=headers
+                        headers=headers,
+                        preload_content=False
                     )
-                elif headers['Content-Type'] == 'application/x-www-form-urlencoded':  # noqa: E501
+                elif content_type == 'application/x-www-form-urlencoded':
                     r = self.pool_manager.request(
-                        method, url,
-                        body=body,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=False,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
-                elif headers['Content-Type'] == 'multipart/form-data':
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif content_type == 'multipart/form-data':
                     # must del headers['Content-Type'], or the correct
                     # Content-Type which generated by urllib3 will be
                     # overwritten.
                     del headers['Content-Type']
+                    # Ensures that dict objects are serialized
+                    post_params = [(a, json.dumps(b)) if isinstance(b, dict) else (a,b) for a, b in post_params]
                     r = self.pool_manager.request(
-                        method, url,
-                        fields=fields,
+                        method,
+                        url,
+                        fields=post_params,
                         encode_multipart=True,
-                        preload_content=not stream,
                         timeout=timeout,
-                        headers=headers)
+                        headers=headers,
+                        preload_content=False
+                    )
                 # Pass a `string` parameter directly in the body to support
-                # other content types than Json when `body` argument is
-                # provided in serialized form
+                # other content types than JSON when `body` argument is
+                # provided in serialized form.
                 elif isinstance(body, str) or isinstance(body, bytes):
-                    request_body = body
                     r = self.pool_manager.request(
-                        method, url,
+                        method,
+                        url,
+                        body=body,
+                        timeout=timeout,
+                        headers=headers,
+                        preload_content=False
+                    )
+                elif headers['Content-Type'] == 'text/plain' and isinstance(body, bool):
+                    request_body = "true" if body else "false"
+                    r = self.pool_manager.request(
+                        method,
+                        url,
                         body=request_body,
-                        preload_content=not stream,
+                        preload_content=False,
                         timeout=timeout,
                         headers=headers)
                 else:
@@ -184,72 +243,16 @@ def request(
                     raise ApiException(status=0, reason=msg)
             # For `GET`, `HEAD`
             else:
-                r = self.pool_manager.request(method, url,
-                                              preload_content=not stream,
-                                              timeout=timeout,
-                                              headers=headers)
+                r = self.pool_manager.request(
+                    method,
+                    url,
+                    fields={},
+                    timeout=timeout,
+                    headers=headers,
+                    preload_content=False
+                )
         except urllib3.exceptions.SSLError as e:
-            msg = "{0}\n{1}".format(type(e).__name__, str(e))
+            msg = "\n".join([type(e).__name__, str(e)])
             raise ApiException(status=0, reason=msg)
 
-        if not stream:
-            # log response body
-            logger.debug("response body: %s", r.data)
-
-        return r
-
-    def GET(self, url, headers=None, stream=False,
-            timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("GET", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def HEAD(self, url, headers=None, stream=False,
-             timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("HEAD", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            fields=fields)
-
-    def OPTIONS(self, url, headers=None,
-                body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("OPTIONS", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def DELETE(self, url, headers=None, body=None,
-               stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("DELETE", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def POST(self, url, headers=None,
-             body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("POST", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PUT(self, url, headers=None,
-            body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PUT", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
-
-    def PATCH(self, url, headers=None,
-              body=None, stream=False, timeout=None, fields=None) -> urllib3.HTTPResponse:
-        return self.request("PATCH", url,
-                            headers=headers,
-                            stream=stream,
-                            timeout=timeout,
-                            body=body, fields=fields)
+        return RESTResponse(r)
diff --git a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/schemas.py b/libraries/client/cloudharness_cli/cloudharness_cli/workflows/schemas.py
deleted file mode 100644
index 6f66f649..00000000
--- a/libraries/client/cloudharness_cli/cloudharness_cli/workflows/schemas.py
+++ /dev/null
@@ -1,2463 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-from collections import defaultdict
-from datetime import date, datetime, timedelta  # noqa: F401
-import functools
-import decimal
-import io
-import re
-import types
-import typing
-import uuid
-
-from dateutil.parser.isoparser import isoparser, _takes_ascii
-import frozendict
-
-from cloudharness_cli.workflows.exceptions import (
-    ApiTypeError,
-    ApiValueError,
-)
-from cloudharness_cli.workflows.configuration import (
-    Configuration,
-)
-
-
-class Unset(object):
-    """
-    An instance of this class is set as the default value for object type(dict) properties that are optional
-    When a property has an unset value, that property will not be assigned in the dict
-    """
-    pass
-
-unset = Unset()
-
-none_type = type(None)
-file_type = io.IOBase
-
-
-class FileIO(io.FileIO):
-    """
-    A class for storing files
-    Note: this class is not immutable
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(arg, (io.FileIO, io.BufferedReader)):
-            if arg.closed:
-                raise ApiValueError('Invalid file state; file is closed and must be open')
-            arg.close()
-            inst = super(FileIO, cls).__new__(cls, arg.name)
-            super(FileIO, inst).__init__(arg.name)
-            return inst
-        raise ApiValueError('FileIO must be passed arg which contains the open file')
-
-    def __init__(self, arg: typing.Union[io.FileIO, io.BufferedReader]):
-        pass
-
-
-def update(d: dict, u: dict):
-    """
-    Adds u to d
-    Where each dict is defaultdict(set)
-    """
-    if not u:
-        return d
-    for k, v in u.items():
-        if k not in d:
-            d[k] = v
-        else:
-            d[k] = d[k] | v
-
-
-class ValidationMetadata(frozendict.frozendict):
-    """
-    A class storing metadata that is needed to validate OpenApi Schema payloads
-    """
-    def __new__(
-        cls,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-        from_server: bool = False,
-        configuration: typing.Optional[Configuration] = None,
-        seen_classes: typing.FrozenSet[typing.Type] = frozenset(),
-        validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]] = frozendict.frozendict()
-    ):
-        """
-        Args:
-            path_to_item: the path to the current data being instantiated.
-                For {'a': [1]} if the code is handling, 1, then the path is ('args[0]', 'a', 0)
-                This changes from location to location
-            from_server: whether or not this data came form the server
-                True when receiving server data
-                False when instantiating model with client side data not form the server
-                This does not change from location to location
-            configuration: the Configuration instance to use
-                This is needed because in Configuration:
-                - one can disable validation checking
-                This does not change from location to location
-            seen_classes: when deserializing data that matches multiple schemas, this is used to store
-                the schemas that have been traversed. This is used to stop processing when a cycle is seen.
-                This changes from location to location
-            validated_path_to_schemas: stores the already validated schema classes for a given path location
-                This does not change from location to location
-        """
-        return super().__new__(
-            cls,
-            path_to_item=path_to_item,
-            from_server=from_server,
-            configuration=configuration,
-            seen_classes=seen_classes,
-            validated_path_to_schemas=validated_path_to_schemas
-        )
-
-    def validation_ran_earlier(self, cls: type) -> bool:
-        validated_schemas = self.validated_path_to_schemas.get(self.path_to_item, set())
-        validation_ran_earlier = validated_schemas and cls in validated_schemas
-        if validation_ran_earlier:
-            return True
-        if cls in self.seen_classes:
-            return True
-        return False
-
-    @property
-    def path_to_item(self) -> typing.Tuple[typing.Union[str, int], ...]:
-        return self.get('path_to_item')
-
-    @property
-    def from_server(self) -> bool:
-        return self.get('from_server')
-
-    @property
-    def configuration(self) -> typing.Optional[Configuration]:
-        return self.get('configuration')
-
-    @property
-    def seen_classes(self) -> typing.FrozenSet[typing.Type]:
-        return self.get('seen_classes')
-
-    @property
-    def validated_path_to_schemas(self) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]]:
-        return self.get('validated_path_to_schemas')
-
-
-class Singleton:
-    """
-    Enums and singletons are the same
-    The same instance is returned for a given key of (cls, arg)
-    """
-    _instances = {}
-
-    def __new__(cls, arg: typing.Any, **kwargs):
-        """
-        cls base classes: BoolClass, NoneClass, str, decimal.Decimal
-        The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
-        However 1.0  can also be ingested into that enum schema because 1.0 == 1 and
-        Decimal('1.0') == Decimal('1')
-        But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
-        and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
-        """
-        key = (cls, arg, str(arg))
-        if key not in cls._instances:
-            if isinstance(arg, (none_type, bool, BoolClass, NoneClass)):
-                inst = super().__new__(cls)
-                cls._instances[key] = inst
-            else:
-                cls._instances[key] = super().__new__(cls, arg)
-        return cls._instances[key]
-
-    def __repr__(self):
-        if isinstance(self, NoneClass):
-            return f'<{self.__class__.__name__}: None>'
-        elif isinstance(self, BoolClass):
-            if bool(self):
-                return f'<{self.__class__.__name__}: True>'
-            return f'<{self.__class__.__name__}: False>'
-        return f'<{self.__class__.__name__}: {super().__repr__()}>'
-
-
-class classproperty:
-
-    def __init__(self, fget):
-        self.fget = fget
-
-    def __get__(self, owner_self, owner_cls):
-        return self.fget(owner_cls)
-
-
-class NoneClass(Singleton):
-    @classproperty
-    def NONE(cls):
-        return cls(None)
-
-    def __bool__(self) -> bool:
-        return False
-
-
-class BoolClass(Singleton):
-    @classproperty
-    def TRUE(cls):
-        return cls(True)
-
-    @classproperty
-    def FALSE(cls):
-        return cls(False)
-
-    @functools.lru_cache()
-    def __bool__(self) -> bool:
-        for key, instance in self._instances.items():
-            if self is instance:
-                return bool(key[1])
-        raise ValueError('Unable to find the boolean value of this instance')
-
-
-class MetaOapgTyped:
-    exclusive_maximum: typing.Union[int, float]
-    inclusive_maximum: typing.Union[int, float]
-    exclusive_minimum: typing.Union[int, float]
-    inclusive_minimum: typing.Union[int, float]
-    max_items: int
-    min_items: int
-    discriminator: typing.Dict[str, typing.Dict[str, typing.Type['Schema']]]
-
-
-    class properties:
-        # to hold object properties
-        pass
-
-    additional_properties: typing.Optional[typing.Type['Schema']]
-    max_properties: int
-    min_properties: int
-    all_of: typing.List[typing.Type['Schema']]
-    one_of: typing.List[typing.Type['Schema']]
-    any_of: typing.List[typing.Type['Schema']]
-    not_schema: typing.Type['Schema']
-    max_length: int
-    min_length: int
-    items: typing.Type['Schema']
-
-
-class Schema:
-    """
-    the base class of all swagger/openapi schemas/models
-    """
-    __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    _types: typing.Set[typing.Type]
-    MetaOapg = MetaOapgTyped
-
-    @staticmethod
-    def __get_valid_classes_phrase(input_classes):
-        """Returns a string phrase describing what types are allowed"""
-        all_classes = list(input_classes)
-        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-        all_class_names = [cls.__name__ for cls in all_classes]
-        if len(all_class_names) == 1:
-            return "is {0}".format(all_class_names[0])
-        return "is one of [{0}]".format(", ".join(all_class_names))
-
-    @staticmethod
-    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
-        if isinstance(item_cls, types.FunctionType):
-            # referenced schema
-            return item_cls()
-        elif isinstance(item_cls, staticmethod):
-            # referenced schema
-            return item_cls.__func__()
-        return item_cls
-
-    @classmethod
-    def __type_error_message(
-        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-    ):
-        """
-        Keyword Args:
-            var_value (any): the variable which has the type_error
-            var_name (str): the name of the variable which has the typ error
-            valid_classes (tuple): the accepted classes for current_item's
-                                      value
-            key_type (bool): False if our value is a value in a dict
-                             True if it is a key in a dict
-                             False if our item is an item in a tuple
-        """
-        key_or_value = "value"
-        if key_type:
-            key_or_value = "key"
-        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-        msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
-            var_name,
-            key_or_value,
-            valid_classes_phrase,
-            type(var_value).__name__,
-        )
-        return msg
-
-    @classmethod
-    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-        error_msg = cls.__type_error_message(
-            var_name=path_to_item[-1],
-            var_value=var_value,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-        return ApiTypeError(
-            error_msg,
-            path_to_item=path_to_item,
-            valid_classes=valid_classes,
-            key_type=key_type,
-        )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        Schema _validate_oapg
-        All keyword validation except for type checking was done in calling stack frames
-        If those validations passed, the validated classes are collected in path_to_schemas
-
-        Returns:
-            path_to_schemas: a map of path to schemas
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        base_class = type(arg)
-        if base_class not in cls._types:
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                cls._types,
-                key_type=False,
-            )
-
-        path_to_schemas = {validation_metadata.path_to_item: set()}
-        path_to_schemas[validation_metadata.path_to_item].add(cls)
-        path_to_schemas[validation_metadata.path_to_item].add(base_class)
-        return path_to_schemas
-
-    @staticmethod
-    def _process_schema_classes_oapg(
-        schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
-    ):
-        """
-        Processes and mutates schema_classes
-        If a SomeSchema is a subclass of DictSchema then remove DictSchema because it is already included
-        """
-        if len(schema_classes) < 2:
-            return
-        if len(schema_classes) > 2 and UnsetAnyTypeSchema in schema_classes:
-            schema_classes.remove(UnsetAnyTypeSchema)
-        x_schema = schema_type_classes & schema_classes
-        if not x_schema:
-            return
-        x_schema = x_schema.pop()
-        if any(c is not x_schema and issubclass(c, x_schema) for c in schema_classes):
-            # needed to not have a mro error in get_new_class
-            schema_classes.remove(x_schema)
-
-    @classmethod
-    def __get_new_cls(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]:
-        """
-        Make a new dynamic class and return an instance of that class
-        We are making an instance of cls, but instead of making cls
-        make a new class, new_cls
-        which includes dynamic bases including cls
-        return an instance of that new class
-
-        Dict property + List Item Assignment Use cases:
-        1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
-            where the key is the path to the item, and the value will be the required manufactured class
-            made out of the matching schemas
-        2. value is an instance of the the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
-            because value is of the correct type, and validation was run earlier when the instance was created
-        """
-        _path_to_schemas = {}
-        if validation_metadata.validated_path_to_schemas:
-            update(_path_to_schemas, validation_metadata.validated_path_to_schemas)
-        if not validation_metadata.validation_ran_earlier(cls):
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(_path_to_schemas, other_path_to_schemas)
-        # loop through it make a new class for each entry
-        # do not modify the returned result because it is cached and we would be modifying the cached value
-        path_to_schemas = {}
-        for path, schema_classes in _path_to_schemas.items():
-            """
-            Use cases
-            1. N number of schema classes + enum + type != bool/None, classes in path_to_schemas: tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-                needs Singleton added
-            2. N number of schema classes + enum + type == bool/None, classes in path_to_schemas: BoolClass/NoneClass
-                Singleton already added
-            3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
-            """
-            cls._process_schema_classes_oapg(schema_classes)
-            enum_schema = any(
-                issubclass(this_cls, EnumBase) for this_cls in schema_classes)
-            inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
-            chosen_schema_classes = schema_classes - inheritable_primitive_type
-            suffix = tuple(inheritable_primitive_type)
-            if enum_schema and suffix[0] not in {NoneClass, BoolClass}:
-                suffix = (Singleton,) + suffix
-
-            used_classes = tuple(sorted(chosen_schema_classes, key=lambda a_cls: a_cls.__name__)) + suffix
-            mfg_cls = get_new_class(class_name='DynamicSchema', bases=used_classes)
-            path_to_schemas[path] = mfg_cls
-
-        return path_to_schemas
-
-    @classmethod
-    def _get_new_instance_without_conversion_oapg(
-        cls,
-        arg: typing.Any,
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        # We have a Dynamic class and we are making an instance of it
-        if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, properties)
-        elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
-            return super(Schema, cls).__new__(cls, items)
-        """
-        str = openapi str, date, and datetime
-        decimal.Decimal = openapi int and float
-        FileIO = openapi binary type and the user inputs a file
-        bytes = openapi binary type and the user inputs bytes
-        """
-        return super(Schema, cls).__new__(cls, arg)
-
-    @classmethod
-    def from_openapi_data_oapg(
-        cls,
-        arg: typing.Union[
-            str,
-            date,
-            datetime,
-            int,
-            float,
-            decimal.Decimal,
-            bool,
-            None,
-            'Schema',
-            dict,
-            frozendict.frozendict,
-            tuple,
-            list,
-            io.FileIO,
-            io.BufferedReader,
-            bytes
-        ],
-        _configuration: typing.Optional[Configuration]
-    ):
-        """
-        Schema from_openapi_data_oapg
-        """
-        from_server = True
-        validated_path_to_schemas = {}
-        arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas)
-        validation_metadata = ValidationMetadata(
-            from_server=from_server, configuration=_configuration, validated_path_to_schemas=validated_path_to_schemas)
-        path_to_schemas = cls.__get_new_cls(arg, validation_metadata)
-        new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
-            arg,
-            validation_metadata.path_to_item,
-            path_to_schemas
-        )
-        return new_inst
-
-    @staticmethod
-    def __get_input_dict(*args, **kwargs) -> frozendict.frozendict:
-        input_dict = {}
-        if args and isinstance(args[0], (dict, frozendict.frozendict)):
-            input_dict.update(args[0])
-        if kwargs:
-            input_dict.update(kwargs)
-        return frozendict.frozendict(input_dict)
-
-    @staticmethod
-    def __remove_unsets(kwargs):
-        return {key: val for key, val in kwargs.items() if val is not unset}
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
-        """
-        Schema __new__
-
-        Args:
-            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
-            kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the Configuration that enables json schema validation keywords
-                like minItems, minLength etc
-
-        Note: double underscores are used here because pycharm thinks that these variables
-        are instance properties if they are named normally :(
-        """
-        __kwargs = cls.__remove_unsets(kwargs)
-        if not args and not __kwargs:
-            raise TypeError(
-                'No input given. args or kwargs must be given.'
-            )
-        if not __kwargs and args and not isinstance(args[0], dict):
-            __arg = args[0]
-        else:
-            __arg = cls.__get_input_dict(*args, **__kwargs)
-        __from_server = False
-        __validated_path_to_schemas = {}
-        __arg = cast_to_allowed_types(
-            __arg, __from_server, __validated_path_to_schemas)
-        __validation_metadata = ValidationMetadata(
-            configuration=_configuration, from_server=__from_server, validated_path_to_schemas=__validated_path_to_schemas)
-        __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata)
-        __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
-            __arg,
-            __validation_metadata.path_to_item,
-            __path_to_schemas
-        )
-
-    def __init__(
-        self,
-        *args: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[Configuration] = None,
-        **kwargs: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
-        ]
-    ):
-        """
-        this is needed to fix 'Unexpected argument' warning in pycharm
-        this code does nothing because all Schema instances are immutable
-        this means that all input data is passed into and used in new, and after the new instance is made
-        no new attributes are assigned and init is not used
-        """
-        pass
-
-"""
-import itertools
-data_types = ('None', 'FrozenDict', 'Tuple', 'Str', 'Decimal', 'Bool')
-type_to_cls = {
-    'None': 'NoneClass',
-    'FrozenDict': 'frozendict.frozendict',
-    'Tuple': 'tuple',
-    'Str': 'str',
-    'Decimal': 'decimal.Decimal',
-    'Bool': 'BoolClass'
-}
-cls_tuples = [v for v in itertools.combinations(data_types, 5)]
-typed_classes = [f"class {''.join(cls_tuple)}Mixin({', '.join(type_to_cls[typ] for typ in cls_tuple)}):\n    pass" for cls_tuple in cls_tuples]
-for cls in typed_classes:
-    print(cls)
-object_classes = [f"{''.join(cls_tuple)}Mixin = object" for cls_tuple in cls_tuples]
-for cls in object_classes:
-    print(cls)
-"""
-if typing.TYPE_CHECKING:
-    # qty 1
-    NoneMixin = NoneClass
-    FrozenDictMixin = frozendict.frozendict
-    TupleMixin = tuple
-    StrMixin = str
-    DecimalMixin = decimal.Decimal
-    BoolMixin = BoolClass
-    BytesMixin = bytes
-    FileMixin = FileIO
-    # qty 2
-    class BinaryMixin(bytes, FileIO):
-        pass
-    class NoneFrozenDictMixin(NoneClass, frozendict.frozendict):
-        pass
-    class NoneTupleMixin(NoneClass, tuple):
-        pass
-    class NoneStrMixin(NoneClass, str):
-        pass
-    class NoneDecimalMixin(NoneClass, decimal.Decimal):
-        pass
-    class NoneBoolMixin(NoneClass, BoolClass):
-        pass
-    class FrozenDictTupleMixin(frozendict.frozendict, tuple):
-        pass
-    class FrozenDictStrMixin(frozendict.frozendict, str):
-        pass
-    class FrozenDictDecimalMixin(frozendict.frozendict, decimal.Decimal):
-        pass
-    class FrozenDictBoolMixin(frozendict.frozendict, BoolClass):
-        pass
-    class TupleStrMixin(tuple, str):
-        pass
-    class TupleDecimalMixin(tuple, decimal.Decimal):
-        pass
-    class TupleBoolMixin(tuple, BoolClass):
-        pass
-    class StrDecimalMixin(str, decimal.Decimal):
-        pass
-    class StrBoolMixin(str, BoolClass):
-        pass
-    class DecimalBoolMixin(decimal.Decimal, BoolClass):
-        pass
-    # qty 3
-    class NoneFrozenDictTupleMixin(NoneClass, frozendict.frozendict, tuple):
-        pass
-    class NoneFrozenDictStrMixin(NoneClass, frozendict.frozendict, str):
-        pass
-    class NoneFrozenDictDecimalMixin(NoneClass, frozendict.frozendict, decimal.Decimal):
-        pass
-    class NoneFrozenDictBoolMixin(NoneClass, frozendict.frozendict, BoolClass):
-        pass
-    class NoneTupleStrMixin(NoneClass, tuple, str):
-        pass
-    class NoneTupleDecimalMixin(NoneClass, tuple, decimal.Decimal):
-        pass
-    class NoneTupleBoolMixin(NoneClass, tuple, BoolClass):
-        pass
-    class NoneStrDecimalMixin(NoneClass, str, decimal.Decimal):
-        pass
-    class NoneStrBoolMixin(NoneClass, str, BoolClass):
-        pass
-    class NoneDecimalBoolMixin(NoneClass, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrMixin(frozendict.frozendict, tuple, str):
-        pass
-    class FrozenDictTupleDecimalMixin(frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class FrozenDictTupleBoolMixin(frozendict.frozendict, tuple, BoolClass):
-        pass
-    class FrozenDictStrDecimalMixin(frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class FrozenDictStrBoolMixin(frozendict.frozendict, str, BoolClass):
-        pass
-    class FrozenDictDecimalBoolMixin(frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalMixin(tuple, str, decimal.Decimal):
-        pass
-    class TupleStrBoolMixin(tuple, str, BoolClass):
-        pass
-    class TupleDecimalBoolMixin(tuple, decimal.Decimal, BoolClass):
-        pass
-    class StrDecimalBoolMixin(str, decimal.Decimal, BoolClass):
-        pass
-    # qty 4
-    class NoneFrozenDictTupleStrMixin(NoneClass, frozendict.frozendict, tuple, str):
-        pass
-    class NoneFrozenDictTupleDecimalMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleBoolMixin(NoneClass, frozendict.frozendict, tuple, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictStrBoolMixin(NoneClass, frozendict.frozendict, str, BoolClass):
-        pass
-    class NoneFrozenDictDecimalBoolMixin(NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalMixin(NoneClass, tuple, str, decimal.Decimal):
-        pass
-    class NoneTupleStrBoolMixin(NoneClass, tuple, str, BoolClass):
-        pass
-    class NoneTupleDecimalBoolMixin(NoneClass, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneStrDecimalBoolMixin(NoneClass, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalMixin(frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class FrozenDictTupleStrBoolMixin(frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class FrozenDictTupleDecimalBoolMixin(frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictStrDecimalBoolMixin(frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class TupleStrDecimalBoolMixin(tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal):
-        pass
-    class NoneFrozenDictTupleStrBoolMixin(NoneClass, frozendict.frozendict, tuple, str, BoolClass):
-        pass
-    class NoneFrozenDictTupleDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass):
-        pass
-    class NoneFrozenDictStrDecimalBoolMixin(NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass):
-        pass
-    class NoneTupleStrDecimalBoolMixin(NoneClass, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    class FrozenDictTupleStrDecimalBoolMixin(frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
-        pass
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
-        pass
-else:
-    # qty 1
-    class NoneMixin:
-        _types = {NoneClass}
-    class FrozenDictMixin:
-        _types = {frozendict.frozendict}
-    class TupleMixin:
-        _types = {tuple}
-    class StrMixin:
-        _types = {str}
-    class DecimalMixin:
-        _types = {decimal.Decimal}
-    class BoolMixin:
-        _types = {BoolClass}
-    class BytesMixin:
-        _types = {bytes}
-    class FileMixin:
-        _types = {FileIO}
-    # qty 2
-    class BinaryMixin:
-        _types = {bytes, FileIO}
-    class NoneFrozenDictMixin:
-        _types = {NoneClass, frozendict.frozendict}
-    class NoneTupleMixin:
-        _types = {NoneClass, tuple}
-    class NoneStrMixin:
-        _types = {NoneClass, str}
-    class NoneDecimalMixin:
-        _types = {NoneClass, decimal.Decimal}
-    class NoneBoolMixin:
-        _types = {NoneClass, BoolClass}
-    class FrozenDictTupleMixin:
-        _types = {frozendict.frozendict, tuple}
-    class FrozenDictStrMixin:
-        _types = {frozendict.frozendict, str}
-    class FrozenDictDecimalMixin:
-        _types = {frozendict.frozendict, decimal.Decimal}
-    class FrozenDictBoolMixin:
-        _types = {frozendict.frozendict, BoolClass}
-    class TupleStrMixin:
-        _types = {tuple, str}
-    class TupleDecimalMixin:
-        _types = {tuple, decimal.Decimal}
-    class TupleBoolMixin:
-        _types = {tuple, BoolClass}
-    class StrDecimalMixin:
-        _types = {str, decimal.Decimal}
-    class StrBoolMixin:
-        _types = {str, BoolClass}
-    class DecimalBoolMixin:
-        _types = {decimal.Decimal, BoolClass}
-    # qty 3
-    class NoneFrozenDictTupleMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple}
-    class NoneFrozenDictStrMixin:
-        _types = {NoneClass, frozendict.frozendict, str}
-    class NoneFrozenDictDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
-    class NoneFrozenDictBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, BoolClass}
-    class NoneTupleStrMixin:
-        _types = {NoneClass, tuple, str}
-    class NoneTupleDecimalMixin:
-        _types = {NoneClass, tuple, decimal.Decimal}
-    class NoneTupleBoolMixin:
-        _types = {NoneClass, tuple, BoolClass}
-    class NoneStrDecimalMixin:
-        _types = {NoneClass, str, decimal.Decimal}
-    class NoneStrBoolMixin:
-        _types = {NoneClass, str, BoolClass}
-    class NoneDecimalBoolMixin:
-        _types = {NoneClass, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrMixin:
-        _types = {frozendict.frozendict, tuple, str}
-    class FrozenDictTupleDecimalMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal}
-    class FrozenDictTupleBoolMixin:
-        _types = {frozendict.frozendict, tuple, BoolClass}
-    class FrozenDictStrDecimalMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal}
-    class FrozenDictStrBoolMixin:
-        _types = {frozendict.frozendict, str, BoolClass}
-    class FrozenDictDecimalBoolMixin:
-        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
-    class TupleStrDecimalMixin:
-        _types = {tuple, str, decimal.Decimal}
-    class TupleStrBoolMixin:
-        _types = {tuple, str, BoolClass}
-    class TupleDecimalBoolMixin:
-        _types = {tuple, decimal.Decimal, BoolClass}
-    class StrDecimalBoolMixin:
-        _types = {str, decimal.Decimal, BoolClass}
-    # qty 4
-    class NoneFrozenDictTupleStrMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str}
-    class NoneFrozenDictTupleDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
-    class NoneFrozenDictTupleBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
-    class NoneFrozenDictStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
-    class NoneFrozenDictStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
-    class NoneFrozenDictDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal}
-    class NoneTupleStrBoolMixin:
-        _types = {NoneClass, tuple, str, BoolClass}
-    class NoneTupleDecimalBoolMixin:
-        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
-    class NoneStrDecimalBoolMixin:
-        _types = {NoneClass, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
-    class FrozenDictTupleStrBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, BoolClass}
-    class FrozenDictTupleDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class FrozenDictStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class TupleStrDecimalBoolMixin:
-        _types = {tuple, str, decimal.Decimal, BoolClass}
-    # qty 5
-    class NoneFrozenDictTupleStrDecimalMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
-    class NoneFrozenDictTupleStrBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
-    class NoneFrozenDictTupleDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
-    class NoneFrozenDictStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
-    class NoneTupleStrDecimalBoolMixin:
-        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
-    class FrozenDictTupleStrDecimalBoolMixin:
-        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 6
-    class NoneFrozenDictTupleStrDecimalBoolMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
-    # qty 8
-    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
-        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
-
-
-class ValidatorBase:
-    @staticmethod
-    def _is_json_validation_enabled_oapg(schema_keyword, configuration=None):
-        """Returns true if JSON schema validation is enabled for the specified
-        validation keyword. This can be used to skip JSON schema structural validation
-        as requested in the configuration.
-        Note: the suffix _oapg stands for openapi python (experimental) generator and
-        it has been added to prevent collisions with other methods and properties
-
-        Args:
-            schema_keyword (string): the name of a JSON schema validation keyword.
-            configuration (Configuration): the configuration class.
-        """
-
-        return (configuration is None or
-            not hasattr(configuration, '_disabled_client_side_validations') or
-            schema_keyword not in configuration._disabled_client_side_validations)
-
-    @staticmethod
-    def _raise_validation_errror_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
-        raise ApiValueError(
-            "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
-                value=value,
-                constraint_msg=constraint_msg,
-                constraint_value=constraint_value,
-                additional_txt=additional_txt,
-                path_to_item=path_to_item,
-            )
-        )
-
-
-class EnumBase:
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        EnumBase _validate_oapg
-        Validates that arg is in the enum's allowed values
-        """
-        try:
-            cls.MetaOapg.enum_value_to_name[arg]
-        except KeyError:
-            raise ApiValueError("Invalid value {} passed in to {}, allowed_values={}".format(arg, cls, cls.MetaOapg.enum_value_to_name.keys()))
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class BoolBase:
-    def is_true_oapg(self) -> bool:
-        """
-        A replacement for x is True
-        True if the instance is a BoolClass True Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self)
-
-    def is_false_oapg(self) -> bool:
-        """
-        A replacement for x is False
-        True if the instance is a BoolClass False Singleton
-        """
-        if not issubclass(self.__class__, BoolClass):
-            return False
-        return bool(self) is False
-
-
-class NoneBase:
-    def is_none_oapg(self) -> bool:
-        """
-        A replacement for x is None
-        True if the instance is a NoneClass None Singleton
-        """
-        if issubclass(self.__class__, NoneClass):
-            return True
-        return False
-
-
-class StrBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_str_oapg(self) -> str:
-        return self
-
-    @property
-    def as_date_oapg(self) -> date:
-        raise Exception('not implemented')
-
-    @property
-    def as_datetime_oapg(self) -> datetime:
-        raise Exception('not implemented')
-
-    @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        raise Exception('not implemented')
-
-    @property
-    def as_uuid_oapg(self) -> uuid.UUID:
-        raise Exception('not implemented')
-
-    @classmethod
-    def __check_str_validations(
-        cls,
-        arg: str,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_length') and
-                len(arg) > cls.MetaOapg.max_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minLength', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_length') and
-                len(arg) < cls.MetaOapg.min_length):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="length must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_length,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('pattern', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'regex')):
-            for regex_dict in cls.MetaOapg.regex:
-                flags = regex_dict.get('flags', 0)
-                if not re.search(regex_dict['pattern'], arg, flags=flags):
-                    if flags != 0:
-                        # Don't print the regex flags if the flags are not
-                        # specified in the OAS document.
-                        cls._raise_validation_errror_message_oapg(
-                            value=arg,
-                            constraint_msg="must match regular expression",
-                            constraint_value=regex_dict['pattern'],
-                            path_to_item=validation_metadata.path_to_item,
-                            additional_txt=" with flags=`{}`".format(flags)
-                        )
-                    cls._raise_validation_errror_message_oapg(
-                        value=arg,
-                        constraint_msg="must match regular expression",
-                        constraint_value=regex_dict['pattern'],
-                        path_to_item=validation_metadata.path_to_item
-                    )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        StrBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, str):
-            cls.__check_str_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class UUIDBase:
-    @property
-    @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
-        return uuid.UUID(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                uuid.UUID(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Invalid value '{}' for type UUID at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        UUIDBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class CustomIsoparser(isoparser):
-
-    @_takes_ascii
-    def parse_isodatetime(self, dt_str):
-        components, pos = self._parse_isodate(dt_str)
-        if len(dt_str) > pos:
-            if self._sep is None or dt_str[pos:pos + 1] == self._sep:
-                components += self._parse_isotime(dt_str[pos + 1:])
-            else:
-                raise ValueError('String contains unknown ISO components')
-
-        if len(components) > 3 and components[3] == 24:
-            components[3] = 0
-            return datetime(*components) + timedelta(days=1)
-
-        if len(components) <= 3:
-            raise ValueError('Value is not a datetime')
-
-        return datetime(*components)
-
-    @_takes_ascii
-    def parse_isodate(self, datestr):
-        components, pos = self._parse_isodate(datestr)
-
-        if len(datestr) > pos:
-            raise ValueError('String contains invalid time components')
-
-        if len(components) > 3:
-            raise ValueError('String contains invalid time components')
-
-        return date(*components)
-
-
-DEFAULT_ISOPARSER = CustomIsoparser()
-
-
-class DateBase:
-    @property
-    @functools.lru_cache()
-    def as_date_oapg(self) -> date:
-        return DEFAULT_ISOPARSER.parse_isodate(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodate(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 date format. "
-                    "Invalid value '{}' for type date at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: typing.Optional[ValidationMetadata] = None,
-    ):
-        """
-        DateBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DateTimeBase:
-    @property
-    @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime:
-        return DEFAULT_ISOPARSER.parse_isodatetime(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                DEFAULT_ISOPARSER.parse_isodatetime(arg)
-                return True
-            except ValueError:
-                raise ApiValueError(
-                    "Value does not conform to the required ISO-8601 datetime format. "
-                    "Invalid value '{}' for type datetime at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DateTimeBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class DecimalBase:
-    """
-    A class for storing decimals that are sent over the wire as strings
-    These schemas must remain based on StrBase rather than NumberBase
-    because picking base classes must be deterministic
-    """
-
-    @property
-    @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
-        return decimal.Decimal(self)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[str], validation_metadata: ValidationMetadata):
-        if isinstance(arg, str):
-            try:
-                decimal.Decimal(arg)
-                return True
-            except decimal.InvalidOperation:
-                raise ApiValueError(
-                    "Value cannot be converted to a decimal. "
-                    "Invalid value '{}' for type decimal at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DecimalBase _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class NumberBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            """
-            Note: for some numbers like 9.0 they could be represented as an
-            integer but our code chooses to store them as
-            >>> Decimal('9.0').as_tuple()
-            DecimalTuple(sign=0, digits=(9, 0), exponent=-1)
-            so we can tell that the value came from a float and convert it back to a float
-            during later serialization
-            """
-            if self.as_tuple().exponent < 0:
-                # this could be represented as an integer but should be represented as a float
-                # because that's what it was serialized from
-                raise ApiValueError(f'{self} is not an integer')
-            self._as_int = int(self)
-            return self._as_int
-
-    @property
-    def as_float_oapg(self) -> float:
-        try:
-            return self._as_float
-        except AttributeError:
-            if self.as_tuple().exponent >= 0:
-                raise ApiValueError(f'{self} is not an float')
-            self._as_float = float(self)
-            return self._as_float
-
-    @classmethod
-    def __check_numeric_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if cls._is_json_validation_enabled_oapg('multipleOf',
-                                      validation_metadata.configuration) and hasattr(cls.MetaOapg, 'multiple_of'):
-            multiple_of_value = cls.MetaOapg.multiple_of
-            if (not (float(arg) / multiple_of_value).is_integer()):
-                # Note 'multipleOf' will be as good as the floating point arithmetic.
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="value must be a multiple of",
-                    constraint_value=multiple_of_value,
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-        checking_max_or_min_values = any(
-            hasattr(cls.MetaOapg, validation_key) for validation_key in {
-                'exclusive_maximum',
-                'inclusive_maximum',
-                'exclusive_minimum',
-                'inclusive_minimum',
-            }
-        )
-        if not checking_max_or_min_values:
-            return
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMaximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_maximum') and
-                arg >= cls.MetaOapg.exclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('maximum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_maximum') and
-                arg > cls.MetaOapg.inclusive_maximum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value less than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('exclusiveMinimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'exclusive_minimum') and
-                arg <= cls.MetaOapg.exclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than",
-                constraint_value=cls.MetaOapg.exclusive_maximum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minimum', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'inclusive_minimum') and
-                arg < cls.MetaOapg.inclusive_minimum):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="must be a value greater than or equal to",
-                constraint_value=cls.MetaOapg.inclusive_minimum,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        NumberBase _validate_oapg
-        Validates that validations pass
-        """
-        if isinstance(arg, decimal.Decimal):
-            cls.__check_numeric_validations(arg, validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class ListBase(ValidatorBase):
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def __validate_items(cls, list_items, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for items are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            list_items: the input list of items
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-
-        # if we have definitions for an items schema, use it
-        # otherwise accept anything
-        item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
-        item_cls = cls._get_class_oapg(item_cls)
-        path_to_schemas = {}
-        for i, value in enumerate(list_items):
-            item_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=validation_metadata.path_to_item+(i,),
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if item_validation_metadata.validation_ran_earlier(item_cls):
-                continue
-            other_path_to_schemas = item_cls._validate_oapg(
-                value, validation_metadata=item_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_tuple_validations(
-            cls, arg,
-            validation_metadata: ValidationMetadata):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_items') and
-                len(arg) > cls.MetaOapg.max_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_items') and
-                len(arg) < cls.MetaOapg.min_items):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of items must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_items,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('uniqueItems', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'unique_items') and cls.MetaOapg.unique_items and arg):
-            unique_items = set(arg)
-            if len(arg) > len(unique_items):
-                cls._raise_validation_errror_message_oapg(
-                    value=arg,
-                    constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
-                    constraint_value='unique_items==True',
-                    path_to_item=validation_metadata.path_to_item
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        ListBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, tuple):
-            cls.__check_tuple_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, tuple):
-            return _path_to_schemas
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        other_path_to_schemas = cls.__validate_items(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_items_oapg(
-        cls: 'Schema',
-        arg: typing.List[typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        '''
-        ListBase _get_items_oapg
-        '''
-        cast_items = []
-
-        for i, value in enumerate(arg):
-            item_path_to_item = path_to_item + (i,)
-            item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
-                value,
-                item_path_to_item,
-                path_to_schemas
-            )
-            cast_items.append(new_value)
-
-        return cast_items
-
-
-class Discriminable:
-    MetaOapg: MetaOapgTyped
-
-    @classmethod
-    def _ensure_discriminator_value_present_oapg(cls, disc_property_name: str, validation_metadata: ValidationMetadata, *args):
-        if not args or args and disc_property_name not in args[0]:
-            # The input data does not contain the discriminator property
-            raise ApiValueError(
-                "Cannot deserialize input data due to missing discriminator. "
-                "The discriminator property '{}' is missing at path: {}".format(disc_property_name, validation_metadata.path_to_item)
-            )
-
-    @classmethod
-    def get_discriminated_class_oapg(cls, disc_property_name: str, disc_payload_value: str):
-        """
-        Used in schemas with discriminators
-        """
-        if not hasattr(cls.MetaOapg, 'discriminator'):
-            return None
-        disc = cls.MetaOapg.discriminator()
-        if disc_property_name not in disc:
-            return None
-        discriminated_cls = disc[disc_property_name].get(disc_payload_value)
-        if discriminated_cls is not None:
-            return discriminated_cls
-        if not hasattr(cls, 'MetaOapg'):
-            return None
-        elif not (
-            hasattr(cls.MetaOapg, 'all_of') or
-            hasattr(cls.MetaOapg, 'one_of') or
-            hasattr(cls.MetaOapg, 'any_of')
-        ):
-            return None
-        # TODO stop traveling if a cycle is hit
-        if hasattr(cls.MetaOapg, 'all_of'):
-            for allof_cls in cls.MetaOapg.all_of():
-                discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'one_of'):
-            for oneof_cls in cls.MetaOapg.one_of():
-                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        if hasattr(cls.MetaOapg, 'any_of'):
-            for anyof_cls in cls.MetaOapg.any_of():
-                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-                if discriminated_cls is not None:
-                    return discriminated_cls
-        return None
-
-
-class DictBase(Discriminable, ValidatorBase):
-
-    @classmethod
-    def __validate_arg_presence(cls, arg):
-        """
-        Ensures that:
-        - all required arguments are passed in
-        - the input variable names are valid
-            - present in properties or
-            - accepted because additionalProperties exists
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-            - a var_name is invalid if additional_properties == NotAnyTypeSchema
-            and var_name not in properties.__annotations__
-        - required properties were not passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        seen_required_properties = set()
-        invalid_arguments = []
-        required_property_names = getattr(cls.MetaOapg, 'required', set())
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name in arg:
-            if property_name in required_property_names:
-                seen_required_properties.add(property_name)
-            elif property_name in property_annotations:
-                continue
-            elif additional_properties is not NotAnyTypeSchema:
-                continue
-            else:
-                invalid_arguments.append(property_name)
-        missing_required_arguments = list(required_property_names - seen_required_properties)
-        if missing_required_arguments:
-            missing_required_arguments.sort()
-            raise ApiTypeError(
-                "{} is missing {} required argument{}: {}".format(
-                    cls.__name__,
-                    len(missing_required_arguments),
-                    "s" if len(missing_required_arguments) > 1 else "",
-                    missing_required_arguments
-                )
-            )
-        if invalid_arguments:
-            invalid_arguments.sort()
-            raise ApiTypeError(
-                "{} was passed {} invalid argument{}: {}".format(
-                    cls.__name__,
-                    len(invalid_arguments),
-                    "s" if len(invalid_arguments) > 1 else "",
-                    invalid_arguments
-                )
-            )
-
-    @classmethod
-    def __validate_args(cls, arg, validation_metadata: ValidationMetadata):
-        """
-        Ensures that:
-        - values passed in for properties are valid
-        Exceptions will be raised if:
-        - invalid arguments were passed in
-
-        Args:
-            arg: the input dict
-
-        Raises:
-            ApiTypeError - for missing required arguments, or for invalid properties
-        """
-        path_to_schemas = {}
-        additional_properties = getattr(cls.MetaOapg, 'additional_properties', UnsetAnyTypeSchema)
-        properties = getattr(cls.MetaOapg, 'properties', {})
-        property_annotations = getattr(properties, '__annotations__', {})
-        for property_name, value in arg.items():
-            path_to_item = validation_metadata.path_to_item+(property_name,)
-            if property_name in property_annotations:
-                schema = property_annotations[property_name]
-            elif additional_properties is not NotAnyTypeSchema:
-                if additional_properties is UnsetAnyTypeSchema:
-                    """
-                    If additionalProperties is unset and this path_to_item does not yet have
-                    any validations on it, validate it.
-                    If it already has validations on it, skip this validation.
-                    """
-                    if path_to_item in path_to_schemas:
-                        continue
-                schema = additional_properties
-            else:
-                raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
-                    value, cls, validation_metadata.path_to_item+(property_name,)
-                ))
-            schema = cls._get_class_oapg(schema)
-            arg_validation_metadata = ValidationMetadata(
-                from_server=validation_metadata.from_server,
-                configuration=validation_metadata.configuration,
-                path_to_item=path_to_item,
-                validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-            )
-            if arg_validation_metadata.validation_ran_earlier(schema):
-                continue
-            other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __check_dict_validations(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata
-    ):
-        if not hasattr(cls, 'MetaOapg'):
-            return
-        if (cls._is_json_validation_enabled_oapg('maxProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'max_properties') and
-                len(arg) > cls.MetaOapg.max_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be less than or equal to",
-                constraint_value=cls.MetaOapg.max_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-        if (cls._is_json_validation_enabled_oapg('minProperties', validation_metadata.configuration) and
-                hasattr(cls.MetaOapg, 'min_properties') and
-                len(arg) < cls.MetaOapg.min_properties):
-            cls._raise_validation_errror_message_oapg(
-                value=arg,
-                constraint_msg="number of properties must be greater than or equal to",
-                constraint_value=cls.MetaOapg.min_properties,
-                path_to_item=validation_metadata.path_to_item
-            )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        DictBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        if isinstance(arg, frozendict.frozendict):
-            cls.__check_dict_validations(arg, validation_metadata)
-        _path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-        if not isinstance(arg, frozendict.frozendict):
-            return _path_to_schemas
-        cls.__validate_arg_presence(arg)
-        other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
-        update(_path_to_schemas, other_path_to_schemas)
-        try:
-            discriminator = cls.MetaOapg.discriminator()
-        except AttributeError:
-            return _path_to_schemas
-        # discriminator exists
-        disc_prop_name = list(discriminator.keys())[0]
-        cls._ensure_discriminator_value_present_oapg(disc_prop_name, validation_metadata, arg)
-        discriminated_cls = cls.get_discriminated_class_oapg(
-            disc_property_name=disc_prop_name, disc_payload_value=arg[disc_prop_name])
-        if discriminated_cls is None:
-            raise ApiValueError(
-                "Invalid discriminator value was passed in to {}.{} Only the values {} are allowed at {}".format(
-                    cls.__name__,
-                    disc_prop_name,
-                    list(discriminator[disc_prop_name].keys()),
-                    validation_metadata.path_to_item + (disc_prop_name,)
-                )
-            )
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-        if updated_vm.validation_ran_earlier(discriminated_cls):
-            return _path_to_schemas
-        other_path_to_schemas = discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
-        update(_path_to_schemas, other_path_to_schemas)
-        return _path_to_schemas
-
-    @classmethod
-    def _get_properties_oapg(
-        cls,
-        arg: typing.Dict[str, typing.Any],
-        path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
-    ):
-        """
-        DictBase _get_properties_oapg, this is how properties are set
-        These values already passed validation
-        """
-        dict_items = {}
-
-        for property_name_js, value in arg.items():
-            property_path_to_item = path_to_item + (property_name_js,)
-            property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
-                value,
-                property_path_to_item,
-                path_to_schemas
-            )
-            dict_items[property_name_js] = new_value
-
-        return dict_items
-
-    def __setattr__(self, name: str, value: typing.Any):
-        if not isinstance(self, FileIO):
-            raise AttributeError('property setting not supported on immutable instances')
-
-    def __getattr__(self, name: str):
-        """
-        for instance.name access
-        Properties are only type hinted for required properties
-        so that hasattr(instance, 'optionalProp') is False when that key is not present
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        if name not in self.__class__.__annotations__:
-            raise AttributeError(f"{self} has no attribute '{name}'")
-        try:
-            value = self[name]
-            return value
-        except KeyError as ex:
-            raise AttributeError(str(ex))
-
-    def __getitem__(self, name: str):
-        """
-        dict_instance[name] accessor
-        key errors thrown
-        """
-        if not isinstance(self, frozendict.frozendict):
-            return super().__getattr__(name)
-        return super().__getitem__(name)
-
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
-        # dict_instance[name] accessor
-        if not isinstance(self, frozendict.frozendict):
-            raise NotImplementedError()
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return unset
-
-
-def cast_to_allowed_types(
-    arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict.frozendict, list, tuple, bytes, Schema, io.FileIO, io.BufferedReader],
-    from_server: bool,
-    validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]],
-    path_to_item: typing.Tuple[typing.Union[str, int], ...] = tuple(['args[0]']),
-) -> typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO]:
-    """
-    Casts the input payload arg into the allowed types
-    The input validated_path_to_schemas is mutated by running this function
-
-    When from_server is False then
-    - date/datetime is cast to str
-    - int/float is cast to Decimal
-
-    If a Schema instance is passed in it is converted back to a primitive instance because
-    One may need to validate that data to the original Schema class AND additional different classes
-    those additional classes will need to be added to the new manufactured class for that payload
-    If the code didn't do this and kept the payload as a Schema instance it would fail to validate to other
-    Schema classes and the code wouldn't be able to mfg a new class that includes all valid schemas
-    TODO: store the validated schema classes in validation_metadata
-
-    Args:
-        arg: the payload
-        from_server: whether this payload came from the server or not
-        validated_path_to_schemas: a dict that stores the validated classes at any path location in the payload
-    """
-    if isinstance(arg, Schema):
-        # store the already run validations
-        schema_classes = set()
-        source_schema_was_unset = len(arg.__class__.__bases__) == 2 and UnsetAnyTypeSchema in arg.__class__.__bases__
-        if not source_schema_was_unset:
-            """
-            Do not include UnsetAnyTypeSchema and its base class because
-            it did not exist in the original spec schema definition
-            It was added to ensure that all instances are of type Schema and the allowed base types
-            """
-            for cls in arg.__class__.__bases__:
-                if cls is Singleton:
-                    # Skip Singleton
-                    continue
-                schema_classes.add(cls)
-        validated_path_to_schemas[path_to_item] = schema_classes
-
-    type_error = ApiTypeError(f"Invalid type. Required value type is str and passed type was {type(arg)} at {path_to_item}")
-    if isinstance(arg, str):
-        return str(arg)
-    elif isinstance(arg, (dict, frozendict.frozendict)):
-        return frozendict.frozendict({key: cast_to_allowed_types(val, from_server, validated_path_to_schemas, path_to_item + (key,)) for key, val in arg.items()})
-    elif isinstance(arg, (bool, BoolClass)):
-        """
-        this check must come before isinstance(arg, (int, float))
-        because isinstance(True, int) is True
-        """
-        if arg:
-            return BoolClass.TRUE
-        return BoolClass.FALSE
-    elif isinstance(arg, int):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, float):
-        decimal_from_float = decimal.Decimal(arg)
-        if decimal_from_float.as_integer_ratio()[1] == 1:
-            # 9.0 -> Decimal('9.0')
-            # 3.4028234663852886e+38 -> Decimal('340282346638528859811704183484516925440.0')
-            return decimal.Decimal(str(decimal_from_float)+'.0')
-        return decimal_from_float
-    elif isinstance(arg, (tuple, list)):
-        return tuple([cast_to_allowed_types(item, from_server, validated_path_to_schemas, path_to_item + (i,)) for i, item in enumerate(arg)])
-    elif isinstance(arg, (none_type, NoneClass)):
-        return NoneClass.NONE
-    elif isinstance(arg, (date, datetime)):
-        if not from_server:
-            return arg.isoformat()
-        raise type_error
-    elif isinstance(arg, uuid.UUID):
-        if not from_server:
-            return str(arg)
-        raise type_error
-    elif isinstance(arg, decimal.Decimal):
-        return decimal.Decimal(arg)
-    elif isinstance(arg, bytes):
-        return bytes(arg)
-    elif isinstance(arg, (io.FileIO, io.BufferedReader)):
-        return FileIO(arg)
-    raise ValueError('Invalid type passed in got input={} type={}'.format(arg, type(arg)))
-
-
-class ComposedBase(Discriminable):
-
-    @classmethod
-    def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
-        path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of():
-            if validation_metadata.validation_ran_earlier(allof_cls):
-                continue
-            other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            update(path_to_schemas, other_path_to_schemas)
-        return path_to_schemas
-
-    @classmethod
-    def __get_oneof_class(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata,
-    ):
-        oneof_classes = []
-        path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of():
-            if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
-                oneof_classes.append(oneof_cls)
-                continue
-            if validation_metadata.validation_ran_earlier(oneof_cls):
-                oneof_classes.append(oneof_cls)
-                continue
-            try:
-                path_to_schemas = oneof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and oneof_cls is discriminated_cls:
-                    raise ex
-                continue
-            oneof_classes.append(oneof_cls)
-        if not oneof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the oneOf schemas matched the input data.".format(cls)
-            )
-        elif len(oneof_classes) > 1:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. Multiple "
-                "oneOf schemas {} matched the inputs, but a max of one is allowed.".format(cls, oneof_classes)
-            )
-        # exactly one class matches
-        return path_to_schemas
-
-    @classmethod
-    def __get_anyof_classes(
-        cls,
-        arg,
-        discriminated_cls,
-        validation_metadata: ValidationMetadata
-    ):
-        anyof_classes = []
-        path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of():
-            if validation_metadata.validation_ran_earlier(anyof_cls):
-                anyof_classes.append(anyof_cls)
-                continue
-
-            try:
-                other_path_to_schemas = anyof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
-            except (ApiValueError, ApiTypeError) as ex:
-                if discriminated_cls is not None and anyof_cls is discriminated_cls:
-                    raise ex
-                continue
-            anyof_classes.append(anyof_cls)
-            update(path_to_schemas, other_path_to_schemas)
-        if not anyof_classes:
-            raise ApiValueError(
-                "Invalid inputs given to generate an instance of {}. None "
-                "of the anyOf schemas matched the input data.".format(cls)
-            )
-        return path_to_schemas
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        """
-        ComposedBase _validate_oapg
-        We return dynamic classes of different bases depending upon the inputs
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Returns:
-            new_cls (type): the new class
-
-        Raises:
-            ApiValueError: when a string can't be converted into a date or datetime and it must be one of those classes
-            ApiTypeError: when the input type is not in the list of allowed spec types
-        """
-        # validation checking on types, validations, and enums
-        path_to_schemas = super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-        updated_vm = ValidationMetadata(
-            configuration=validation_metadata.configuration,
-            from_server=validation_metadata.from_server,
-            path_to_item=validation_metadata.path_to_item,
-            seen_classes=validation_metadata.seen_classes | frozenset({cls}),
-            validated_path_to_schemas=validation_metadata.validated_path_to_schemas
-        )
-
-        # process composed schema
-        discriminator = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'discriminator'):
-            discriminator = cls.MetaOapg.discriminator()
-        discriminated_cls = None
-        if discriminator and arg and isinstance(arg, frozendict.frozendict):
-            disc_property_name = list(discriminator.keys())[0]
-            cls._ensure_discriminator_value_present_oapg(disc_property_name, updated_vm, arg)
-            # get discriminated_cls by looking at the dict in the current class
-            discriminated_cls = cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=arg[disc_property_name])
-            if discriminated_cls is None:
-                raise ApiValueError(
-                    "Invalid discriminator value '{}' was passed in to {}.{} Only the values {} are allowed at {}".format(
-                        arg[disc_property_name],
-                        cls.__name__,
-                        disc_property_name,
-                        list(discriminator[disc_property_name].keys()),
-                        updated_vm.path_to_item + (disc_property_name,)
-                    )
-                )
-
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'all_of'):
-            other_path_to_schemas = cls.__get_allof_classes(arg, validation_metadata=updated_vm)
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'one_of'):
-            other_path_to_schemas = cls.__get_oneof_class(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'any_of'):
-            other_path_to_schemas = cls.__get_anyof_classes(
-                arg,
-                discriminated_cls=discriminated_cls,
-                validation_metadata=updated_vm
-            )
-            update(path_to_schemas, other_path_to_schemas)
-        not_cls = None
-        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
-            not_cls = cls.MetaOapg.not_schema
-            not_cls = cls._get_class_oapg(not_cls)
-        if not_cls:
-            other_path_to_schemas = None
-            not_exception = ApiValueError(
-                "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
-                    arg,
-                    cls.__name__,
-                    not_cls.__name__,
-                )
-            )
-            if updated_vm.validation_ran_earlier(not_cls):
-                raise not_exception
-
-            try:
-                other_path_to_schemas = not_cls._validate_oapg(arg, validation_metadata=updated_vm)
-            except (ApiValueError, ApiTypeError):
-                pass
-            if other_path_to_schemas:
-                raise not_exception
-
-        if discriminated_cls is not None and not updated_vm.validation_ran_earlier(discriminated_cls):
-            # TODO use an exception from this package here
-            assert discriminated_cls in path_to_schemas[updated_vm.path_to_item]
-        return path_to_schemas
-
-
-# DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
-class ComposedSchema(
-    ComposedBase,
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
-        if not args:
-            if not kwargs:
-                raise ApiTypeError('{} is missing required input data in args or kwargs'.format(cls.__name__))
-            args = (kwargs, )
-        return super().from_openapi_data_oapg(args[0], _configuration=_configuration)
-
-
-class ListSchema(
-    ListBase,
-    Schema,
-    TupleMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NoneSchema(
-    NoneBase,
-    Schema,
-    NoneMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: None, **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class NumberSchema(
-    NumberBase,
-    Schema,
-    DecimalMixin
-):
-    """
-    This is used for type: number with no format
-    Both integers AND floats are accepted
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class IntBase:
-    @property
-    def as_int_oapg(self) -> int:
-        try:
-            return self._as_int
-        except AttributeError:
-            self._as_int = int(self)
-            return self._as_int
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-
-            denominator = arg.as_integer_ratio()[-1]
-            if denominator != 1:
-                raise ApiValueError(
-                    "Invalid value '{}' for type integer at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        IntBase _validate_oapg
-        TODO what about types = (int, number) -> IntBase, NumberBase? We could drop int and keep number only
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class IntSchema(IntBase, NumberSchema):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class Int32Base:
-    __inclusive_minimum = decimal.Decimal(-2147483648)
-    __inclusive_maximum = decimal.Decimal(2147483647)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int32 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int32Schema(
-    Int32Base,
-    IntSchema
-):
-    pass
-
-
-class Int64Base:
-    __inclusive_minimum = decimal.Decimal(-9223372036854775808)
-    __inclusive_maximum = decimal.Decimal(9223372036854775807)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal) and arg.as_tuple().exponent == 0:
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type int64 at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Int64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Int64Schema(
-    Int64Base,
-    IntSchema
-):
-    pass
-
-
-class Float32Base:
-    __inclusive_minimum = decimal.Decimal(-3.4028234663852886e+38)
-    __inclusive_maximum = decimal.Decimal(3.4028234663852886e+38)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type float at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float32Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-
-class Float32Schema(
-    Float32Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class Float64Base:
-    __inclusive_minimum = decimal.Decimal(-1.7976931348623157E+308)
-    __inclusive_maximum = decimal.Decimal(1.7976931348623157E+308)
-
-    @classmethod
-    def __validate_format(cls, arg: typing.Optional[decimal.Decimal], validation_metadata: ValidationMetadata):
-        if isinstance(arg, decimal.Decimal):
-            if not cls.__inclusive_minimum <= arg <= cls.__inclusive_maximum:
-                raise ApiValueError(
-                    "Invalid value '{}' for type double at {}".format(arg, validation_metadata.path_to_item)
-                )
-
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ):
-        """
-        Float64Base _validate_oapg
-        """
-        cls.__validate_format(arg, validation_metadata=validation_metadata)
-        return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-
-class Float64Schema(
-    Float64Base,
-    NumberSchema
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[Configuration] = None):
-        # todo check format
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-
-class StrSchema(
-    StrBase,
-    Schema,
-    StrMixin
-):
-    """
-    date + datetime string types must inherit from this class
-    That is because one can validate a str payload as both:
-    - type: string (format unset)
-    - type: string, format: date
-    """
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class UUIDSchema(UUIDBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateSchema(DateBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, date], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DateTimeSchema(DateTimeBase, StrSchema):
-
-    def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class DecimalSchema(DecimalBase, StrSchema):
-
-    def __new__(cls, arg: str, **kwargs: Configuration):
-        """
-        Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
-        which can be simple (str) or complex (dicts or lists with nested values)
-        Because casting is only done once and recursively casts all values prior to validation then for a potential
-        client side Decimal input if Decimal was accepted as an input in DecimalSchema then one would not know
-        if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
-        where it should stay as Decimal.
-        """
-        return super().__new__(cls, arg, **kwargs)
-
-
-class BytesSchema(
-    Schema,
-    BytesMixin
-):
-    """
-    this class will subclass bytes and is immutable
-    """
-    def __new__(cls, arg: bytes, **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class FileSchema(
-    Schema,
-    FileMixin
-):
-    """
-    This class is NOT immutable
-    Dynamic classes are built using it for example when AnyType allows in binary data
-    Al other schema classes ARE immutable
-    If one wanted to make this immutable one could make this a DictSchema with required properties:
-    - data = BytesSchema (which would be an immutable bytes based schema)
-    - file_name = StrSchema
-    and cast_to_allowed_types would convert bytes and file instances into dicts containing data + file_name
-    The downside would be that data would be stored in memory which one may not want to do for very large files
-
-    The developer is responsible for closing this file and deleting it
-
-    This class was kept as mutable:
-    - to allow file reading and writing to disk
-    - to be able to preserve file name info
-    """
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration):
-        return super(Schema, cls).__new__(cls, arg)
-
-
-class BinaryBase:
-    pass
-
-
-class BinarySchema(
-    ComposedBase,
-    BinaryBase,
-    Schema,
-    BinaryMixin
-):
-    class MetaOapg:
-        @staticmethod
-        def one_of():
-            return [
-                BytesSchema,
-                FileSchema,
-            ]
-
-    def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
-        return super().__new__(cls, arg)
-
-
-class BoolSchema(
-    BoolBase,
-    Schema,
-    BoolMixin
-):
-
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, arg, **kwargs)
-
-
-class AnyTypeSchema(
-    DictBase,
-    ListBase,
-    NumberBase,
-    StrBase,
-    BoolBase,
-    NoneBase,
-    Schema,
-    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
-):
-    # Python representation of a schema defined as true or {}
-    pass
-
-
-class UnsetAnyTypeSchema(AnyTypeSchema):
-    # Used when additionalProperties/items was not explicitly defined and a defining schema is needed
-    pass
-
-
-class NotAnyTypeSchema(
-    ComposedSchema,
-):
-    """
-    Python representation of a schema defined as false or {'not': {}}
-    Does not allow inputs in of AnyType
-    Note: validations on this class are never run because the code knows that no inputs will ever validate
-    """
-
-    class MetaOapg:
-        not_schema = AnyTypeSchema
-
-    def __new__(
-        cls,
-        *args,
-        _configuration: typing.Optional[Configuration] = None,
-    ) -> 'NotAnyTypeSchema':
-        return super().__new__(
-            cls,
-            *args,
-            _configuration=_configuration,
-        )
-
-
-class DictSchema(
-    DictBase,
-    Schema,
-    FrozenDictMixin
-):
-    @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
-
-    def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *args, **kwargs)
-
-
-schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
-
-
-@functools.lru_cache()
-def get_new_class(
-    class_name: str,
-    bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
-) -> typing.Type[Schema]:
-    """
-    Returns a new class that is made with the subclass bases
-    """
-    new_cls: typing.Type[Schema] = type(class_name, bases, {})
-    return new_cls
-
-
-LOG_CACHE_USAGE = False
-
-
-def log_cache_usage(cache_fn):
-    if LOG_CACHE_USAGE:
-        print(cache_fn.__name__, cache_fn.cache_info())
diff --git a/libraries/client/cloudharness_cli/docs/common/AccountsApi.md b/libraries/client/cloudharness_cli/docs/common/AccountsApi.md
new file mode 100644
index 00000000..d9841b42
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/common/AccountsApi.md
@@ -0,0 +1,73 @@
+# cloudharness_cli.common.AccountsApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_config**](AccountsApi.md#get_config) | **GET** /accounts/config | Gets the config for logging in into accounts
+
+
+# **get_config**
+> GetConfig200Response get_config()
+
+Gets the config for logging in into accounts
+
+Gets the config for logging in into accounts
+
+### Example
+
+
+```python
+import cloudharness_cli.common
+from cloudharness_cli.common.models.get_config200_response import GetConfig200Response
+from cloudharness_cli.common.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.common.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.common.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.common.AccountsApi(api_client)
+
+    try:
+        # Gets the config for logging in into accounts
+        api_response = api_instance.get_config()
+        print("The response of AccountsApi->get_config:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling AccountsApi->get_config: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**GetConfig200Response**](GetConfig200Response.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Config for accounts log in |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/common/AppVersion.md b/libraries/client/cloudharness_cli/docs/common/AppVersion.md
new file mode 100644
index 00000000..8fa56cb6
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/common/AppVersion.md
@@ -0,0 +1,31 @@
+# AppVersion
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**build** | **str** |  | [optional] 
+**tag** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.common.models.app_version import AppVersion
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of AppVersion from a JSON string
+app_version_instance = AppVersion.from_json(json)
+# print the JSON string representation of the object
+print(AppVersion.to_json())
+
+# convert the object into a dict
+app_version_dict = app_version_instance.to_dict()
+# create an instance of AppVersion from a dict
+app_version_from_dict = AppVersion.from_dict(app_version_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/common/ConfigApi.md b/libraries/client/cloudharness_cli/docs/common/ConfigApi.md
new file mode 100644
index 00000000..e49919d5
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/common/ConfigApi.md
@@ -0,0 +1,70 @@
+# cloudharness_cli.common.ConfigApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**get_version**](ConfigApi.md#get_version) | **GET** /version | 
+
+
+# **get_version**
+> AppVersion get_version()
+
+
+
+### Example
+
+
+```python
+import cloudharness_cli.common
+from cloudharness_cli.common.models.app_version import AppVersion
+from cloudharness_cli.common.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.common.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.common.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.common.ConfigApi(api_client)
+
+    try:
+        api_response = api_instance.get_version()
+        print("The response of ConfigApi->get_version:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling ConfigApi->get_version: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**AppVersion**](AppVersion.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Deployment version GET |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/common/GetConfig200Response.md b/libraries/client/cloudharness_cli/docs/common/GetConfig200Response.md
new file mode 100644
index 00000000..dbf58049
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/common/GetConfig200Response.md
@@ -0,0 +1,31 @@
+# GetConfig200Response
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**url** | **str** | The auth URL. | [optional] 
+**realm** | **str** | The realm. | [optional] 
+**client_id** | **str** | The clientID. | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.common.models.get_config200_response import GetConfig200Response
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of GetConfig200Response from a JSON string
+get_config200_response_instance = GetConfig200Response.from_json(json)
+# print the JSON string representation of the object
+print(GetConfig200Response.to_json())
+
+# convert the object into a dict
+get_config200_response_dict = get_config200_response_instance.to_dict()
+# create an instance of GetConfig200Response from a dict
+get_config200_response_from_dict = GetConfig200Response.from_dict(get_config200_response_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/common/SentryApi.md b/libraries/client/cloudharness_cli/docs/common/SentryApi.md
new file mode 100644
index 00000000..83e14bb5
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/common/SentryApi.md
@@ -0,0 +1,78 @@
+# cloudharness_cli.common.SentryApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**getdsn**](SentryApi.md#getdsn) | **GET** /sentry/getdsn/{appname} | Gets the Sentry DSN for a given application
+
+
+# **getdsn**
+> object getdsn(appname)
+
+Gets the Sentry DSN for a given application
+
+Gets the Sentry DSN for a given application
+
+### Example
+
+
+```python
+import cloudharness_cli.common
+from cloudharness_cli.common.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.common.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.common.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.common.SentryApi(api_client)
+    appname = 'appname_example' # str | 
+
+    try:
+        # Gets the Sentry DSN for a given application
+        api_response = api_instance.getdsn(appname)
+        print("The response of SentryApi->getdsn:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling SentryApi->getdsn: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **appname** | **str**|  | 
+
+### Return type
+
+**object**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json, text/html, application/problem+json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Sentry DSN for the given application |  -  |
+**400** | Sentry not configured for the given application |  -  |
+**404** | Sentry not configured for the given application |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/common/apis/tags/AccountsApi.md b/libraries/client/cloudharness_cli/docs/common/apis/tags/AccountsApi.md
deleted file mode 100644
index 8f749f2e..00000000
--- a/libraries/client/cloudharness_cli/docs/common/apis/tags/AccountsApi.md
+++ /dev/null
@@ -1,80 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.common.apis.tags.accounts_api.AccountsApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**get_config**](#get_config) | **get** /accounts/config | Gets the config for logging in into accounts
-
-# **get_config**
-<a name="get_config"></a>
-> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} get_config()
-
-Gets the config for logging in into accounts
-
-Gets the config for logging in into accounts
-
-### Example
-
-```python
-import cloudharness_cli.common
-from cloudharness_cli.common.apis.tags import accounts_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.common.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.common.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = accounts_api.AccountsApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # Gets the config for logging in into accounts
-        api_response = api_instance.get_config()
-        pprint(api_response)
-    except cloudharness_cli.common.ApiException as e:
-        print("Exception when calling AccountsApi->get_config: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#get_config.ApiResponseFor200) | Config for accounts log in
-
-#### get_config.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**url** | str,  | str,  | The auth URL. | [optional] 
-**realm** | str,  | str,  | The realm. | [optional] 
-**clientId** | str,  | str,  | The clientID. | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/common/apis/tags/SentryApi.md b/libraries/client/cloudharness_cli/docs/common/apis/tags/SentryApi.md
deleted file mode 100644
index 8a32225f..00000000
--- a/libraries/client/cloudharness_cli/docs/common/apis/tags/SentryApi.md
+++ /dev/null
@@ -1,98 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.common.apis.tags.sentry_api.SentryApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**getdsn**](#getdsn) | **get** /sentry/getdsn/{appname} | Gets the Sentry DSN for a given application
-
-# **getdsn**
-<a name="getdsn"></a>
-> str getdsn(appname)
-
-Gets the Sentry DSN for a given application
-
-Gets the Sentry DSN for a given application
-
-### Example
-
-```python
-import cloudharness_cli.common
-from cloudharness_cli.common.apis.tags import sentry_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.common.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.common.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = sentry_api.SentryApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'appname': "appname_example",
-    }
-    try:
-        # Gets the Sentry DSN for a given application
-        api_response = api_instance.getdsn(
-            path_params=path_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.common.ApiException as e:
-        print("Exception when calling SentryApi->getdsn: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-appname | AppnameSchema | | 
-
-# AppnameSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#getdsn.ApiResponseFor200) | Sentry DSN for the given application
-
-#### getdsn.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/AuthApi.md b/libraries/client/cloudharness_cli/docs/samples/AuthApi.md
new file mode 100644
index 00000000..04a7dbbd
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/AuthApi.md
@@ -0,0 +1,159 @@
+# cloudharness_cli.samples.AuthApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**valid_cookie**](AuthApi.md#valid_cookie) | **GET** /valid-cookie | Check if the token is valid. Get a token by logging into the base url
+[**valid_token**](AuthApi.md#valid_token) | **GET** /valid | Check if the token is valid. Get a token by logging into the base url
+
+
+# **valid_cookie**
+> str valid_cookie()
+
+Check if the token is valid. Get a token by logging into the base url
+
+Check if the token is valid 
+
+### Example
+
+* Api Key Authentication (cookieAuth):
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure API key authorization: cookieAuth
+configuration.api_key['cookieAuth'] = os.environ["API_KEY"]
+
+# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+# configuration.api_key_prefix['cookieAuth'] = 'Bearer'
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.AuthApi(api_client)
+
+    try:
+        # Check if the token is valid. Get a token by logging into the base url
+        api_response = api_instance.valid_cookie()
+        print("The response of AuthApi->valid_cookie:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling AuthApi->valid_cookie: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+**str**
+
+### Authorization
+
+[cookieAuth](../README.md#cookieAuth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Check if token is valid |  -  |
+**401** | invalid token, unauthorized |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **valid_token**
+> str valid_token()
+
+Check if the token is valid. Get a token by logging into the base url
+
+Check if the token is valid 
+
+### Example
+
+* Bearer (JWT) Authentication (bearerAuth):
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure Bearer authorization (JWT): bearerAuth
+configuration = cloudharness_cli.samples.Configuration(
+    access_token = os.environ["BEARER_TOKEN"]
+)
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.AuthApi(api_client)
+
+    try:
+        # Check if the token is valid. Get a token by logging into the base url
+        api_response = api_instance.valid_token()
+        print("The response of AuthApi->valid_token:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling AuthApi->valid_token: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+**str**
+
+### Authorization
+
+[bearerAuth](../README.md#bearerAuth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Check if token is valid |  -  |
+**401** | invalid token, unauthorized |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/InlineResponse202.md b/libraries/client/cloudharness_cli/docs/samples/InlineResponse202.md
new file mode 100644
index 00000000..bb52e77e
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/InlineResponse202.md
@@ -0,0 +1,29 @@
+# InlineResponse202
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**task** | [**InlineResponse202Task**](InlineResponse202Task.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.samples.models.inline_response202 import InlineResponse202
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of InlineResponse202 from a JSON string
+inline_response202_instance = InlineResponse202.from_json(json)
+# print the JSON string representation of the object
+print(InlineResponse202.to_json())
+
+# convert the object into a dict
+inline_response202_dict = inline_response202_instance.to_dict()
+# create an instance of InlineResponse202 from a dict
+inline_response202_from_dict = InlineResponse202.from_dict(inline_response202_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/InlineResponse202Task.md b/libraries/client/cloudharness_cli/docs/samples/InlineResponse202Task.md
new file mode 100644
index 00000000..f5ef12ac
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/InlineResponse202Task.md
@@ -0,0 +1,30 @@
+# InlineResponse202Task
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**href** | **str** | the url where to check the operation status | [optional] 
+**name** | **str** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.samples.models.inline_response202_task import InlineResponse202Task
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of InlineResponse202Task from a JSON string
+inline_response202_task_instance = InlineResponse202Task.from_json(json)
+# print the JSON string representation of the object
+print(InlineResponse202Task.to_json())
+
+# convert the object into a dict
+inline_response202_task_dict = inline_response202_task_instance.to_dict()
+# create an instance of InlineResponse202Task from a dict
+inline_response202_task_from_dict = InlineResponse202Task.from_dict(inline_response202_task_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/ResourceApi.md b/libraries/client/cloudharness_cli/docs/samples/ResourceApi.md
new file mode 100644
index 00000000..b2d8848f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/ResourceApi.md
@@ -0,0 +1,351 @@
+# cloudharness_cli.samples.ResourceApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**create_sample_resource**](ResourceApi.md#create_sample_resource) | **POST** /sampleresources | Create a SampleResource
+[**delete_sample_resource**](ResourceApi.md#delete_sample_resource) | **DELETE** /sampleresources/{sampleresourceId} | Delete a SampleResource
+[**get_sample_resource**](ResourceApi.md#get_sample_resource) | **GET** /sampleresources/{sampleresourceId} | Get a SampleResource
+[**get_sample_resources**](ResourceApi.md#get_sample_resources) | **GET** /sampleresources | List All SampleResources
+[**update_sample_resource**](ResourceApi.md#update_sample_resource) | **PUT** /sampleresources/{sampleresourceId} | Update a SampleResource
+
+
+# **create_sample_resource**
+> create_sample_resource(sample_resource)
+
+Create a SampleResource
+
+Creates a new instance of a `SampleResource`.
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.ResourceApi(api_client)
+    sample_resource = cloudharness_cli.samples.SampleResource() # SampleResource | A new `SampleResource` to be created.
+
+    try:
+        # Create a SampleResource
+        api_instance.create_sample_resource(sample_resource)
+    except Exception as e:
+        print("Exception when calling ResourceApi->create_sample_resource: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **sample_resource** | [**SampleResource**](SampleResource.md)| A new &#x60;SampleResource&#x60; to be created. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**201** | Successful response. |  -  |
+**400** | Payload must be of type SampleResource |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **delete_sample_resource**
+> delete_sample_resource(sampleresource_id)
+
+Delete a SampleResource
+
+Deletes an existing `SampleResource`.
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.ResourceApi(api_client)
+    sampleresource_id = 'sampleresource_id_example' # str | A unique identifier for a `SampleResource`.
+
+    try:
+        # Delete a SampleResource
+        api_instance.delete_sample_resource(sampleresource_id)
+    except Exception as e:
+        print("Exception when calling ResourceApi->delete_sample_resource: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **sampleresource_id** | **str**| A unique identifier for a &#x60;SampleResource&#x60;. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**204** | Successful response. |  -  |
+**400** | Parameter must be integer |  -  |
+**404** | Resource not found |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_sample_resource**
+> SampleResource get_sample_resource(sampleresource_id)
+
+Get a SampleResource
+
+Gets the details of a single instance of a `SampleResource`.
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.ResourceApi(api_client)
+    sampleresource_id = 'sampleresource_id_example' # str | A unique identifier for a `SampleResource`.
+
+    try:
+        # Get a SampleResource
+        api_response = api_instance.get_sample_resource(sampleresource_id)
+        print("The response of ResourceApi->get_sample_resource:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling ResourceApi->get_sample_resource: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **sampleresource_id** | **str**| A unique identifier for a &#x60;SampleResource&#x60;. | 
+
+### Return type
+
+[**SampleResource**](SampleResource.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Successful response - returns a single &#x60;SampleResource&#x60;. |  -  |
+**400** | Parameter must be integer |  -  |
+**404** | Resource not found |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_sample_resources**
+> List[SampleResource] get_sample_resources()
+
+List All SampleResources
+
+Gets a list of all `SampleResource` entities.
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.ResourceApi(api_client)
+
+    try:
+        # List All SampleResources
+        api_response = api_instance.get_sample_resources()
+        print("The response of ResourceApi->get_sample_resources:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling ResourceApi->get_sample_resources: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**List[SampleResource]**](SampleResource.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Successful response - returns an array of &#x60;SampleResource&#x60; entities. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **update_sample_resource**
+> update_sample_resource(sampleresource_id, sample_resource)
+
+Update a SampleResource
+
+Updates an existing `SampleResource`.
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.ResourceApi(api_client)
+    sampleresource_id = 'sampleresource_id_example' # str | A unique identifier for a `SampleResource`.
+    sample_resource = cloudharness_cli.samples.SampleResource() # SampleResource | Updated `SampleResource` information.
+
+    try:
+        # Update a SampleResource
+        api_instance.update_sample_resource(sampleresource_id, sample_resource)
+    except Exception as e:
+        print("Exception when calling ResourceApi->update_sample_resource: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **sampleresource_id** | **str**| A unique identifier for a &#x60;SampleResource&#x60;. | 
+ **sample_resource** | [**SampleResource**](SampleResource.md)| Updated &#x60;SampleResource&#x60; information. | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: Not defined
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**202** | Successful response. |  -  |
+**400** | Parameter must be integer, payload must be of type SampleResource |  -  |
+**404** | Resource not found |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/SampleResource.md b/libraries/client/cloudharness_cli/docs/samples/SampleResource.md
new file mode 100644
index 00000000..19d6adba
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/SampleResource.md
@@ -0,0 +1,32 @@
+# SampleResource
+
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**a** | **float** |  | 
+**b** | **float** |  | [optional] 
+**id** | **float** |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of SampleResource from a JSON string
+sample_resource_instance = SampleResource.from_json(json)
+# print the JSON string representation of the object
+print(SampleResource.to_json())
+
+# convert the object into a dict
+sample_resource_dict = sample_resource_instance.to_dict()
+# create an instance of SampleResource from a dict
+sample_resource_from_dict = SampleResource.from_dict(sample_resource_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/TestApi.md b/libraries/client/cloudharness_cli/docs/samples/TestApi.md
new file mode 100644
index 00000000..b1eed271
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/TestApi.md
@@ -0,0 +1,134 @@
+# cloudharness_cli.samples.TestApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**error**](TestApi.md#error) | **GET** /error | test sentry is working
+[**ping**](TestApi.md#ping) | **GET** /ping | test the application is up
+
+
+# **error**
+> str error()
+
+test sentry is working
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.TestApi(api_client)
+
+    try:
+        # test sentry is working
+        api_response = api_instance.error()
+        print("The response of TestApi->error:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling TestApi->error: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+**str**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | This won&#39;t happen |  -  |
+**500** | Sentry entry should come! |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **ping**
+> float ping()
+
+test the application is up
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.TestApi(api_client)
+
+    try:
+        # test the application is up
+        api_response = api_instance.ping()
+        print("The response of TestApi->ping:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling TestApi->ping: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+**float**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | What we want |  -  |
+**500** | This shouldn&#39;t happen |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/WorkflowsApi.md b/libraries/client/cloudharness_cli/docs/samples/WorkflowsApi.md
new file mode 100644
index 00000000..3df62043
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/samples/WorkflowsApi.md
@@ -0,0 +1,201 @@
+# cloudharness_cli.samples.WorkflowsApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**submit_async**](WorkflowsApi.md#submit_async) | **GET** /operation_async | Send an asynchronous operation
+[**submit_sync**](WorkflowsApi.md#submit_sync) | **GET** /operation_sync | Send a synchronous operation
+[**submit_sync_with_results**](WorkflowsApi.md#submit_sync_with_results) | **GET** /operation_sync_results | Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+
+
+# **submit_async**
+> InlineResponse202 submit_async()
+
+Send an asynchronous operation
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.models.inline_response202 import InlineResponse202
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.WorkflowsApi(api_client)
+
+    try:
+        # Send an asynchronous operation
+        api_response = api_instance.submit_async()
+        print("The response of WorkflowsApi->submit_async:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling WorkflowsApi->submit_async: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+[**InlineResponse202**](InlineResponse202.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**202** | Submitted operation. See also https://restfulapi.net/http-status-202-accepted/ |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **submit_sync**
+> object submit_sync()
+
+Send a synchronous operation
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.WorkflowsApi(api_client)
+
+    try:
+        # Send a synchronous operation
+        api_response = api_instance.submit_sync()
+        print("The response of WorkflowsApi->submit_sync:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling WorkflowsApi->submit_sync: %s\n" % e)
+```
+
+
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+**object**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Operation result |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **submit_sync_with_results**
+> str submit_sync_with_results(a, b)
+
+Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+
+### Example
+
+
+```python
+import cloudharness_cli.samples
+from cloudharness_cli.samples.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.samples.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.samples.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.samples.WorkflowsApi(api_client)
+    a = 10 # float | first number to sum
+    b = 10 # float | second number to sum
+
+    try:
+        # Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+        api_response = api_instance.submit_sync_with_results(a, b)
+        print("The response of WorkflowsApi->submit_sync_with_results:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling WorkflowsApi->submit_sync_with_results: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **a** | **float**| first number to sum | 
+ **b** | **float**| second number to sum | 
+
+### Return type
+
+**str**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Operation result |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/samples/apis/tags/AuthApi.md b/libraries/client/cloudharness_cli/docs/samples/apis/tags/AuthApi.md
deleted file mode 100644
index f6a58dfa..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/apis/tags/AuthApi.md
+++ /dev/null
@@ -1,173 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.samples.apis.tags.auth_api.AuthApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**valid_cookie**](#valid_cookie) | **get** /valid-cookie | Check if the token is valid. Get a token by logging into the base url
-[**valid_token**](#valid_token) | **get** /valid | Check if the token is valid. Get a token by logging into the base url
-
-# **valid_cookie**
-<a name="valid_cookie"></a>
-> str valid_cookie()
-
-Check if the token is valid. Get a token by logging into the base url
-
-Check if the token is valid 
-
-### Example
-
-* Api Key Authentication (cookieAuth):
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import auth_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# The client must configure the authentication and authorization parameters
-# in accordance with the API server security policy.
-# Examples for each auth method are provided below, use the example that
-# satisfies your auth use case.
-
-# Configure API key authorization: cookieAuth
-configuration.api_key['cookieAuth'] = 'YOUR_API_KEY'
-
-# Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# configuration.api_key_prefix['cookieAuth'] = 'Bearer'
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = auth_api.AuthApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # Check if the token is valid. Get a token by logging into the base url
-        api_response = api_instance.valid_cookie()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling AuthApi->valid_cookie: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#valid_cookie.ApiResponseFor200) | Check if token is valid
-401 | [ApiResponseFor401](#valid_cookie.ApiResponseFor401) | invalid token, unauthorized
-
-#### valid_cookie.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-#### valid_cookie.ApiResponseFor401
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-[cookieAuth](../../../README.md#cookieAuth)
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **valid_token**
-<a name="valid_token"></a>
-> str valid_token()
-
-Check if the token is valid. Get a token by logging into the base url
-
-Check if the token is valid 
-
-### Example
-
-* Bearer (JWT) Authentication (bearerAuth):
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import auth_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# The client must configure the authentication and authorization parameters
-# in accordance with the API server security policy.
-# Examples for each auth method are provided below, use the example that
-# satisfies your auth use case.
-
-# Configure Bearer authorization (JWT): bearerAuth
-configuration = cloudharness_cli.samples.Configuration(
-    access_token = 'YOUR_BEARER_TOKEN'
-)
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = auth_api.AuthApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # Check if the token is valid. Get a token by logging into the base url
-        api_response = api_instance.valid_token()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling AuthApi->valid_token: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#valid_token.ApiResponseFor200) | Check if token is valid
-401 | [ApiResponseFor401](#valid_token.ApiResponseFor401) | invalid token, unauthorized
-
-#### valid_token.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-#### valid_token.ApiResponseFor401
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-[bearerAuth](../../../README.md#bearerAuth)
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/apis/tags/ResourceApi.md b/libraries/client/cloudharness_cli/docs/samples/apis/tags/ResourceApi.md
deleted file mode 100644
index 5c0bca7c..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/apis/tags/ResourceApi.md
+++ /dev/null
@@ -1,482 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.samples.apis.tags.resource_api.ResourceApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**create_sample_resource**](#create_sample_resource) | **post** /sampleresources | Create a SampleResource
-[**delete_sample_resource**](#delete_sample_resource) | **delete** /sampleresources/{sampleresourceId} | Delete a SampleResource
-[**get_sample_resource**](#get_sample_resource) | **get** /sampleresources/{sampleresourceId} | Get a SampleResource
-[**get_sample_resources**](#get_sample_resources) | **get** /sampleresources | List All SampleResources
-[**update_sample_resource**](#update_sample_resource) | **put** /sampleresources/{sampleresourceId} | Update a SampleResource
-
-# **create_sample_resource**
-<a name="create_sample_resource"></a>
-> create_sample_resource(sample_resource)
-
-Create a SampleResource
-
-Creates a new instance of a `SampleResource`.
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import resource_api
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = resource_api.ResourceApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    body = SampleResource(
-        a=3.14,
-        b=3.14,
-        id=3.14,
-    )
-    try:
-        # Create a SampleResource
-        api_response = api_instance.create_sample_resource(
-            body=body,
-        )
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling ResourceApi->create_sample_resource: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-body | typing.Union[SchemaForRequestBodyApplicationJson] | required |
-content_type | str | optional, default is 'application/json' | Selects the schema and serialization of the request body
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### body
-
-# SchemaForRequestBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**SampleResource**](../../models/SampleResource.md) |  | 
-
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-201 | [ApiResponseFor201](#create_sample_resource.ApiResponseFor201) | Successful response.
-400 | [ApiResponseFor400](#create_sample_resource.ApiResponseFor400) | Payload must be of type SampleResource
-
-#### create_sample_resource.ApiResponseFor201
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### create_sample_resource.ApiResponseFor400
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **delete_sample_resource**
-<a name="delete_sample_resource"></a>
-> delete_sample_resource(sampleresource_id)
-
-Delete a SampleResource
-
-Deletes an existing `SampleResource`.
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import resource_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = resource_api.ResourceApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'sampleresourceId': "sampleresourceId_example",
-    }
-    try:
-        # Delete a SampleResource
-        api_response = api_instance.delete_sample_resource(
-            path_params=path_params,
-        )
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling ResourceApi->delete_sample_resource: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-sampleresourceId | SampleresourceIdSchema | | 
-
-# SampleresourceIdSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-204 | [ApiResponseFor204](#delete_sample_resource.ApiResponseFor204) | Successful response.
-400 | [ApiResponseFor400](#delete_sample_resource.ApiResponseFor400) | Parameter must be integer
-404 | [ApiResponseFor404](#delete_sample_resource.ApiResponseFor404) | Resource not found
-
-#### delete_sample_resource.ApiResponseFor204
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### delete_sample_resource.ApiResponseFor400
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### delete_sample_resource.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **get_sample_resource**
-<a name="get_sample_resource"></a>
-> SampleResource get_sample_resource(sampleresource_id)
-
-Get a SampleResource
-
-Gets the details of a single instance of a `SampleResource`.
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import resource_api
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = resource_api.ResourceApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'sampleresourceId': "sampleresourceId_example",
-    }
-    try:
-        # Get a SampleResource
-        api_response = api_instance.get_sample_resource(
-            path_params=path_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling ResourceApi->get_sample_resource: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-sampleresourceId | SampleresourceIdSchema | | 
-
-# SampleresourceIdSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#get_sample_resource.ApiResponseFor200) | Successful response - returns a single &#x60;SampleResource&#x60;.
-400 | [ApiResponseFor400](#get_sample_resource.ApiResponseFor400) | Parameter must be integer
-404 | [ApiResponseFor404](#get_sample_resource.ApiResponseFor404) | Resource not found
-
-#### get_sample_resource.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**SampleResource**](../../models/SampleResource.md) |  | 
-
-
-#### get_sample_resource.ApiResponseFor400
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### get_sample_resource.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **get_sample_resources**
-<a name="get_sample_resources"></a>
-> [SampleResource] get_sample_resources()
-
-List All SampleResources
-
-Gets a list of all `SampleResource` entities.
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import resource_api
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = resource_api.ResourceApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # List All SampleResources
-        api_response = api_instance.get_sample_resources()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling ResourceApi->get_sample_resources: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#get_sample_resources.ApiResponseFor200) | Successful response - returns an array of &#x60;SampleResource&#x60; entities.
-
-#### get_sample_resources.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**SampleResource**]({{complexTypePrefix}}SampleResource.md) | [**SampleResource**]({{complexTypePrefix}}SampleResource.md) | [**SampleResource**]({{complexTypePrefix}}SampleResource.md) |  | 
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **update_sample_resource**
-<a name="update_sample_resource"></a>
-> update_sample_resource(sampleresource_idsample_resource)
-
-Update a SampleResource
-
-Updates an existing `SampleResource`.
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import resource_api
-from cloudharness_cli/samples.model.sample_resource import SampleResource
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = resource_api.ResourceApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'sampleresourceId': "sampleresourceId_example",
-    }
-    body = SampleResource(
-        a=3.14,
-        b=3.14,
-        id=3.14,
-    )
-    try:
-        # Update a SampleResource
-        api_response = api_instance.update_sample_resource(
-            path_params=path_params,
-            body=body,
-        )
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling ResourceApi->update_sample_resource: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-body | typing.Union[SchemaForRequestBodyApplicationJson] | required |
-path_params | RequestPathParams | |
-content_type | str | optional, default is 'application/json' | Selects the schema and serialization of the request body
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### body
-
-# SchemaForRequestBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**SampleResource**](../../models/SampleResource.md) |  | 
-
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-sampleresourceId | SampleresourceIdSchema | | 
-
-# SampleresourceIdSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-202 | [ApiResponseFor202](#update_sample_resource.ApiResponseFor202) | Successful response.
-400 | [ApiResponseFor400](#update_sample_resource.ApiResponseFor400) | Parameter must be integer, payload must be of type SampleResource
-404 | [ApiResponseFor404](#update_sample_resource.ApiResponseFor404) | Resource not found
-
-#### update_sample_resource.ApiResponseFor202
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### update_sample_resource.ApiResponseFor400
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### update_sample_resource.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/apis/tags/TestApi.md b/libraries/client/cloudharness_cli/docs/samples/apis/tags/TestApi.md
deleted file mode 100644
index 9b85504c..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/apis/tags/TestApi.md
+++ /dev/null
@@ -1,148 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.samples.apis.tags.test_api.TestApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**error**](#error) | **get** /error | test sentry is working
-[**ping**](#ping) | **get** /ping | test the application is up
-
-# **error**
-<a name="error"></a>
-> str error()
-
-test sentry is working
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import test_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = test_api.TestApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # test sentry is working
-        api_response = api_instance.error()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling TestApi->error: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#error.ApiResponseFor200) | This won&#x27;t happen
-500 | [ApiResponseFor500](#error.ApiResponseFor500) | Sentry entry should come!
-
-#### error.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-#### error.ApiResponseFor500
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **ping**
-<a name="ping"></a>
-> int, float ping()
-
-test the application is up
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import test_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = test_api.TestApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # test the application is up
-        api_response = api_instance.ping()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling TestApi->ping: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#ping.ApiResponseFor200) | What we want
-500 | [ApiResponseFor500](#ping.ApiResponseFor500) | This shouldn&#x27;t happen
-
-#### ping.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-decimal.Decimal, int, float,  | decimal.Decimal,  |  | 
-
-#### ping.ApiResponseFor500
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/apis/tags/WorkflowsApi.md b/libraries/client/cloudharness_cli/docs/samples/apis/tags/WorkflowsApi.md
deleted file mode 100644
index b5754d76..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/apis/tags/WorkflowsApi.md
+++ /dev/null
@@ -1,230 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.samples.apis.tags.workflows_api.WorkflowsApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**submit_async**](#submit_async) | **get** /operation_async | Send an asynchronous operation
-[**submit_sync**](#submit_sync) | **get** /operation_sync | Send a synchronous operation
-[**submit_sync_with_results**](#submit_sync_with_results) | **get** /operation_sync_results | Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-
-# **submit_async**
-<a name="submit_async"></a>
-> InlineResponse202 submit_async()
-
-Send an asynchronous operation
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import workflows_api
-from cloudharness_cli/samples.model.inline_response202 import InlineResponse202
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = workflows_api.WorkflowsApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # Send an asynchronous operation
-        api_response = api_instance.submit_async()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling WorkflowsApi->submit_async: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-202 | [ApiResponseFor202](#submit_async.ApiResponseFor202) | Submitted operation. See also https://restfulapi.net/http-status-202-accepted/
-
-#### submit_async.ApiResponseFor202
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor202ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor202ResponseBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**InlineResponse202**](../../models/InlineResponse202.md) |  | 
-
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **submit_sync**
-<a name="submit_sync"></a>
-> {str: (bool, date, datetime, dict, float, int, list, str, none_type)} submit_sync()
-
-Send a synchronous operation
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import workflows_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = workflows_api.WorkflowsApi(api_client)
-
-    # example, this endpoint has no required or optional parameters
-    try:
-        # Send a synchronous operation
-        api_response = api_instance.submit_sync()
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling WorkflowsApi->submit_sync: %s\n" % e)
-```
-### Parameters
-This endpoint does not need any parameter.
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#submit_sync.ApiResponseFor200) | Operation result
-
-#### submit_sync.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **submit_sync_with_results**
-<a name="submit_sync_with_results"></a>
-> str submit_sync_with_results(ab)
-
-Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-
-### Example
-
-```python
-import cloudharness_cli.samples
-from cloudharness_cli.samples.apis.tags import workflows_api
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.samples.Configuration(
-    host = "/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.samples.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = workflows_api.WorkflowsApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    query_params = {
-        'a': 10,
-        'b': 10,
-    }
-    try:
-        # Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
-        api_response = api_instance.submit_sync_with_results(
-            query_params=query_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.samples.ApiException as e:
-        print("Exception when calling WorkflowsApi->submit_sync_with_results: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-query_params | RequestQueryParams | |
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### query_params
-#### RequestQueryParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-a | ASchema | | 
-b | BSchema | | 
-
-
-# ASchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-decimal.Decimal, int, float,  | decimal.Decimal,  |  | 
-
-# BSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-decimal.Decimal, int, float,  | decimal.Decimal,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#submit_sync_with_results.ApiResponseFor200) | Operation result
-
-#### submit_sync_with_results.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202.md b/libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202.md
deleted file mode 100644
index d94ffedd..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# cloudharness_cli.samples.model.inline_response202.InlineResponse202
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**task** | [**InlineResponse202Task**](InlineResponse202Task.md) | [**InlineResponse202Task**](InlineResponse202Task.md) |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202Task.md b/libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202Task.md
deleted file mode 100644
index 8f4c6566..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/models/InlineResponse202Task.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_cli.samples.model.inline_response202_task.InlineResponse202Task
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**href** | str,  | str,  | the url where to check the operation status | [optional] 
-**name** | str,  | str,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/samples/models/SampleResource.md b/libraries/client/cloudharness_cli/docs/samples/models/SampleResource.md
deleted file mode 100644
index 50956632..00000000
--- a/libraries/client/cloudharness_cli/docs/samples/models/SampleResource.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# cloudharness_cli.samples.model.sample_resource.SampleResource
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**a** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | 
-**b** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
-**id** | decimal.Decimal, int, float,  | decimal.Decimal,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaim.md b/libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaim.md
new file mode 100644
index 00000000..41dffef2
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaim.md
@@ -0,0 +1,32 @@
+# PersistentVolumeClaim
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** | Unique name for the Persisten Volume Claim | [optional] 
+**namespace** | **str** | The namespace where the Persistent Volume Claim resides in | [optional] 
+**accessmode** | **str** | The accessmode of the Persistent Volume Claim | [optional] 
+**size** | **str** | The size of the Persistent Volume Claim. | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of PersistentVolumeClaim from a JSON string
+persistent_volume_claim_instance = PersistentVolumeClaim.from_json(json)
+# print the JSON string representation of the object
+print(PersistentVolumeClaim.to_json())
+
+# convert the object into a dict
+persistent_volume_claim_dict = persistent_volume_claim_instance.to_dict()
+# create an instance of PersistentVolumeClaim from a dict
+persistent_volume_claim_from_dict = PersistentVolumeClaim.from_dict(persistent_volume_claim_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaimCreate.md b/libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaimCreate.md
new file mode 100644
index 00000000..c0936ab3
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/volumemanager/PersistentVolumeClaimCreate.md
@@ -0,0 +1,30 @@
+# PersistentVolumeClaimCreate
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** | Unique name for the Persisten Volume Claim to create. | [optional] 
+**size** | **str** | The size of the Persistent Volume Claim to create. | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of PersistentVolumeClaimCreate from a JSON string
+persistent_volume_claim_create_instance = PersistentVolumeClaimCreate.from_json(json)
+# print the JSON string representation of the object
+print(PersistentVolumeClaimCreate.to_json())
+
+# convert the object into a dict
+persistent_volume_claim_create_dict = persistent_volume_claim_create_instance.to_dict()
+# create an instance of PersistentVolumeClaimCreate from a dict
+persistent_volume_claim_create_from_dict = PersistentVolumeClaimCreate.from_dict(persistent_volume_claim_create_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/volumemanager/RestApi.md b/libraries/client/cloudharness_cli/docs/volumemanager/RestApi.md
new file mode 100644
index 00000000..15334dc8
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/volumemanager/RestApi.md
@@ -0,0 +1,165 @@
+# cloudharness_cli.volumemanager.RestApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**pvc_name_get**](RestApi.md#pvc_name_get) | **GET** /pvc/{name} | Retrieve a Persistent Volume Claim from the Kubernetes repository.
+[**pvc_post**](RestApi.md#pvc_post) | **POST** /pvc | Create a Persistent Volume Claim in Kubernetes
+
+
+# **pvc_name_get**
+> PersistentVolumeClaim pvc_name_get(name)
+
+Retrieve a Persistent Volume Claim from the Kubernetes repository.
+
+### Example
+
+* Bearer (JWT) Authentication (bearerAuth):
+
+```python
+import cloudharness_cli.volumemanager
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+from cloudharness_cli.volumemanager.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.volumemanager.Configuration(
+    host = "/api"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure Bearer authorization (JWT): bearerAuth
+configuration = cloudharness_cli.volumemanager.Configuration(
+    access_token = os.environ["BEARER_TOKEN"]
+)
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.volumemanager.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.volumemanager.RestApi(api_client)
+    name = 'name_example' # str | The name of the Persistent Volume Claim to be retrieved
+
+    try:
+        # Retrieve a Persistent Volume Claim from the Kubernetes repository.
+        api_response = api_instance.pvc_name_get(name)
+        print("The response of RestApi->pvc_name_get:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling RestApi->pvc_name_get: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **name** | **str**| The name of the Persistent Volume Claim to be retrieved | 
+
+### Return type
+
+[**PersistentVolumeClaim**](PersistentVolumeClaim.md)
+
+### Authorization
+
+[bearerAuth](../README.md#bearerAuth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | The Persistent Volume Claim. |  -  |
+**404** | The Persistent Volume Claim was not found. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **pvc_post**
+> PersistentVolumeClaim pvc_post(persistent_volume_claim_create)
+
+Create a Persistent Volume Claim in Kubernetes
+
+### Example
+
+* Bearer (JWT) Authentication (bearerAuth):
+
+```python
+import cloudharness_cli.volumemanager
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+from cloudharness_cli.volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate
+from cloudharness_cli.volumemanager.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.volumemanager.Configuration(
+    host = "/api"
+)
+
+# The client must configure the authentication and authorization parameters
+# in accordance with the API server security policy.
+# Examples for each auth method are provided below, use the example that
+# satisfies your auth use case.
+
+# Configure Bearer authorization (JWT): bearerAuth
+configuration = cloudharness_cli.volumemanager.Configuration(
+    access_token = os.environ["BEARER_TOKEN"]
+)
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.volumemanager.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.volumemanager.RestApi(api_client)
+    persistent_volume_claim_create = cloudharness_cli.volumemanager.PersistentVolumeClaimCreate() # PersistentVolumeClaimCreate | The Persistent Volume Claim to create.
+
+    try:
+        # Create a Persistent Volume Claim in Kubernetes
+        api_response = api_instance.pvc_post(persistent_volume_claim_create)
+        print("The response of RestApi->pvc_post:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling RestApi->pvc_post: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **persistent_volume_claim_create** | [**PersistentVolumeClaimCreate**](PersistentVolumeClaimCreate.md)| The Persistent Volume Claim to create. | 
+
+### Return type
+
+[**PersistentVolumeClaim**](PersistentVolumeClaim.md)
+
+### Authorization
+
+[bearerAuth](../README.md#bearerAuth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**201** | Save successful. |  -  |
+**400** | The Persistent Volume Claim already exists. |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/volumemanager/apis/tags/RestApi.md b/libraries/client/cloudharness_cli/docs/volumemanager/apis/tags/RestApi.md
deleted file mode 100644
index 17531ea2..00000000
--- a/libraries/client/cloudharness_cli/docs/volumemanager/apis/tags/RestApi.md
+++ /dev/null
@@ -1,217 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.volumemanager.apis.tags.rest_api.RestApi
-
-All URIs are relative to */api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**pvc_name_get**](#pvc_name_get) | **get** /pvc/{name} | Retrieve a Persistent Volume Claim from the Kubernetes repository.
-[**pvc_post**](#pvc_post) | **post** /pvc | Create a Persistent Volume Claim in Kubernetes
-
-# **pvc_name_get**
-<a name="pvc_name_get"></a>
-> PersistentVolumeClaim pvc_name_get(name)
-
-Retrieve a Persistent Volume Claim from the Kubernetes repository.
-
-### Example
-
-* Bearer (JWT) Authentication (bearerAuth):
-```python
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.apis.tags import rest_api
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.volumemanager.Configuration(
-    host = "/api"
-)
-
-# The client must configure the authentication and authorization parameters
-# in accordance with the API server security policy.
-# Examples for each auth method are provided below, use the example that
-# satisfies your auth use case.
-
-# Configure Bearer authorization (JWT): bearerAuth
-configuration = cloudharness_cli.volumemanager.Configuration(
-    access_token = 'YOUR_BEARER_TOKEN'
-)
-# Enter a context with an instance of the API client
-with cloudharness_cli.volumemanager.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = rest_api.RestApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'name': "name_example",
-    }
-    try:
-        # Retrieve a Persistent Volume Claim from the Kubernetes repository.
-        api_response = api_instance.pvc_name_get(
-            path_params=path_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.volumemanager.ApiException as e:
-        print("Exception when calling RestApi->pvc_name_get: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-name | NameSchema | | 
-
-# NameSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#pvc_name_get.ApiResponseFor200) | The Persistent Volume Claim.
-404 | [ApiResponseFor404](#pvc_name_get.ApiResponseFor404) | The Persistent Volume Claim was not found.
-
-#### pvc_name_get.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**PersistentVolumeClaim**](../../models/PersistentVolumeClaim.md) |  | 
-
-
-#### pvc_name_get.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-[bearerAuth](../../../README.md#bearerAuth)
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **pvc_post**
-<a name="pvc_post"></a>
-> PersistentVolumeClaim pvc_post(persistent_volume_claim_create)
-
-Create a Persistent Volume Claim in Kubernetes
-
-### Example
-
-* Bearer (JWT) Authentication (bearerAuth):
-```python
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.apis.tags import rest_api
-from cloudharness_cli/volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from cloudharness_cli/volumemanager.model.persistent_volume_claim_create import PersistentVolumeClaimCreate
-from pprint import pprint
-# Defining the host is optional and defaults to /api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.volumemanager.Configuration(
-    host = "/api"
-)
-
-# The client must configure the authentication and authorization parameters
-# in accordance with the API server security policy.
-# Examples for each auth method are provided below, use the example that
-# satisfies your auth use case.
-
-# Configure Bearer authorization (JWT): bearerAuth
-configuration = cloudharness_cli.volumemanager.Configuration(
-    access_token = 'YOUR_BEARER_TOKEN'
-)
-# Enter a context with an instance of the API client
-with cloudharness_cli.volumemanager.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = rest_api.RestApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    body = PersistentVolumeClaimCreate(
-        name="pvc-1",
-        size="2Gi (see also https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/resources.md#resource-quantities)",
-    )
-    try:
-        # Create a Persistent Volume Claim in Kubernetes
-        api_response = api_instance.pvc_post(
-            body=body,
-        )
-        pprint(api_response)
-    except cloudharness_cli.volumemanager.ApiException as e:
-        print("Exception when calling RestApi->pvc_post: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-body | typing.Union[SchemaForRequestBodyApplicationJson] | required |
-content_type | str | optional, default is 'application/json' | Selects the schema and serialization of the request body
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### body
-
-# SchemaForRequestBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**PersistentVolumeClaimCreate**](../../models/PersistentVolumeClaimCreate.md) |  | 
-
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-201 | [ApiResponseFor201](#pvc_post.ApiResponseFor201) | Save successful.
-400 | [ApiResponseFor400](#pvc_post.ApiResponseFor400) | The Persistent Volume Claim already exists.
-
-#### pvc_post.ApiResponseFor201
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor201ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor201ResponseBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**PersistentVolumeClaim**](../../models/PersistentVolumeClaim.md) |  | 
-
-
-#### pvc_post.ApiResponseFor400
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-[bearerAuth](../../../README.md#bearerAuth)
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaim.md b/libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaim.md
deleted file mode 100644
index dee966db..00000000
--- a/libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaim.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# cloudharness_cli.volumemanager.model.persistent_volume_claim.PersistentVolumeClaim
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**name** | str,  | str,  | Unique name for the Persisten Volume Claim | [optional] 
-**namespace** | str,  | str,  | The namespace where the Persistent Volume Claim resides in | [optional] 
-**accessmode** | str,  | str,  | The accessmode of the Persistent Volume Claim | [optional] 
-**size** | str,  | str,  | The size of the Persistent Volume Claim. | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaimCreate.md b/libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaimCreate.md
deleted file mode 100644
index b73300c2..00000000
--- a/libraries/client/cloudharness_cli/docs/volumemanager/models/PersistentVolumeClaimCreate.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloudharness_cli.volumemanager.model.persistent_volume_claim_create.PersistentVolumeClaimCreate
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict,  | frozendict.frozendict,  |  | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**name** | str,  | str,  | Unique name for the Persisten Volume Claim to create. | [optional] 
-**size** | str,  | str,  | The size of the Persistent Volume Claim to create. | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/workflows/CreateAndAccessApi.md b/libraries/client/cloudharness_cli/docs/workflows/CreateAndAccessApi.md
new file mode 100644
index 00000000..c8a9ce6d
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/workflows/CreateAndAccessApi.md
@@ -0,0 +1,290 @@
+# cloudharness_cli.workflows.CreateAndAccessApi
+
+All URIs are relative to */api*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**delete_operation**](CreateAndAccessApi.md#delete_operation) | **DELETE** /operations/{name} | deletes operation by name
+[**get_operation**](CreateAndAccessApi.md#get_operation) | **GET** /operations/{name} | get operation by name
+[**list_operations**](CreateAndAccessApi.md#list_operations) | **GET** /operations | lists operations
+[**log_operation**](CreateAndAccessApi.md#log_operation) | **GET** /operations/{name}/logs | get operation by name
+
+
+# **delete_operation**
+> delete_operation(name)
+
+deletes operation by name
+
+delete operation by its name 
+
+### Example
+
+
+```python
+import cloudharness_cli.workflows
+from cloudharness_cli.workflows.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.workflows.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.workflows.CreateAndAccessApi(api_client)
+    name = 'my-workflow' # str | 
+
+    try:
+        # deletes operation by name
+        api_instance.delete_operation(name)
+    except Exception as e:
+        print("Exception when calling CreateAndAccessApi->delete_operation: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **name** | **str**|  | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | delete OK |  -  |
+**404** | not found |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **get_operation**
+> str get_operation(name)
+
+get operation by name
+
+retrieves an operation by its name 
+
+### Example
+
+
+```python
+import cloudharness_cli.workflows
+from cloudharness_cli.workflows.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.workflows.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.workflows.CreateAndAccessApi(api_client)
+    name = 'name_example' # str | 
+
+    try:
+        # get operation by name
+        api_response = api_instance.get_operation(name)
+        print("The response of CreateAndAccessApi->get_operation:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling CreateAndAccessApi->get_operation: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **name** | **str**|  | 
+
+### Return type
+
+**str**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | search results matching criteria |  -  |
+**400** | Bad request |  -  |
+**404** | not found |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **list_operations**
+> OperationSearchResult list_operations(status=status, previous_search_token=previous_search_token, limit=limit)
+
+lists operations
+
+see all operations for the user 
+
+### Example
+
+
+```python
+import cloudharness_cli.workflows
+from cloudharness_cli.workflows.models.operation_search_result import OperationSearchResult
+from cloudharness_cli.workflows.models.operation_status import OperationStatus
+from cloudharness_cli.workflows.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.workflows.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.workflows.CreateAndAccessApi(api_client)
+    status = Pending # OperationStatus | filter by status (optional) (default to Pending)
+    previous_search_token = '\"eyJ2IjoibWV0YS5rOHMuaW8vdjEiLCJydiI6NDUzMDMzOCwic3RhcnQiOiJoZWxsby13b3JsZC05YnE2ZFx1MDAwMCJ8\"' # str | continue previous search (pagination chunks) (optional)
+    limit = 10 # int | maximum number of records to return per page (optional) (default to 10)
+
+    try:
+        # lists operations
+        api_response = api_instance.list_operations(status=status, previous_search_token=previous_search_token, limit=limit)
+        print("The response of CreateAndAccessApi->list_operations:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling CreateAndAccessApi->list_operations: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**OperationStatus**](.md)| filter by status | [optional] [default to Pending]
+ **previous_search_token** | **str**| continue previous search (pagination chunks) | [optional] 
+ **limit** | **int**| maximum number of records to return per page | [optional] [default to 10]
+
+### Return type
+
+[**OperationSearchResult**](OperationSearchResult.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | search results matching criteria |  -  |
+**400** | bad input parameter |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **log_operation**
+> str log_operation(name)
+
+get operation by name
+
+retrieves an operation log by its name 
+
+### Example
+
+
+```python
+import cloudharness_cli.workflows
+from cloudharness_cli.workflows.rest import ApiException
+from pprint import pprint
+
+# Defining the host is optional and defaults to /api
+# See configuration.py for a list of all supported configuration parameters.
+configuration = cloudharness_cli.workflows.Configuration(
+    host = "/api"
+)
+
+
+# Enter a context with an instance of the API client
+with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
+    # Create an instance of the API class
+    api_instance = cloudharness_cli.workflows.CreateAndAccessApi(api_client)
+    name = '\"my-operation\"' # str | 
+
+    try:
+        # get operation by name
+        api_response = api_instance.log_operation(name)
+        print("The response of CreateAndAccessApi->log_operation:\n")
+        pprint(api_response)
+    except Exception as e:
+        print("Exception when calling CreateAndAccessApi->log_operation: %s\n" % e)
+```
+
+
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **name** | **str**|  | 
+
+### Return type
+
+**str**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: text/plain
+
+### HTTP response details
+
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | search results matching criteria |  -  |
+**400** | Bad request |  -  |
+**404** | not found |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/libraries/client/cloudharness_cli/docs/workflows/Operation.md b/libraries/client/cloudharness_cli/docs/workflows/Operation.md
new file mode 100644
index 00000000..8c580ac4
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/workflows/Operation.md
@@ -0,0 +1,34 @@
+# Operation
+
+represents the status of a distributed API call
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**message** | **str** | usually set when an error occurred | [optional] 
+**name** | **str** | operation name | [optional] 
+**create_time** | **datetime** |  | [optional] [readonly] 
+**status** | [**OperationStatus**](OperationStatus.md) |  | [optional] [default to OperationStatus.PENDING]
+**workflow** | **str** | low level representation as an Argo json | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.workflows.models.operation import Operation
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of Operation from a JSON string
+operation_instance = Operation.from_json(json)
+# print the JSON string representation of the object
+print(Operation.to_json())
+
+# convert the object into a dict
+operation_dict = operation_instance.to_dict()
+# create an instance of Operation from a dict
+operation_from_dict = Operation.from_dict(operation_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/workflows/OperationSearchResult.md b/libraries/client/cloudharness_cli/docs/workflows/OperationSearchResult.md
new file mode 100644
index 00000000..d9bedbb4
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/workflows/OperationSearchResult.md
@@ -0,0 +1,31 @@
+# OperationSearchResult
+
+a list of operations with meta data about the result
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**meta** | [**SearchResultData**](SearchResultData.md) |  | [optional] 
+**items** | [**List[Operation]**](Operation.md) |  | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.workflows.models.operation_search_result import OperationSearchResult
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of OperationSearchResult from a JSON string
+operation_search_result_instance = OperationSearchResult.from_json(json)
+# print the JSON string representation of the object
+print(OperationSearchResult.to_json())
+
+# convert the object into a dict
+operation_search_result_dict = operation_search_result_instance.to_dict()
+# create an instance of OperationSearchResult from a dict
+operation_search_result_from_dict = OperationSearchResult.from_dict(operation_search_result_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/workflows/OperationStatus.md b/libraries/client/cloudharness_cli/docs/workflows/OperationStatus.md
new file mode 100644
index 00000000..70956389
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/workflows/OperationStatus.md
@@ -0,0 +1,20 @@
+# OperationStatus
+
+
+## Enum
+
+* `PENDING` (value: `'Pending'`)
+
+* `RUNNING` (value: `'Running'`)
+
+* `ERROR` (value: `'Error'`)
+
+* `SUCCEEDED` (value: `'Succeeded'`)
+
+* `SKIPPED` (value: `'Skipped'`)
+
+* `FAILED` (value: `'Failed'`)
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/workflows/SearchResultData.md b/libraries/client/cloudharness_cli/docs/workflows/SearchResultData.md
new file mode 100644
index 00000000..f7978e00
--- /dev/null
+++ b/libraries/client/cloudharness_cli/docs/workflows/SearchResultData.md
@@ -0,0 +1,30 @@
+# SearchResultData
+
+describes a search
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**continue_token** | **str** | token to use for pagination | [optional] 
+
+## Example
+
+```python
+from cloudharness_cli.workflows.models.search_result_data import SearchResultData
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of SearchResultData from a JSON string
+search_result_data_instance = SearchResultData.from_json(json)
+# print the JSON string representation of the object
+print(SearchResultData.to_json())
+
+# convert the object into a dict
+search_result_data_dict = search_result_data_instance.to_dict()
+# create an instance of SearchResultData from a dict
+search_result_data_from_dict = SearchResultData.from_dict(search_result_data_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/libraries/client/cloudharness_cli/docs/workflows/apis/tags/CreateAndAccessApi.md b/libraries/client/cloudharness_cli/docs/workflows/apis/tags/CreateAndAccessApi.md
deleted file mode 100644
index 9696ac40..00000000
--- a/libraries/client/cloudharness_cli/docs/workflows/apis/tags/CreateAndAccessApi.md
+++ /dev/null
@@ -1,416 +0,0 @@
-<a name="__pageTop"></a>
-# cloudharness_cli.workflows.apis.tags.create_and_access_api.CreateAndAccessApi
-
-All URIs are relative to *https://workflows.cloudharness.metacell.us/api*
-
-Method | HTTP request | Description
-------------- | ------------- | -------------
-[**delete_operation**](#delete_operation) | **delete** /operations/{name} | deletes operation by name
-[**get_operation**](#get_operation) | **get** /operations/{name} | get operation by name
-[**list_operations**](#list_operations) | **get** /operations | lists operations
-[**log_operation**](#log_operation) | **get** /operations/{name}/logs | get operation by name
-
-# **delete_operation**
-<a name="delete_operation"></a>
-> delete_operation(name)
-
-deletes operation by name
-
-delete operation by its name 
-
-### Example
-
-```python
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.apis.tags import create_and_access_api
-from pprint import pprint
-# Defining the host is optional and defaults to https://workflows.cloudharness.metacell.us/api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.workflows.Configuration(
-    host = "https://workflows.cloudharness.metacell.us/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = create_and_access_api.CreateAndAccessApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'name': "name_example",
-    }
-    try:
-        # deletes operation by name
-        api_response = api_instance.delete_operation(
-            path_params=path_params,
-        )
-    except cloudharness_cli.workflows.ApiException as e:
-        print("Exception when calling CreateAndAccessApi->delete_operation: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-name | NameSchema | | 
-
-# NameSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#delete_operation.ApiResponseFor200) | delete OK
-404 | [ApiResponseFor404](#delete_operation.ApiResponseFor404) | not found
-
-#### delete_operation.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-#### delete_operation.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **get_operation**
-<a name="get_operation"></a>
-> [Operation] get_operation(name)
-
-get operation by name
-
-retrieves an operation by its name 
-
-### Example
-
-```python
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.apis.tags import create_and_access_api
-from cloudharness_cli/workflows.model.operation import Operation
-from pprint import pprint
-# Defining the host is optional and defaults to https://workflows.cloudharness.metacell.us/api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.workflows.Configuration(
-    host = "https://workflows.cloudharness.metacell.us/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = create_and_access_api.CreateAndAccessApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'name': "name_example",
-    }
-    try:
-        # get operation by name
-        api_response = api_instance.get_operation(
-            path_params=path_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.workflows.ApiException as e:
-        print("Exception when calling CreateAndAccessApi->get_operation: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-name | NameSchema | | 
-
-# NameSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#get_operation.ApiResponseFor200) | search results matching criteria
-404 | [ApiResponseFor404](#get_operation.ApiResponseFor404) | not found
-
-#### get_operation.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**Operation**]({{complexTypePrefix}}Operation.md) | [**Operation**]({{complexTypePrefix}}Operation.md) | [**Operation**]({{complexTypePrefix}}Operation.md) |  | 
-
-#### get_operation.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **list_operations**
-<a name="list_operations"></a>
-> OperationSearchResult list_operations()
-
-lists operations
-
-see all operations for the user 
-
-### Example
-
-```python
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.apis.tags import create_and_access_api
-from cloudharness_cli/workflows.model.operation_search_result import OperationSearchResult
-from cloudharness_cli/workflows.model.operation_status import OperationStatus
-from pprint import pprint
-# Defining the host is optional and defaults to https://workflows.cloudharness.metacell.us/api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.workflows.Configuration(
-    host = "https://workflows.cloudharness.metacell.us/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = create_and_access_api.CreateAndAccessApi(api_client)
-
-    # example passing only optional values
-    query_params = {
-        'status': OperationStatus("QUEUED"),
-        'previous_search_token': "previous_search_token_example",
-        'limit': 10,
-    }
-    try:
-        # lists operations
-        api_response = api_instance.list_operations(
-            query_params=query_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.workflows.ApiException as e:
-        print("Exception when calling CreateAndAccessApi->list_operations: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-query_params | RequestQueryParams | |
-accept_content_types | typing.Tuple[str] | default is ('application/json', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### query_params
-#### RequestQueryParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-status | StatusSchema | | optional
-previous_search_token | PreviousSearchTokenSchema | | optional
-limit | LimitSchema | | optional
-
-
-# StatusSchema
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**OperationStatus**](../../models/OperationStatus.md) |  | 
-
-
-# PreviousSearchTokenSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-# LimitSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-decimal.Decimal, int,  | decimal.Decimal,  |  | if omitted the server will use the default value of 10
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#list_operations.ApiResponseFor200) | search results matching criteria
-400 | [ApiResponseFor400](#list_operations.ApiResponseFor400) | bad input parameter
-
-#### list_operations.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyApplicationJson, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyApplicationJson
-Type | Description  | Notes
-------------- | ------------- | -------------
-[**OperationSearchResult**](../../models/OperationSearchResult.md) |  | 
-
-
-#### list_operations.ApiResponseFor400
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
-# **log_operation**
-<a name="log_operation"></a>
-> str log_operation(name)
-
-get operation by name
-
-retrieves an operation log by its name 
-
-### Example
-
-```python
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.apis.tags import create_and_access_api
-from pprint import pprint
-# Defining the host is optional and defaults to https://workflows.cloudharness.metacell.us/api
-# See configuration.py for a list of all supported configuration parameters.
-configuration = cloudharness_cli.workflows.Configuration(
-    host = "https://workflows.cloudharness.metacell.us/api"
-)
-
-# Enter a context with an instance of the API client
-with cloudharness_cli.workflows.ApiClient(configuration) as api_client:
-    # Create an instance of the API class
-    api_instance = create_and_access_api.CreateAndAccessApi(api_client)
-
-    # example passing only required values which don't have defaults set
-    path_params = {
-        'name': "name_example",
-    }
-    try:
-        # get operation by name
-        api_response = api_instance.log_operation(
-            path_params=path_params,
-        )
-        pprint(api_response)
-    except cloudharness_cli.workflows.ApiException as e:
-        print("Exception when calling CreateAndAccessApi->log_operation: %s\n" % e)
-```
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-path_params | RequestPathParams | |
-accept_content_types | typing.Tuple[str] | default is ('text/plain', ) | Tells the server the content type(s) that are accepted by the client
-stream | bool | default is False | if True then the response.content will be streamed and loaded from a file like object. When downloading a file, set this to True to force the code to deserialize the content to a FileSchema file
-timeout | typing.Optional[typing.Union[int, typing.Tuple]] | default is None | the timeout used by the rest client
-skip_deserialization | bool | default is False | when True, headers and body will be unset and an instance of api_client.ApiResponseWithoutDeserialization will be returned
-
-### path_params
-#### RequestPathParams
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-name | NameSchema | | 
-
-# NameSchema
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-### Return Types, Responses
-
-Code | Class | Description
-------------- | ------------- | -------------
-n/a | api_client.ApiResponseWithoutDeserialization | When skip_deserialization is True this response is returned
-200 | [ApiResponseFor200](#log_operation.ApiResponseFor200) | search results matching criteria
-404 | [ApiResponseFor404](#log_operation.ApiResponseFor404) | not found
-
-#### log_operation.ApiResponseFor200
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | typing.Union[SchemaFor200ResponseBodyTextPlain, ] |  |
-headers | Unset | headers were not defined |
-
-# SchemaFor200ResponseBodyTextPlain
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | 
-
-#### log_operation.ApiResponseFor404
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-response | urllib3.HTTPResponse | Raw response |
-body | Unset | body was not defined |
-headers | Unset | headers were not defined |
-
-### Authorization
-
-No authorization required
-
-[[Back to top]](#__pageTop) [[Back to API list]](../../../README.md#documentation-for-api-endpoints) [[Back to Model list]](../../../README.md#documentation-for-models) [[Back to README]](../../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/workflows/models/Operation.md b/libraries/client/cloudharness_cli/docs/workflows/models/Operation.md
deleted file mode 100644
index 8f041898..00000000
--- a/libraries/client/cloudharness_cli/docs/workflows/models/Operation.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# cloudharness_cli.workflows.model.operation.Operation
-
-represents the status of a distributed API call
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | represents the status of a distributed API call | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**message** | str,  | str,  | usually set when an error occurred | [optional] 
-**name** | str,  | str,  | operation name | [optional] 
-**createTime** | str, datetime,  | str,  |  | [optional] value must conform to RFC-3339 date-time
-**status** | [**OperationStatus**](OperationStatus.md) | [**OperationStatus**](OperationStatus.md) |  | [optional] 
-**workflow** | str,  | str,  | low level representation as an Argo json | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/workflows/models/OperationSearchResult.md b/libraries/client/cloudharness_cli/docs/workflows/models/OperationSearchResult.md
deleted file mode 100644
index 59f999cc..00000000
--- a/libraries/client/cloudharness_cli/docs/workflows/models/OperationSearchResult.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# cloudharness_cli.workflows.model.operation_search_result.OperationSearchResult
-
-a list of operations with meta data about the result
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | a list of operations with meta data about the result | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**meta** | [**SearchResultData**](SearchResultData.md) | [**SearchResultData**](SearchResultData.md) |  | [optional] 
-**[items](#items)** | list, tuple,  | tuple,  |  | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-# items
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-list, tuple,  | tuple,  |  | 
-
-### Tuple Items
-Class Name | Input Type | Accessed Type | Description | Notes
-------------- | ------------- | ------------- | ------------- | -------------
-[**Operation**](Operation.md) | [**Operation**](Operation.md) | [**Operation**](Operation.md) |  | 
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/workflows/models/OperationStatus.md b/libraries/client/cloudharness_cli/docs/workflows/models/OperationStatus.md
deleted file mode 100644
index 02033a2d..00000000
--- a/libraries/client/cloudharness_cli/docs/workflows/models/OperationStatus.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloudharness_cli.workflows.model.operation_status.OperationStatus
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-str,  | str,  |  | must be one of ["Pending", "Running", "Error", "Succeeded", "Skipped", "Failed", ] if omitted the server will use the default value of "Pending"
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/docs/workflows/models/SearchResultData.md b/libraries/client/cloudharness_cli/docs/workflows/models/SearchResultData.md
deleted file mode 100644
index a6f955d5..00000000
--- a/libraries/client/cloudharness_cli/docs/workflows/models/SearchResultData.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# cloudharness_cli.workflows.model.search_result_data.SearchResultData
-
-describes a search
-
-## Model Type Info
-Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | -------------
-dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO | describes a search | 
-
-### Dictionary Keys
-Key | Input Type | Accessed Type | Description | Notes
------------- | ------------- | ------------- | ------------- | -------------
-**continueToken** | str,  | str,  | token to use for pagination | [optional] 
-**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
-
-[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
-
diff --git a/libraries/client/cloudharness_cli/requirements.txt b/libraries/client/cloudharness_cli/requirements.txt
index 8695929d..cc85509e 100644
--- a/libraries/client/cloudharness_cli/requirements.txt
+++ b/libraries/client/cloudharness_cli/requirements.txt
@@ -1,5 +1,5 @@
-certifi
-frozendict
-python-dateutil
-typing_extensions
-urllib3
\ No newline at end of file
+python_dateutil >= 2.5.3
+setuptools >= 21.0.0
+urllib3 >= 1.25.3, < 2.1.0
+pydantic >= 2
+typing-extensions >= 4.7.1
diff --git a/libraries/client/cloudharness_cli/setup.py b/libraries/client/cloudharness_cli/setup.py
index 890b95c2..2d976676 100644
--- a/libraries/client/cloudharness_cli/setup.py
+++ b/libraries/client/cloudharness_cli/setup.py
@@ -20,7 +20,8 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["urllib3 >= 1.26.8", "six >= 1.10", "certifi", "python-dateutil"]
+REQUIRES = ["urllib3 >= 1.25.3, < 2.1.0", "python_dateutil >= 2.5.3", "pydantic >= 2", "typing-extensions >= 4.7.1"]
+
 
 setup(
     name=NAME,
@@ -37,4 +38,4 @@
     long_description="""\
     CloudHarness Python API Client  # noqa: E501
     """
-)
\ No newline at end of file
+)
diff --git a/libraries/client/cloudharness_cli/test-requirements.txt b/libraries/client/cloudharness_cli/test-requirements.txt
index a52b63cb..8e6d8cb1 100644
--- a/libraries/client/cloudharness_cli/test-requirements.txt
+++ b/libraries/client/cloudharness_cli/test-requirements.txt
@@ -1,3 +1,5 @@
-pytest
-pytest-cov
-pytest-randomly
\ No newline at end of file
+pytest~=7.1.3
+pytest-cov>=2.8.1
+pytest-randomly>=3.12.0
+mypy>=1.4.1
+types-python-dateutil>=2.8.19
diff --git a/libraries/client/cloudharness_cli/test/common/test_paths/__init__.py b/libraries/client/cloudharness_cli/test/common/test_paths/__init__.py
deleted file mode 100644
index 1309632d..00000000
--- a/libraries/client/cloudharness_cli/test/common/test_paths/__init__.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import json
-import typing
-
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-
-class ApiTestMixin:
-    json_content_type = 'application/json'
-    user_agent = 'OpenAPI-Generator/1.0.0/python'
-
-    @classmethod
-    def assert_pool_manager_request_called_with(
-        cls,
-        mock_request,
-        url: str,
-        method: str = 'POST',
-        body: typing.Optional[bytes] = None,
-        content_type: typing.Optional[str] = None,
-        accept_content_type: typing.Optional[str] = None,
-        stream: bool = False,
-    ):
-        headers = {
-            'User-Agent': cls.user_agent
-        }
-        if accept_content_type:
-            headers['Accept'] = accept_content_type
-        if content_type:
-            headers['Content-Type'] = content_type
-        kwargs = dict(
-            headers=HTTPHeaderDict(headers),
-            preload_content=not stream,
-            timeout=None,
-        )
-        if content_type and method != 'GET':
-            kwargs['body'] = body
-        mock_request.assert_called_with(
-            method,
-            url,
-            **kwargs
-        )
-
-    @staticmethod
-    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
-        return {'content-type': content_type}
-
-    @classmethod
-    def response(
-        cls,
-        body: typing.Union[str, bytes],
-        status: int = 200,
-        content_type: str = json_content_type,
-        headers: typing.Optional[typing.Dict[str, str]] = None,
-        preload_content: bool = True
-    ) -> urllib3.HTTPResponse:
-        if headers is None:
-            headers = {}
-        headers.update(cls.headers_for_content_type(content_type))
-        return urllib3.HTTPResponse(
-            body,
-            headers=headers,
-            status=status,
-            preload_content=preload_content
-        )
-
-    @staticmethod
-    def json_bytes(in_data: typing.Any) -> bytes:
-        return json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode('utf-8')
diff --git a/libraries/client/cloudharness_cli/test/common/test_paths/test_accounts_config/test_get.py b/libraries/client/cloudharness_cli/test/common/test_paths/test_accounts_config/test_get.py
deleted file mode 100644
index 5ee88ae2..00000000
--- a/libraries/client/cloudharness_cli/test/common/test_paths/test_accounts_config/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.common
-from cloudharness_cli.common.paths.accounts_config import get  # noqa: E501
-from cloudharness_cli.common import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestAccountsConfig(ApiTestMixin, unittest.TestCase):
-    """
-    AccountsConfig unit test stubs
-        Gets the config for logging in into accounts  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/common/test_paths/test_sentry_getdsn_appname/test_get.py b/libraries/client/cloudharness_cli/test/common/test_paths/test_sentry_getdsn_appname/test_get.py
deleted file mode 100644
index 37e0c1b1..00000000
--- a/libraries/client/cloudharness_cli/test/common/test_paths/test_sentry_getdsn_appname/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.common
-from cloudharness_cli.common.paths.sentry_getdsn_appname import get  # noqa: E501
-from cloudharness_cli.common import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestSentryGetdsnAppname(ApiTestMixin, unittest.TestCase):
-    """
-    SentryGetdsnAppname unit test stubs
-        Gets the Sentry DSN for a given application  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/__init__.py b/libraries/client/cloudharness_cli/test/samples/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_models/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_models/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202.py b/libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202.py
deleted file mode 100644
index dcb1feee..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.model.inline_response202 import InlineResponse202
-from cloudharness_cli.samples import configuration
-
-
-class TestInlineResponse202(unittest.TestCase):
-    """InlineResponse202 unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202_task.py b/libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202_task.py
deleted file mode 100644
index 78e6091e..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_models/test_inline_response202_task.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.model.inline_response202_task import InlineResponse202Task
-from cloudharness_cli.samples import configuration
-
-
-class TestInlineResponse202Task(unittest.TestCase):
-    """InlineResponse202Task unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_models/test_sample_resource.py b/libraries/client/cloudharness_cli/test/samples/test_models/test_sample_resource.py
deleted file mode 100644
index f9666f6c..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_models/test_sample_resource.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    CloudHarness Sample API
-
-    CloudHarness Sample api  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.model.sample_resource import SampleResource
-from cloudharness_cli.samples import configuration
-
-
-class TestSampleResource(unittest.TestCase):
-    """SampleResource unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/__init__.py
deleted file mode 100644
index 1309632d..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/__init__.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import json
-import typing
-
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-
-class ApiTestMixin:
-    json_content_type = 'application/json'
-    user_agent = 'OpenAPI-Generator/1.0.0/python'
-
-    @classmethod
-    def assert_pool_manager_request_called_with(
-        cls,
-        mock_request,
-        url: str,
-        method: str = 'POST',
-        body: typing.Optional[bytes] = None,
-        content_type: typing.Optional[str] = None,
-        accept_content_type: typing.Optional[str] = None,
-        stream: bool = False,
-    ):
-        headers = {
-            'User-Agent': cls.user_agent
-        }
-        if accept_content_type:
-            headers['Accept'] = accept_content_type
-        if content_type:
-            headers['Content-Type'] = content_type
-        kwargs = dict(
-            headers=HTTPHeaderDict(headers),
-            preload_content=not stream,
-            timeout=None,
-        )
-        if content_type and method != 'GET':
-            kwargs['body'] = body
-        mock_request.assert_called_with(
-            method,
-            url,
-            **kwargs
-        )
-
-    @staticmethod
-    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
-        return {'content-type': content_type}
-
-    @classmethod
-    def response(
-        cls,
-        body: typing.Union[str, bytes],
-        status: int = 200,
-        content_type: str = json_content_type,
-        headers: typing.Optional[typing.Dict[str, str]] = None,
-        preload_content: bool = True
-    ) -> urllib3.HTTPResponse:
-        if headers is None:
-            headers = {}
-        headers.update(cls.headers_for_content_type(content_type))
-        return urllib3.HTTPResponse(
-            body,
-            headers=headers,
-            status=status,
-            preload_content=preload_content
-        )
-
-    @staticmethod
-    def json_bytes(in_data: typing.Any) -> bytes:
-        return json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode('utf-8')
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_error/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_error/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_error/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_error/test_get.py
deleted file mode 100644
index 8f79b1c3..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_error/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.error import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestError(ApiTestMixin, unittest.TestCase):
-    """
-    Error unit test stubs
-        test sentry is working  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/test_get.py
deleted file mode 100644
index ad8c32ac..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_async/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.operation_async import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperationAsync(ApiTestMixin, unittest.TestCase):
-    """
-    OperationAsync unit test stubs
-        Send an asynchronous operation  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 202
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/test_get.py
deleted file mode 100644
index d37e0bd3..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.operation_sync import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperationSync(ApiTestMixin, unittest.TestCase):
-    """
-    OperationSync unit test stubs
-        Send a synchronous operation  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/test_get.py
deleted file mode 100644
index b38ce813..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_operation_sync_results/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.operation_sync_results import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperationSyncResults(ApiTestMixin, unittest.TestCase):
-    """
-    OperationSyncResults unit test stubs
-        Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/test_get.py
deleted file mode 100644
index 1a79170f..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_ping/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.ping import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestPing(ApiTestMixin, unittest.TestCase):
-    """
-    Ping unit test stubs
-        test the application is up  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_get.py
deleted file mode 100644
index 3e24f5dd..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.sampleresources import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestSampleresources(ApiTestMixin, unittest.TestCase):
-    """
-    Sampleresources unit test stubs
-        List All SampleResources  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_post.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_post.py
deleted file mode 100644
index 7f25bf27..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources/test_post.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.sampleresources import post  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestSampleresources(ApiTestMixin, unittest.TestCase):
-    """
-    Sampleresources unit test stubs
-        Create a SampleResource  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 201
-    response_body = ''
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_delete.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_delete.py
deleted file mode 100644
index 8a005589..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_delete.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id import delete  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestSampleresourcesSampleresourceId(ApiTestMixin, unittest.TestCase):
-    """
-    SampleresourcesSampleresourceId unit test stubs
-        Delete a SampleResource  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 204
-    response_body = ''
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_get.py
deleted file mode 100644
index eb998be8..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestSampleresourcesSampleresourceId(ApiTestMixin, unittest.TestCase):
-    """
-    SampleresourcesSampleresourceId unit test stubs
-        Get a SampleResource  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_put.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_put.py
deleted file mode 100644
index 5a6f0d66..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_sampleresources_sampleresource_id/test_put.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.sampleresources_sampleresource_id import put  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestSampleresourcesSampleresourceId(ApiTestMixin, unittest.TestCase):
-    """
-    SampleresourcesSampleresourceId unit test stubs
-        Update a SampleResource  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 202
-    response_body = ''
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/test_get.py
deleted file mode 100644
index 285fc19b..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.valid import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestValid(ApiTestMixin, unittest.TestCase):
-    """
-    Valid unit test stubs
-        Check if the token is valid. Get a token by logging into the base url  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/__init__.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/test_get.py b/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/test_get.py
deleted file mode 100644
index 9e429e67..00000000
--- a/libraries/client/cloudharness_cli/test/samples/test_paths/test_valid_cookie/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.samples
-from cloudharness_cli.samples.paths.valid_cookie import get  # noqa: E501
-from cloudharness_cli.samples import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestValidCookie(ApiTestMixin, unittest.TestCase):
-    """
-    ValidCookie unit test stubs
-        Check if the token is valid. Get a token by logging into the base url  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/__init__.py b/libraries/client/cloudharness_cli/test/volumemanager/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_models/__init__.py b/libraries/client/cloudharness_cli/test/volumemanager/test_models/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim.py b/libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim.py
deleted file mode 100644
index db8d7496..00000000
--- a/libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.model.persistent_volume_claim import PersistentVolumeClaim
-from cloudharness_cli.volumemanager import configuration
-
-
-class TestPersistentVolumeClaim(unittest.TestCase):
-    """PersistentVolumeClaim unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim_create.py b/libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim_create.py
deleted file mode 100644
index 72080fbb..00000000
--- a/libraries/client/cloudharness_cli/test/volumemanager/test_models/test_persistent_volume_claim_create.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding: utf-8
-
-"""
-    Volumes manager API
-
-    CloudHarness Volumes manager API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.model.persistent_volume_claim_create import PersistentVolumeClaimCreate
-from cloudharness_cli.volumemanager import configuration
-
-
-class TestPersistentVolumeClaimCreate(unittest.TestCase):
-    """PersistentVolumeClaimCreate unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/__init__.py b/libraries/client/cloudharness_cli/test/volumemanager/test_paths/__init__.py
deleted file mode 100644
index 1309632d..00000000
--- a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/__init__.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import json
-import typing
-
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-
-class ApiTestMixin:
-    json_content_type = 'application/json'
-    user_agent = 'OpenAPI-Generator/1.0.0/python'
-
-    @classmethod
-    def assert_pool_manager_request_called_with(
-        cls,
-        mock_request,
-        url: str,
-        method: str = 'POST',
-        body: typing.Optional[bytes] = None,
-        content_type: typing.Optional[str] = None,
-        accept_content_type: typing.Optional[str] = None,
-        stream: bool = False,
-    ):
-        headers = {
-            'User-Agent': cls.user_agent
-        }
-        if accept_content_type:
-            headers['Accept'] = accept_content_type
-        if content_type:
-            headers['Content-Type'] = content_type
-        kwargs = dict(
-            headers=HTTPHeaderDict(headers),
-            preload_content=not stream,
-            timeout=None,
-        )
-        if content_type and method != 'GET':
-            kwargs['body'] = body
-        mock_request.assert_called_with(
-            method,
-            url,
-            **kwargs
-        )
-
-    @staticmethod
-    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
-        return {'content-type': content_type}
-
-    @classmethod
-    def response(
-        cls,
-        body: typing.Union[str, bytes],
-        status: int = 200,
-        content_type: str = json_content_type,
-        headers: typing.Optional[typing.Dict[str, str]] = None,
-        preload_content: bool = True
-    ) -> urllib3.HTTPResponse:
-        if headers is None:
-            headers = {}
-        headers.update(cls.headers_for_content_type(content_type))
-        return urllib3.HTTPResponse(
-            body,
-            headers=headers,
-            status=status,
-            preload_content=preload_content
-        )
-
-    @staticmethod
-    def json_bytes(in_data: typing.Any) -> bytes:
-        return json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode('utf-8')
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/__init__.py b/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/test_post.py b/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/test_post.py
deleted file mode 100644
index 057c0ec8..00000000
--- a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc/test_post.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.paths.pvc import post  # noqa: E501
-from cloudharness_cli.volumemanager import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestPvc(ApiTestMixin, unittest.TestCase):
-    """
-    Pvc unit test stubs
-        Create a Persistent Volume Claim in Kubernetes  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 201
-
-
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/__init__.py b/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/test_get.py b/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/test_get.py
deleted file mode 100644
index 295f33af..00000000
--- a/libraries/client/cloudharness_cli/test/volumemanager/test_paths/test_pvc_name/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.volumemanager
-from cloudharness_cli.volumemanager.paths.pvc_name import get  # noqa: E501
-from cloudharness_cli.volumemanager import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestPvcName(ApiTestMixin, unittest.TestCase):
-    """
-    PvcName unit test stubs
-        Retrieve a Persistent Volume Claim from the Kubernetes repository.  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/__init__.py b/libraries/client/cloudharness_cli/test/workflows/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_models/__init__.py b/libraries/client/cloudharness_cli/test/workflows/test_models/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation.py b/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation.py
deleted file mode 100644
index 1aa716b1..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.model.operation import Operation
-from cloudharness_cli.workflows import configuration
-
-
-class TestOperation(unittest.TestCase):
-    """Operation unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_search_result.py b/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_search_result.py
deleted file mode 100644
index b8ddad87..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_search_result.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.model.operation_search_result import OperationSearchResult
-from cloudharness_cli.workflows import configuration
-
-
-class TestOperationSearchResult(unittest.TestCase):
-    """OperationSearchResult unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_status.py b/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_status.py
deleted file mode 100644
index 8b4bbf95..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_models/test_operation_status.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.model.operation_status import OperationStatus
-from cloudharness_cli.workflows import configuration
-
-
-class TestOperationStatus(unittest.TestCase):
-    """OperationStatus unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_models/test_search_result_data.py b/libraries/client/cloudharness_cli/test/workflows/test_models/test_search_result_data.py
deleted file mode 100644
index e3af6402..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_models/test_search_result_data.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# coding: utf-8
-
-"""
-    Workflows API
-
-    Workflows API  # noqa: E501
-
-    The version of the OpenAPI document: 0.1.0
-    Contact: cloudharness@metacell.us
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.model.search_result_data import SearchResultData
-from cloudharness_cli.workflows import configuration
-
-
-class TestSearchResultData(unittest.TestCase):
-    """SearchResultData unit test stubs"""
-    _configuration = configuration.Configuration()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/__init__.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/__init__.py
deleted file mode 100644
index 1309632d..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_paths/__init__.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import json
-import typing
-
-import urllib3
-from urllib3._collections import HTTPHeaderDict
-
-
-class ApiTestMixin:
-    json_content_type = 'application/json'
-    user_agent = 'OpenAPI-Generator/1.0.0/python'
-
-    @classmethod
-    def assert_pool_manager_request_called_with(
-        cls,
-        mock_request,
-        url: str,
-        method: str = 'POST',
-        body: typing.Optional[bytes] = None,
-        content_type: typing.Optional[str] = None,
-        accept_content_type: typing.Optional[str] = None,
-        stream: bool = False,
-    ):
-        headers = {
-            'User-Agent': cls.user_agent
-        }
-        if accept_content_type:
-            headers['Accept'] = accept_content_type
-        if content_type:
-            headers['Content-Type'] = content_type
-        kwargs = dict(
-            headers=HTTPHeaderDict(headers),
-            preload_content=not stream,
-            timeout=None,
-        )
-        if content_type and method != 'GET':
-            kwargs['body'] = body
-        mock_request.assert_called_with(
-            method,
-            url,
-            **kwargs
-        )
-
-    @staticmethod
-    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
-        return {'content-type': content_type}
-
-    @classmethod
-    def response(
-        cls,
-        body: typing.Union[str, bytes],
-        status: int = 200,
-        content_type: str = json_content_type,
-        headers: typing.Optional[typing.Dict[str, str]] = None,
-        preload_content: bool = True
-    ) -> urllib3.HTTPResponse:
-        if headers is None:
-            headers = {}
-        headers.update(cls.headers_for_content_type(content_type))
-        return urllib3.HTTPResponse(
-            body,
-            headers=headers,
-            status=status,
-            preload_content=preload_content
-        )
-
-    @staticmethod
-    def json_bytes(in_data: typing.Any) -> bytes:
-        return json.dumps(in_data, separators=(",", ":"), ensure_ascii=False).encode('utf-8')
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/__init__.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/test_get.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/test_get.py
deleted file mode 100644
index 016df839..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.paths.operations import get  # noqa: E501
-from cloudharness_cli.workflows import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperations(ApiTestMixin, unittest.TestCase):
-    """
-    Operations unit test stubs
-        lists operations  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/__init__.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_delete.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_delete.py
deleted file mode 100644
index 9a16227f..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_delete.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.paths.operations_name import delete  # noqa: E501
-from cloudharness_cli.workflows import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperationsName(ApiTestMixin, unittest.TestCase):
-    """
-    OperationsName unit test stubs
-        deletes operation by name  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-    response_body = ''
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_get.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_get.py
deleted file mode 100644
index a8b59d82..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.paths.operations_name import get  # noqa: E501
-from cloudharness_cli.workflows import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperationsName(ApiTestMixin, unittest.TestCase):
-    """
-    OperationsName unit test stubs
-        get operation by name  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/__init__.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/test_get.py b/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/test_get.py
deleted file mode 100644
index eed81d30..00000000
--- a/libraries/client/cloudharness_cli/test/workflows/test_paths/test_operations_name_logs/test_get.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# coding: utf-8
-
-"""
-
-
-    Generated by: https://openapi-generator.tech
-"""
-
-import unittest
-from unittest.mock import patch
-
-import urllib3
-
-import cloudharness_cli.workflows
-from cloudharness_cli.workflows.paths.operations_name_logs import get  # noqa: E501
-from cloudharness_cli.workflows import configuration, schemas, api_client
-
-from .. import ApiTestMixin
-
-
-class TestOperationsNameLogs(ApiTestMixin, unittest.TestCase):
-    """
-    OperationsNameLogs unit test stubs
-        get operation by name  # noqa: E501
-    """
-    _configuration = configuration.Configuration()
-
-    def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
-        self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
-
-    def tearDown(self):
-        pass
-
-    response_status = 200
-
-
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/openapitools.json b/openapitools.json
new file mode 100644
index 00000000..b11fef7d
--- /dev/null
+++ b/openapitools.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.8.0"
+  }
+}
diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index 7fc9cfc2..e6f23223 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -73,11 +73,9 @@ def generate_python_client(module, openapi_file, client_src_path, lib_name=LIB_N
     get_dependencies()
 
     module = to_python_module(module)
-    command = f"java -jar {CODEGEN} generate " \
-        f"-i {openapi_file} " \
-        f"-g python " \
-        f"-o {client_src_path}/tmp-{module} " \
-        f"packageName={lib_name}.{module}"
+    command = f"java -jar {CODEGEN} generate -i {openapi_file} -g python" \
+        f" -o {client_src_path}/tmp-{module} " \
+        f"--additional-properties packageName={lib_name}.{module}"
     os.system(command)
 
 
diff --git a/tools/deployment-cli-tools/harness-generate b/tools/deployment-cli-tools/harness-generate
index ffec2055..05a40273 100644
--- a/tools/deployment-cli-tools/harness-generate
+++ b/tools/deployment-cli-tools/harness-generate
@@ -47,9 +47,9 @@ def aggregate_packages(client_src_path, lib_name=LIB_NAME):
     TEST_REQUIREMENTS = os.path.join(client_src_path, 'test-requirements.txt')
 
     if not os.path.exists(DOCS_PATH):
-        os.mkdir(DOCS_PATH)
+        os.makedirs(DOCS_PATH)
     if not os.path.exists(TEST_PATH):
-        os.mkdir(TEST_PATH)
+        os.makedirs(TEST_PATH)
     if os.path.exists(README):
         os.remove(README)
     if os.path.exists(REQUIREMENTS):
@@ -159,9 +159,9 @@ if __name__ == "__main__":
         args.path) else args.path
 
     get_dependencies()
-    if os.path.exists(os.path.join(root_path, "libraries/models")) and (not args.interactive or input("Do you want to generate the main model? [Y/n]").upper() != 'N'):
-        generate_model()
+    # if os.path.exists(os.path.join(root_path, "libraries/models")) and (not args.interactive or input("Do you want to generate the main model? [Y/n]").upper() != 'N'):
+    #     generate_model()
 
-    generate_servers(root_path, interactive=args.interactive)
+    # generate_servers(root_path, interactive=args.interactive)
 
     generate_clients(root_path, args.client_name, interactive=args.interactive)

From b344129d46f0b9e6ce1e65b6cece35beb042af2b Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 15:12:39 +0200
Subject: [PATCH 146/210] CH-110 improve output on error

---
 tools/deployment-cli-tools/ch_cli_tools/dockercompose.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index bc6f7ba6..f014d33c 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -89,7 +89,8 @@ def generate_docker_compose_yaml(self):
 
         res = subprocess.call(command, shell=True)
         if res != 0:
-            raise Exception(f"Error generating docker-compose.yaml. See above output for details or try run\n\n{command} --debug")
+            out = subprocess.check_output(["ntpq", "-p"])
+            raise Exception(f"Error generating docker-compose.yaml.\n{out}\n\nSee above output for details or try run\n\n{command} --debug")
 
         self.__post_process_multiple_document_docker_compose(dest_compose_yaml)
 

From 1ddd02383e73bbc929eefbcf9cc2006df0a131f1 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 15:16:22 +0200
Subject: [PATCH 147/210] CH-126 improve code  generation

---
 .../cloudharness_cli/test/common/__init__.py  |  0
 .../test/common/test_accounts_api.py          | 38 +++++++++++
 .../test/common/test_app_version.py           | 52 ++++++++++++++
 .../test/common/test_config_api.py            | 37 ++++++++++
 .../common/test_get_config200_response.py     | 53 +++++++++++++++
 .../test/common/test_sentry_api.py            | 38 +++++++++++
 .../cloudharness_cli/test/samples/__init__.py |  0
 .../test/samples/test_auth_api.py             | 46 +++++++++++++
 .../test/samples/test_inline_response202.py   | 52 ++++++++++++++
 .../samples/test_inline_response202_task.py   | 53 +++++++++++++++
 .../test/samples/test_resource_api.py         | 67 +++++++++++++++++++
 .../test/samples/test_sample_resource.py      | 55 +++++++++++++++
 .../test/samples/test_test_api.py             | 46 +++++++++++++
 .../test/samples/test_workflows_api.py        | 53 +++++++++++++++
 .../test/volumemanager/__init__.py            |  0
 .../test_persistent_volume_claim.py           | 54 +++++++++++++++
 .../test_persistent_volume_claim_create.py    | 52 ++++++++++++++
 .../test/volumemanager/test_rest_api.py       | 45 +++++++++++++
 .../test/workflows/__init__.py                |  0
 .../workflows/test_create_and_access_api.py   | 60 +++++++++++++++++
 .../test/workflows/test_operation.py          | 56 ++++++++++++++++
 .../workflows/test_operation_search_result.py | 61 +++++++++++++++++
 .../test/workflows/test_operation_status.py   | 34 ++++++++++
 .../test/workflows/test_search_result_data.py | 52 ++++++++++++++
 tools/deployment-cli-tools/harness-generate   | 23 +++++--
 25 files changed, 1020 insertions(+), 7 deletions(-)
 create mode 100644 libraries/client/cloudharness_cli/test/common/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/test/common/test_accounts_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/common/test_app_version.py
 create mode 100644 libraries/client/cloudharness_cli/test/common/test_config_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/common/test_get_config200_response.py
 create mode 100644 libraries/client/cloudharness_cli/test/common/test_sentry_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_auth_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_inline_response202.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_inline_response202_task.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_resource_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_sample_resource.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_test_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/samples/test_workflows_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/volumemanager/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim.py
 create mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim_create.py
 create mode 100644 libraries/client/cloudharness_cli/test/volumemanager/test_rest_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/workflows/__init__.py
 create mode 100644 libraries/client/cloudharness_cli/test/workflows/test_create_and_access_api.py
 create mode 100644 libraries/client/cloudharness_cli/test/workflows/test_operation.py
 create mode 100644 libraries/client/cloudharness_cli/test/workflows/test_operation_search_result.py
 create mode 100644 libraries/client/cloudharness_cli/test/workflows/test_operation_status.py
 create mode 100644 libraries/client/cloudharness_cli/test/workflows/test_search_result_data.py

diff --git a/libraries/client/cloudharness_cli/test/common/__init__.py b/libraries/client/cloudharness_cli/test/common/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/client/cloudharness_cli/test/common/test_accounts_api.py b/libraries/client/cloudharness_cli/test/common/test_accounts_api.py
new file mode 100644
index 00000000..5fa693cc
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/common/test_accounts_api.py
@@ -0,0 +1,38 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.common.api.accounts_api import AccountsApi
+
+
+class TestAccountsApi(unittest.TestCase):
+    """AccountsApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = AccountsApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_get_config(self) -> None:
+        """Test case for get_config
+
+        Gets the config for logging in into accounts
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/common/test_app_version.py b/libraries/client/cloudharness_cli/test/common/test_app_version.py
new file mode 100644
index 00000000..2078e5b4
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/common/test_app_version.py
@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.common.models.app_version import AppVersion
+
+class TestAppVersion(unittest.TestCase):
+    """AppVersion unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> AppVersion:
+        """Test AppVersion
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `AppVersion`
+        """
+        model = AppVersion()
+        if include_optional:
+            return AppVersion(
+                build = '',
+                tag = ''
+            )
+        else:
+            return AppVersion(
+        )
+        """
+
+    def testAppVersion(self):
+        """Test AppVersion"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/common/test_config_api.py b/libraries/client/cloudharness_cli/test/common/test_config_api.py
new file mode 100644
index 00000000..50a9eed8
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/common/test_config_api.py
@@ -0,0 +1,37 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.common.api.config_api import ConfigApi
+
+
+class TestConfigApi(unittest.TestCase):
+    """ConfigApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = ConfigApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_get_version(self) -> None:
+        """Test case for get_version
+
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/common/test_get_config200_response.py b/libraries/client/cloudharness_cli/test/common/test_get_config200_response.py
new file mode 100644
index 00000000..231d59dd
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/common/test_get_config200_response.py
@@ -0,0 +1,53 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.common.models.get_config200_response import GetConfig200Response
+
+class TestGetConfig200Response(unittest.TestCase):
+    """GetConfig200Response unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> GetConfig200Response:
+        """Test GetConfig200Response
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `GetConfig200Response`
+        """
+        model = GetConfig200Response()
+        if include_optional:
+            return GetConfig200Response(
+                url = '',
+                realm = '',
+                client_id = ''
+            )
+        else:
+            return GetConfig200Response(
+        )
+        """
+
+    def testGetConfig200Response(self):
+        """Test GetConfig200Response"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/common/test_sentry_api.py b/libraries/client/cloudharness_cli/test/common/test_sentry_api.py
new file mode 100644
index 00000000..c1064115
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/common/test_sentry_api.py
@@ -0,0 +1,38 @@
+# coding: utf-8
+
+"""
+    CH common service API
+
+    Cloud Harness Platform - Reference CH service API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.common.api.sentry_api import SentryApi
+
+
+class TestSentryApi(unittest.TestCase):
+    """SentryApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = SentryApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_getdsn(self) -> None:
+        """Test case for getdsn
+
+        Gets the Sentry DSN for a given application
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/__init__.py b/libraries/client/cloudharness_cli/test/samples/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/client/cloudharness_cli/test/samples/test_auth_api.py b/libraries/client/cloudharness_cli/test/samples/test_auth_api.py
new file mode 100644
index 00000000..a657816f
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_auth_api.py
@@ -0,0 +1,46 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.api.auth_api import AuthApi
+
+
+class TestAuthApi(unittest.TestCase):
+    """AuthApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = AuthApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_valid_cookie(self) -> None:
+        """Test case for valid_cookie
+
+        Check if the token is valid. Get a token by logging into the base url
+        """
+        pass
+
+    def test_valid_token(self) -> None:
+        """Test case for valid_token
+
+        Check if the token is valid. Get a token by logging into the base url
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_inline_response202.py b/libraries/client/cloudharness_cli/test/samples/test_inline_response202.py
new file mode 100644
index 00000000..ef63ef0b
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_inline_response202.py
@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.models.inline_response202 import InlineResponse202
+
+class TestInlineResponse202(unittest.TestCase):
+    """InlineResponse202 unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> InlineResponse202:
+        """Test InlineResponse202
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `InlineResponse202`
+        """
+        model = InlineResponse202()
+        if include_optional:
+            return InlineResponse202(
+                task = {"name":"my-op","href":"http://workflows.cloudharness.metacell.us/api/operation/my-op"}
+            )
+        else:
+            return InlineResponse202(
+        )
+        """
+
+    def testInlineResponse202(self):
+        """Test InlineResponse202"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_inline_response202_task.py b/libraries/client/cloudharness_cli/test/samples/test_inline_response202_task.py
new file mode 100644
index 00000000..e82296d4
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_inline_response202_task.py
@@ -0,0 +1,53 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.models.inline_response202_task import InlineResponse202Task
+
+class TestInlineResponse202Task(unittest.TestCase):
+    """InlineResponse202Task unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> InlineResponse202Task:
+        """Test InlineResponse202Task
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `InlineResponse202Task`
+        """
+        model = InlineResponse202Task()
+        if include_optional:
+            return InlineResponse202Task(
+                href = 'http://workflows.cloudharness.metacell.us/api/operation/my-op',
+                name = 'my-op'
+            )
+        else:
+            return InlineResponse202Task(
+        )
+        """
+
+    def testInlineResponse202Task(self):
+        """Test InlineResponse202Task"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_resource_api.py b/libraries/client/cloudharness_cli/test/samples/test_resource_api.py
new file mode 100644
index 00000000..42f99889
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_resource_api.py
@@ -0,0 +1,67 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.api.resource_api import ResourceApi
+
+
+class TestResourceApi(unittest.TestCase):
+    """ResourceApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = ResourceApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_create_sample_resource(self) -> None:
+        """Test case for create_sample_resource
+
+        Create a SampleResource
+        """
+        pass
+
+    def test_delete_sample_resource(self) -> None:
+        """Test case for delete_sample_resource
+
+        Delete a SampleResource
+        """
+        pass
+
+    def test_get_sample_resource(self) -> None:
+        """Test case for get_sample_resource
+
+        Get a SampleResource
+        """
+        pass
+
+    def test_get_sample_resources(self) -> None:
+        """Test case for get_sample_resources
+
+        List All SampleResources
+        """
+        pass
+
+    def test_update_sample_resource(self) -> None:
+        """Test case for update_sample_resource
+
+        Update a SampleResource
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_sample_resource.py b/libraries/client/cloudharness_cli/test/samples/test_sample_resource.py
new file mode 100644
index 00000000..2a6a2ffb
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_sample_resource.py
@@ -0,0 +1,55 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.models.sample_resource import SampleResource
+
+class TestSampleResource(unittest.TestCase):
+    """SampleResource unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> SampleResource:
+        """Test SampleResource
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `SampleResource`
+        """
+        model = SampleResource()
+        if include_optional:
+            return SampleResource(
+                a = 1.337,
+                b = 1.337,
+                id = 1.337
+            )
+        else:
+            return SampleResource(
+                a = 1.337,
+        )
+        """
+
+    def testSampleResource(self):
+        """Test SampleResource"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_test_api.py b/libraries/client/cloudharness_cli/test/samples/test_test_api.py
new file mode 100644
index 00000000..ab0b8cc3
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_test_api.py
@@ -0,0 +1,46 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.api.test_api import TestApi
+
+
+class TestTestApi(unittest.TestCase):
+    """TestApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = TestApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_error(self) -> None:
+        """Test case for error
+
+        test sentry is working
+        """
+        pass
+
+    def test_ping(self) -> None:
+        """Test case for ping
+
+        test the application is up
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/samples/test_workflows_api.py b/libraries/client/cloudharness_cli/test/samples/test_workflows_api.py
new file mode 100644
index 00000000..138274b7
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/samples/test_workflows_api.py
@@ -0,0 +1,53 @@
+# coding: utf-8
+
+"""
+    CloudHarness Sample API
+
+    CloudHarness Sample api
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.samples.api.workflows_api import WorkflowsApi
+
+
+class TestWorkflowsApi(unittest.TestCase):
+    """WorkflowsApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = WorkflowsApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_submit_async(self) -> None:
+        """Test case for submit_async
+
+        Send an asynchronous operation
+        """
+        pass
+
+    def test_submit_sync(self) -> None:
+        """Test case for submit_sync
+
+        Send a synchronous operation
+        """
+        pass
+
+    def test_submit_sync_with_results(self) -> None:
+        """Test case for submit_sync_with_results
+
+        Send a synchronous operation and get results using the event queue. Just a sum, but in the cloud
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/__init__.py b/libraries/client/cloudharness_cli/test/volumemanager/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim.py b/libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim.py
new file mode 100644
index 00000000..6d56b471
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim.py
@@ -0,0 +1,54 @@
+# coding: utf-8
+
+"""
+    Volumes manager API
+
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.volumemanager.models.persistent_volume_claim import PersistentVolumeClaim
+
+class TestPersistentVolumeClaim(unittest.TestCase):
+    """PersistentVolumeClaim unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> PersistentVolumeClaim:
+        """Test PersistentVolumeClaim
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `PersistentVolumeClaim`
+        """
+        model = PersistentVolumeClaim()
+        if include_optional:
+            return PersistentVolumeClaim(
+                name = 'pvc-1',
+                namespace = 'ch',
+                accessmode = 'ReadWriteMany',
+                size = '2Gi (see also https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/resources.md#resource-quantities)'
+            )
+        else:
+            return PersistentVolumeClaim(
+        )
+        """
+
+    def testPersistentVolumeClaim(self):
+        """Test PersistentVolumeClaim"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim_create.py b/libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim_create.py
new file mode 100644
index 00000000..6c036b80
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/volumemanager/test_persistent_volume_claim_create.py
@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    Volumes manager API
+
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.volumemanager.models.persistent_volume_claim_create import PersistentVolumeClaimCreate
+
+class TestPersistentVolumeClaimCreate(unittest.TestCase):
+    """PersistentVolumeClaimCreate unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> PersistentVolumeClaimCreate:
+        """Test PersistentVolumeClaimCreate
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `PersistentVolumeClaimCreate`
+        """
+        model = PersistentVolumeClaimCreate()
+        if include_optional:
+            return PersistentVolumeClaimCreate(
+                name = 'pvc-1',
+                size = '2Gi (see also https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/resources.md#resource-quantities)'
+            )
+        else:
+            return PersistentVolumeClaimCreate(
+        )
+        """
+
+    def testPersistentVolumeClaimCreate(self):
+        """Test PersistentVolumeClaimCreate"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/volumemanager/test_rest_api.py b/libraries/client/cloudharness_cli/test/volumemanager/test_rest_api.py
new file mode 100644
index 00000000..6aedd71d
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/volumemanager/test_rest_api.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+"""
+    Volumes manager API
+
+    CloudHarness Volumes manager API
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.volumemanager.api.rest_api import RestApi
+
+
+class TestRestApi(unittest.TestCase):
+    """RestApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = RestApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_pvc_name_get(self) -> None:
+        """Test case for pvc_name_get
+
+        Retrieve a Persistent Volume Claim from the Kubernetes repository.
+        """
+        pass
+
+    def test_pvc_post(self) -> None:
+        """Test case for pvc_post
+
+        Create a Persistent Volume Claim in Kubernetes
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/__init__.py b/libraries/client/cloudharness_cli/test/workflows/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_create_and_access_api.py b/libraries/client/cloudharness_cli/test/workflows/test_create_and_access_api.py
new file mode 100644
index 00000000..0c1abdb1
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/workflows/test_create_and_access_api.py
@@ -0,0 +1,60 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.workflows.api.create_and_access_api import CreateAndAccessApi
+
+
+class TestCreateAndAccessApi(unittest.TestCase):
+    """CreateAndAccessApi unit test stubs"""
+
+    def setUp(self) -> None:
+        self.api = CreateAndAccessApi()
+
+    def tearDown(self) -> None:
+        pass
+
+    def test_delete_operation(self) -> None:
+        """Test case for delete_operation
+
+        deletes operation by name
+        """
+        pass
+
+    def test_get_operation(self) -> None:
+        """Test case for get_operation
+
+        get operation by name
+        """
+        pass
+
+    def test_list_operations(self) -> None:
+        """Test case for list_operations
+
+        lists operations
+        """
+        pass
+
+    def test_log_operation(self) -> None:
+        """Test case for log_operation
+
+        get operation by name
+        """
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_operation.py b/libraries/client/cloudharness_cli/test/workflows/test_operation.py
new file mode 100644
index 00000000..6f5a0727
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/workflows/test_operation.py
@@ -0,0 +1,56 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.workflows.models.operation import Operation
+
+class TestOperation(unittest.TestCase):
+    """Operation unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> Operation:
+        """Test Operation
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `Operation`
+        """
+        model = Operation()
+        if include_optional:
+            return Operation(
+                message = '',
+                name = '',
+                create_time = '2016-08-29T09:12:33.001Z',
+                status = 'Pending',
+                workflow = ''
+            )
+        else:
+            return Operation(
+        )
+        """
+
+    def testOperation(self):
+        """Test Operation"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_operation_search_result.py b/libraries/client/cloudharness_cli/test/workflows/test_operation_search_result.py
new file mode 100644
index 00000000..f16fa22c
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/workflows/test_operation_search_result.py
@@ -0,0 +1,61 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.workflows.models.operation_search_result import OperationSearchResult
+
+class TestOperationSearchResult(unittest.TestCase):
+    """OperationSearchResult unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> OperationSearchResult:
+        """Test OperationSearchResult
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `OperationSearchResult`
+        """
+        model = OperationSearchResult()
+        if include_optional:
+            return OperationSearchResult(
+                meta = cloudharness_cli.workflows.models.search_result_data.SearchResultData(
+                    continue_token = '', ),
+                items = [
+                    cloudharness_cli.workflows.models.operation.Operation(
+                        message = '', 
+                        name = '', 
+                        create_time = '2016-08-29T09:12:33.001Z', 
+                        status = 'Pending', 
+                        workflow = '', )
+                    ]
+            )
+        else:
+            return OperationSearchResult(
+        )
+        """
+
+    def testOperationSearchResult(self):
+        """Test OperationSearchResult"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_operation_status.py b/libraries/client/cloudharness_cli/test/workflows/test_operation_status.py
new file mode 100644
index 00000000..faa8c9ad
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/workflows/test_operation_status.py
@@ -0,0 +1,34 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.workflows.models.operation_status import OperationStatus
+
+class TestOperationStatus(unittest.TestCase):
+    """OperationStatus unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testOperationStatus(self):
+        """Test OperationStatus"""
+        # inst = OperationStatus()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/libraries/client/cloudharness_cli/test/workflows/test_search_result_data.py b/libraries/client/cloudharness_cli/test/workflows/test_search_result_data.py
new file mode 100644
index 00000000..26fc126b
--- /dev/null
+++ b/libraries/client/cloudharness_cli/test/workflows/test_search_result_data.py
@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    Workflows API
+
+    Workflows API
+
+    The version of the OpenAPI document: 0.1.0
+    Contact: cloudharness@metacell.us
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+
+from cloudharness_cli.workflows.models.search_result_data import SearchResultData
+
+class TestSearchResultData(unittest.TestCase):
+    """SearchResultData unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> SearchResultData:
+        """Test SearchResultData
+            include_optional is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `SearchResultData`
+        """
+        model = SearchResultData()
+        if include_optional:
+            return SearchResultData(
+                continue_token = ''
+            )
+        else:
+            return SearchResultData(
+        )
+        """
+
+    def testSearchResultData(self):
+        """Test SearchResultData"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tools/deployment-cli-tools/harness-generate b/tools/deployment-cli-tools/harness-generate
index 05a40273..12d40e8a 100644
--- a/tools/deployment-cli-tools/harness-generate
+++ b/tools/deployment-cli-tools/harness-generate
@@ -22,7 +22,7 @@ def get_application_paths(openapi_files):
     return [os.path.basename(os.path.dirname(os.path.dirname(path))) for path in openapi_files]
 
 
-def generate_servers(root_path, interactive=False):
+def generate_servers(root_path, interactive=False, server=None):
     """
     Generates server stubs
     """
@@ -32,6 +32,9 @@ def generate_servers(root_path, interactive=False):
         if not interactive or input("Do you want to generate " + openapi_files[i] + "? [Y/n]").upper() != 'N':
             openapi_file = openapi_files[i]
             application_root = os.path.dirname(os.path.dirname(openapi_file))
+            appname = os.path.basename(application_root)
+            if server and server != appname:
+                continue
             if os.path.exists(os.path.join(application_root, "api", "genapi.sh")):
                 # fastapi server --> use the genapi.sh script
                 generate_fastapi_server(application_root)
@@ -153,15 +156,21 @@ if __name__ == "__main__":
                         help='Specify image registry prefix')
     parser.add_argument('-i', '--interactive', dest='interactive', action="store_true",
                         help='Asks before generate')
+    parser.add_argument('-s', '--server', dest='server', action="store",
+                        help='Generate only a specific server (provide application name) stubs', default=())
+    parser.add_argument('-c', '--clients', dest='clients', action="store_true",
+                        help='Generate only client libraries')
+    parser.add_argument('-m', '--models', dest='models', action="store_true",
+                        help='Generate only model library')
     args, unknown = parser.parse_known_args(sys.argv[1:])
 
     root_path = os.path.join(os.getcwd(), args.path) if not os.path.isabs(
         args.path) else args.path
 
     get_dependencies()
-    # if os.path.exists(os.path.join(root_path, "libraries/models")) and (not args.interactive or input("Do you want to generate the main model? [Y/n]").upper() != 'N'):
-    #     generate_model()
-
-    # generate_servers(root_path, interactive=args.interactive)
-
-    generate_clients(root_path, args.client_name, interactive=args.interactive)
+    if args.models and os.path.exists(os.path.join(root_path, "libraries/models")) and (not args.interactive or input("Do you want to generate the main model? [Y/n]").upper() != 'N'):
+        generate_model()
+    if not (args.clients or args.models) or args.server:
+        generate_servers(root_path, interactive=args.interactive, server=args.server)
+    if not (args.server or args.models) or args.clients:
+        generate_clients(root_path, args.client_name, interactive=args.interactive)

From 97ff173c7fdfdac878b11f156a64180a1a4c7113 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 15:21:30 +0200
Subject: [PATCH 148/210] CH-110 improve output on error

---
 tools/deployment-cli-tools/ch_cli_tools/dockercompose.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index f014d33c..a4a3e1b8 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -89,8 +89,8 @@ def generate_docker_compose_yaml(self):
 
         res = subprocess.call(command, shell=True)
         if res != 0:
-            out = subprocess.check_output(["ntpq", "-p"])
-            raise Exception(f"Error generating docker-compose.yaml.\n{out}\n\nSee above output for details or try run\n\n{command} --debug")
+            out = subprocess.check_output(f"{command} --debug", shell=True, stderr=subprocess.STDOUT)
+            raise Exception(f"Error generating docker-compose.yaml.\n{out}\n\nSee above output for details")
 
         self.__post_process_multiple_document_docker_compose(dest_compose_yaml)
 

From a5477a9d3cacb6d94321d1defabd6d573818ab69 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Fri, 13 Sep 2024 15:30:51 +0200
Subject: [PATCH 149/210] CH-110 fix tests for docker-compose

---
 test/codefresh.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/codefresh.yml b/test/codefresh.yml
index dbdbd3cb..c651ebd9 100644
--- a/test/codefresh.yml
+++ b/test/codefresh.yml
@@ -19,13 +19,14 @@ steps:
     git: "github"
     stage: "clone"
 
-
   test:
     title: "Running test"
     type: "freestyle" # Run any command
-    image: "python:3.9" # The image in which command will be executed
+    image: "python:3.12" # The image in which command will be executed
     working_directory: "${{clone}}" # Running command where code cloned
     commands:
+      - curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+      - bash get_helm.sh
       - pip install tox
       - rm -rf libraries/models/.tox
       - rm -rf libraries/cloudharness-common/.tox
@@ -34,4 +35,3 @@ steps:
       - tox -c libraries/cloudharness-common/
       - tox -c tools/deployment-cli-tools
     stage: "test"
-

From 3fcf327a0ab34c6ec83b86c230bf9f490339e8d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:23:21 +0000
Subject: [PATCH 150/210] Bump micromatch from 4.0.5 to 4.0.8 in /test/test-e2e

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/test-e2e/package-lock.json | 44 ++++++++++++++++-----------------
 test/test-e2e/yarn.lock         | 26 +++++++++----------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/test/test-e2e/package-lock.json b/test/test-e2e/package-lock.json
index bc48f0f2..0f37a5c0 100644
--- a/test/test-e2e/package-lock.json
+++ b/test/test-e2e/package-lock.json
@@ -1281,11 +1281,11 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1861,9 +1861,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3408,11 +3408,11 @@
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -5732,11 +5732,11 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browserslist": {
@@ -6141,9 +6141,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -7264,11 +7264,11 @@
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },
diff --git a/test/test-e2e/yarn.lock b/test/test-e2e/yarn.lock
index fc69b2de..8020afe7 100644
--- a/test/test-e2e/yarn.lock
+++ b/test/test-e2e/yarn.lock
@@ -847,12 +847,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.21.3:
   version "4.21.4"
@@ -1260,10 +1260,10 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -2050,11 +2050,11 @@ merge-stream@^2.0.0:
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mimic-fn@^2.1.0:

From 8bdb61924757d851bef4c4f02f23bd320c70e8e1 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:07:16 +0200
Subject: [PATCH 151/210] CH-66 change secrets in configmap

---
 .../helm/templates/configmap.yaml                | 16 ++++------------
 libraries/models/cloudharness_model/util.py      |  8 ++++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/deployment-configuration/helm/templates/configmap.yaml b/deployment-configuration/helm/templates/configmap.yaml
index e6338206..2888fda8 100644
--- a/deployment-configuration/helm/templates/configmap.yaml
+++ b/deployment-configuration/helm/templates/configmap.yaml
@@ -1,13 +1,5 @@
 {{- /*
-to replace the secrets values we create a dict with the structure:
-  app:
-    <app>:
-      harness:
-        secrets:
-
-thus with an empty secrets node
-and then it's mergeOverwrite the copy of the .Values we created
-resulting in a copy of the .Values with all secrets being ""
+We replace the secrets with empty values in the configmap
 */ -}}
 kind: ConfigMap
 apiVersion: v1
@@ -19,7 +11,7 @@ data:
   allvalues.yaml: |
 {{- $values_copy := deepCopy .Values }}
 {{- range $key, $val := .Values.apps }}
-  {{- $new_secrets := dict "apps" (dict $key (dict "harness" (dict "secrets"))) }}
-  {{- $tmp := mergeOverwrite $values_copy $new_secrets }}
+  {{- $app := get $values_copy.apps $key }}
+  {{- $tmp := set $app.harness "secrets" dict }}
 {{- end }}
-{{ $values_copy | toYaml | indent 4 }}
+{{ $values_copy | toYaml | indent 4 }}
\ No newline at end of file
diff --git a/libraries/models/cloudharness_model/util.py b/libraries/models/cloudharness_model/util.py
index 8fe0a648..8b21d7fb 100644
--- a/libraries/models/cloudharness_model/util.py
+++ b/libraries/models/cloudharness_model/util.py
@@ -135,13 +135,13 @@ def deserialize_model(data, klass):
                 if attr in instance.attribute_map:
                     try:
                         setattr(instance, attr, _deserialize(value, instance.openapi_types[attr]))
-                    except:
+                    except Exception as e:
                         logging.warning(
-                            "Deserialization error: could not set attribute `%s` to value `%s` in class `%s`.", attr, value, klass.__name__)
+                            "Deserialization error: could not set attribute `%s` to value `%s` in class `%s`.", attr, value, klass.__name__, exc_info=True)
                         from .models.base_model_ import Model
                         setattr(instance, attr, Model.from_dict(value))
                         logging.debug("Instance is %s", instance, exc_info=True)
-        
+
     except Exception as e:
         logging.error("Deserialize error", exc_info=True)
         raise DeserializationException(
@@ -172,4 +172,4 @@ def _deserialize_dict(data, boxed_type):
     """
     from cloudharness_model.models.base_model_ import Model
     return Model.from_dict({k: _deserialize(v, boxed_type)
-            for k, v in six.iteritems(data)})
+                            for k, v in six.iteritems(data)})

From ea209173c61b1c6b1a1258efd425f1c3aab210dc Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:08:08 +0200
Subject: [PATCH 152/210] Fix merge issues

---
 .../ch_cli_tools/codefresh.py                 | 56 +++++++++----------
 .../deployment-cli-tools/ch_cli_tools/helm.py | 56 +++----------------
 2 files changed, 34 insertions(+), 78 deletions(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
index c5c82111..e4dca514 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
@@ -246,46 +246,42 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
                             )
 
 
-<< << << < HEAD
 
-== == == =
->>>>>> > 2dc0b2c9fc6924771b81a82f3d089d9ecaff49a5
 
+            def add_unit_test_step(app_config: ApplicationHarnessConfig):
+                # Create a run step for each application with tests/unit.yaml file using the corresponding image built at the previous step
 
-def add_unit_test_step(app_config: ApplicationHarnessConfig):
-    # Create a run step for each application with tests/unit.yaml file using the corresponding image built at the previous step
+                test_config: ApplicationTestConfig = app_config.test
+                app_name = app_config.name
 
-    test_config: ApplicationTestConfig = app_config.test
-    app_name = app_config.name
+                if test_config.unit.enabled and test_config.unit.commands:
+                    tag = app_specific_tag_variable(app_name)
+                    steps[CD_UNIT_TEST_STEP]['steps'][f"{app_name}_ut"] = dict(
+                        title=f"Unit tests for {app_name}",
+                        commands=test_config.unit.commands,
+                        image=image_tag_with_variables(app_name, tag, base_image_name),
+                    )
 
-    if test_config.unit.enabled and test_config.unit.commands:
-        tag = app_specific_tag_variable(app_name)
-        steps[CD_UNIT_TEST_STEP]['steps'][f"{app_name}_ut"] = dict(
-            title=f"Unit tests for {app_name}",
-            commands=test_config.unit.commands,
-            image=image_tag_with_variables(app_name, tag, base_image_name),
-        )
-
-        if helm_values[KEY_TASK_IMAGES]:
-            codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE,
-                                           fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
-            codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC,
-                                           include=helm_values[KEY_TASK_IMAGES].keys())
+            if helm_values[KEY_TASK_IMAGES]:
+                codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE,
+                                            fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
+                codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC,
+                                            include=helm_values[KEY_TASK_IMAGES].keys())
 
-            codefresh_steps_from_base_path(join(
-                root_path, APPS_PATH), CD_BUILD_STEP_PARALLEL)
+                codefresh_steps_from_base_path(join(
+                    root_path, APPS_PATH), CD_BUILD_STEP_PARALLEL)
 
             if CD_E2E_TEST_STEP in steps:
-                name = "test-e2e"
-                codefresh_steps_from_base_path(join(
-                    root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), publish=False)
-                steps[CD_E2E_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
+                    name = "test-e2e"
+                    codefresh_steps_from_base_path(join(
+                        root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), publish=False)
+                    steps[CD_E2E_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
 
             if CD_API_TEST_STEP in steps:
-                name = "test-api"
-                codefresh_steps_from_base_path(join(
-                    root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False)
-                steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
+                    name = "test-api"
+                    codefresh_steps_from_base_path(join(
+                        root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False)
+                    steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
 
     if not codefresh:
         logging.warning(
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index 05f83a3c..df2b2080 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -155,54 +155,14 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-
-<< << << < HEAD
-== == == =
-
-
-def __clear_unused_db_configuration(self, harness_config):
-    database_config = harness_config[KEY_DATABASE]
-    database_type = database_config.get('type', None)
-    if database_type is None:
-        del harness_config[KEY_DATABASE]
-        return
-        db_specific_keys = [k for k, v in database_config.items()
-                            if isinstance(v, dict) and 'image' in v and 'ports' in v]
-        for db in db_specific_keys:
-            if database_type != db:
-                del database_config[db]
-
-    def image_tag(self, image_name, build_context_path=None, dependencies=()):
-        tag = self.tag
-        if tag is None and not self.local:
-            logging.info(f"Generating tag for {image_name} from {build_context_path} and {dependencies}")
-            ignore_path = os.path.join(build_context_path, '.dockerignore')
-            ignore = set(DEFAULT_IGNORE)
-            if os.path.exists(ignore_path):
-                with open(ignore_path) as f:
-                    ignore = ignore.union({line.strip() for line in f if line.strip() and not line.startswith('#')})
-            logging.info(f"Ignoring {ignore}")
-            tag = generate_tag_from_content(build_context_path, ignore)
-            logging.info(f"Content hash: {tag}")
-            dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
-            tag = sha1((tag + "".join(self.all_images.get(n, '') for n in dependencies)).encode("utf-8")).hexdigest()
-            logging.info(f"Generated tag: {tag}")
-            app_name = image_name.split("/")[-1]  # the image name can have a prefix
-            self.all_images[app_name] = tag
-        return self.registry + image_name + (f':{tag}' if tag else '')
-
-
->>>>>> > 2dc0b2c9fc6924771b81a82f3d089d9ecaff49a5
-
-
-def create_app_values_spec(self, app_name, app_path, base_image_name=None):
-    logging.info('Generating values script for ' + app_name)
-
-    specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
-    if os.path.exists(specific_template_path):
-        logging.info("Specific values template found: " +
-                     specific_template_path)
-        values = get_template(specific_template_path)
+    def create_app_values_spec(self, app_name, app_path, base_image_name=None):
+        logging.info('Generating values script for ' + app_name)
+
+        specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
+        if os.path.exists(specific_template_path):
+            logging.info("Specific values template found: " +
+                        specific_template_path)
+            values = get_template(specific_template_path)
         else:
             values = {}
 

From 4fe5c4c7d0f2f235bfb47df4672bcf0f0235e5a2 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:08:49 +0200
Subject: [PATCH 153/210] Remove wrong dependency

---
 libraries/models/setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/models/setup.py b/libraries/models/setup.py
index 946a10f3..d78224f8 100644
--- a/libraries/models/setup.py
+++ b/libraries/models/setup.py
@@ -16,8 +16,7 @@
     "pyhumps >= 3.8.0",
     "python-dateutil >= 2.8.2",
     "PyYAML >= 6.0.1",
-    "six >= 1.16.0",
-    "swagger_ui_bundle >= 1.1.0",
+    "six >= 1.16.0"
 ]
 print(REQUIREMENTS)
 setup(name=NAME, version=VERSION,

From b9c3979972e86c0fc5a95e52039383246d58d2c6 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:09:36 +0200
Subject: [PATCH 154/210] CH-147 fix linting issue

---
 .../deploy/resources/hub/jupyterhub_config.py     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
index 688ba72a..2033ff1b 100755
--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
@@ -1,11 +1,5 @@
 # load the config object (satisfies linters)
-from z2jh import (
-    get_config,
-    get_name,
-    get_name_env,
-    get_secret_value,
-    set_config_if_not_none,
-)
+
 c = get_config()  # noqa
 
 import glob
@@ -31,6 +25,13 @@
 configuration_directory = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, configuration_directory)
 
+from z2jh import ( # noqa
+    get_config,
+    get_name,
+    get_name_env,
+    get_secret_value,
+    set_config_if_not_none,
+)
 
 def camelCaseify(s):
     """convert snake_case to camelCase

From e838008ffdfd5281cc42d2d5688dae14bfd0b509 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:37:31 +0200
Subject: [PATCH 155/210] CH-17 fix some dependencies

---
 .../flask-server/backend/requirements.txt          |  6 ++++--
 .../flask-server/backend/setup.py                  |  7 ++++---
 applications/samples/backend/requirements.txt      | 14 +++-----------
 applications/samples/backend/setup.py              |  7 +++++--
 applications/samples/deploy/values-test.yaml       |  2 --
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/application-templates/flask-server/backend/requirements.txt b/application-templates/flask-server/backend/requirements.txt
index b3db72c8..43562728 100644
--- a/application-templates/flask-server/backend/requirements.txt
+++ b/application-templates/flask-server/backend/requirements.txt
@@ -1,5 +1,7 @@
 connexion[swagger-ui]==2.14.2
-swagger-ui-bundle >= 0.0.2
+Flask == 2.2.5
+swagger-ui-bundle==0.0.9
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0
-Flask<3.0.0
+
+
diff --git a/application-templates/flask-server/backend/setup.py b/application-templates/flask-server/backend/setup.py
index e7700bac..998506e3 100644
--- a/application-templates/flask-server/backend/setup.py
+++ b/application-templates/flask-server/backend/setup.py
@@ -14,11 +14,12 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-    "connexion>=2.0.2",
-    "swagger-ui-bundle>=0.0.2",
+    "connexion[swagger-ui]<3.0.0",
+    "Flask>=2.2.5",
     "python_dateutil>=2.6.0",
     "pyjwt>=2.6.0",
-    "cloudharness"
+    "swagger-ui-bundle>=0.0.2",
+    "cloudharness",
 ]
 
 setup(
diff --git a/applications/samples/backend/requirements.txt b/applications/samples/backend/requirements.txt
index be4c8a3a..f9d4fe44 100644
--- a/applications/samples/backend/requirements.txt
+++ b/applications/samples/backend/requirements.txt
@@ -1,11 +1,3 @@
-connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
-# 2.3 is the last version that supports python 3.4-3.5
-connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
-# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
-# we must peg werkzeug versions below to fix connexion
-# https://github.com/zalando/connexion/pull/1044
-werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
-swagger-ui-bundle >= 0.0.2
-python_dateutil >= 2.6.0
-setuptools >= 21.0.0
-Flask == 2.1.1
+connexion[swagger-ui]==2.14.2
+Flask == 2.2.5
+swagger-ui-bundle==0.0.9
\ No newline at end of file
diff --git a/applications/samples/backend/setup.py b/applications/samples/backend/setup.py
index fe7e0ce5..be69d39f 100644
--- a/applications/samples/backend/setup.py
+++ b/applications/samples/backend/setup.py
@@ -14,10 +14,13 @@
 # http://pypi.python.org/pypi/setuptools
 
 REQUIRES = [
-    "connexion>=2.0.2",
+    "connexion[swagger-ui]==2.14.2",
+    "Flask >= 2.2.5",
     "python_dateutil>=2.6.0",
     "pyjwt>=2.6.0",
-    "cloudharness"
+    "swagger-ui-bundle>=0.0.2",
+    "cloudharness",
+
 ]
 
 setup(
diff --git a/applications/samples/deploy/values-test.yaml b/applications/samples/deploy/values-test.yaml
index 14274fd6..ebf25ca3 100644
--- a/applications/samples/deploy/values-test.yaml
+++ b/applications/samples/deploy/values-test.yaml
@@ -3,9 +3,7 @@ harness:
     soft:
       - workflows
       - events
-      - accounts 
       - common
-      - nfsserver
       - jupyterhub
   accounts:
     roles:

From 4a041803e0608d6f080d94fef3d837a49d00a481 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:37:58 +0200
Subject: [PATCH 156/210] CH-17 fix python backend debug

---
 deployment-configuration/values-template-local.yaml            | 1 +
 deployment-configuration/values-template.yaml                  | 1 +
 infrastructure/base-images/cloudharness-base-debian/Dockerfile | 3 +++
 infrastructure/base-images/cloudharness-base/Dockerfile        | 3 +++
 tools/deployment-cli-tools/ch_cli_tools/skaffold.py            | 1 +
 5 files changed, 9 insertions(+)
 create mode 100644 deployment-configuration/values-template-local.yaml

diff --git a/deployment-configuration/values-template-local.yaml b/deployment-configuration/values-template-local.yaml
new file mode 100644
index 00000000..98b2266e
--- /dev/null
+++ b/deployment-configuration/values-template-local.yaml
@@ -0,0 +1 @@
+debug: true
diff --git a/deployment-configuration/values-template.yaml b/deployment-configuration/values-template.yaml
index e69de29b..4dee1546 100644
--- a/deployment-configuration/values-template.yaml
+++ b/deployment-configuration/values-template.yaml
@@ -0,0 +1 @@
+debug: false
diff --git a/infrastructure/base-images/cloudharness-base-debian/Dockerfile b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
index 5b600d8a..30e20348 100644
--- a/infrastructure/base-images/cloudharness-base-debian/Dockerfile
+++ b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
@@ -26,4 +26,7 @@ RUN pip install -e /libraries/models --no-cache-dir
 RUN pip install -e /libraries/cloudharness-common --no-cache-dir
 RUN pip install -e /libraries/client/cloudharness_cli --no-cache-dir
 
+ARG $DEBUG
+RUN if [[ -z "$DEBUG" ]] ; pip install debugpy --prefer-binary ; else echo "Debug not supported" ; fi
+
 WORKDIR /
\ No newline at end of file
diff --git a/infrastructure/base-images/cloudharness-base/Dockerfile b/infrastructure/base-images/cloudharness-base/Dockerfile
index ac7f94ac..25392d99 100644
--- a/infrastructure/base-images/cloudharness-base/Dockerfile
+++ b/infrastructure/base-images/cloudharness-base/Dockerfile
@@ -33,4 +33,7 @@ COPY libraries/client/cloudharness_cli /libraries/client/cloudharness_cli
 RUN pip install -e /libraries/cloudharness-common
 RUN pip install -e /libraries/client/cloudharness_cli
 
+ARG $DEBUG
+RUN if [[ -z "$DEBUG" ]] ; pip install debugpy --prefer-binary ; else echo "Debug not supported" ; fi
+
 WORKDIR /
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index fa8f2cd9..aefc8607 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -48,6 +48,7 @@ def build_artifact(
             'REGISTRY': helm_values.registry.name,
             'TAG': helm_values.tag,
             'NOCACHE': str(time.time()),
+            'DEBUG': 'true' if helm_values.local or helm_values.debug else ''
         }
 
         if additional_build_args:

From 5a4700ffccf2da2fd5e14581b793185afb09ae29 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 14:38:20 +0200
Subject: [PATCH 157/210] Update test CI/CD

---
 deployment/codefresh-test.yaml | 388 +++++++++++++++------------------
 1 file changed, 178 insertions(+), 210 deletions(-)

diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index 6a4dc777..900e3db7 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -1,17 +1,17 @@
-version: "1.0"
+version: '1.0'
 stages:
-  - prepare
-  - build
-  - unittest
-  - deploy
-  - qa
+- prepare
+- build
+- unittest
+- deploy
+- qa
 steps:
   main_clone:
     title: Clone main repository
     type: git-clone
     stage: prepare
-    repo: "${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}"
-    revision: "${{CF_BRANCH}}"
+    repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
+    revision: '${{CF_BRANCH}}'
     git: github
   prepare_deployment:
     title: Prepare helm chart
@@ -19,17 +19,17 @@ steps:
     stage: prepare
     working_directory: .
     commands:
-      - bash install.sh
-      - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
-        -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
-      - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
-      - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
+    - bash install.sh
+    - harness-deployment . -n test-${{NAMESPACE_BASENAME}} -d ${{DOMAIN}} -r ${{REGISTRY}}
+      -rs ${{REGISTRY_SECRET}} -e test --write-env -N -i samples
+    - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
+    - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:
     commands:
-      - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
+    - helm template ./deployment/helm --debug -n test-${{NAMESPACE_BASENAME}}-${{CF_SHORT_REVISION}}
     environment:
-      - ACTION=auth
-      - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
+    - ACTION=auth
+    - KUBE_CONTEXT=test-${{CF_BUILD_ID}}
     image: codefresh/cfstep-helm:3.6.2
     stage: prepare
     title: View helm chart
@@ -42,47 +42,43 @@ steps:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-base/Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-base
         title: Cloudharness base
         working_directory: ./.
-        tag: "${{CLOUDHARNESS_BASE_TAG}}"
+        tag: '${{CLOUDHARNESS_BASE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{CLOUDHARNESS_BASE_TAG_EXISTS}}', '{{CLOUDHARNESS_BASE_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_BASE_TAG_FORCE_BUILD}}')
                 == false
       cloudharness-frontend-build:
         type: build
         stage: build
         dockerfile: infrastructure/base-images/cloudharness-frontend-build/Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/cloudharness-frontend-build
         title: Cloudharness frontend build
         working_directory: ./.
-        tag: "${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}"
+        tag: '${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}',
                 '{{CLOUDHARNESS_FRONTEND_BUILD_TAG_FORCE_BUILD}}') == false
   build_static_images:
     title: Build static images
@@ -93,25 +89,23 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/cloudharness-flask
         title: Cloudharness flask
         working_directory: ./infrastructure/common-images/cloudharness-flask
-        tag: "${{CLOUDHARNESS_FLASK_TAG}}"
+        tag: '${{CLOUDHARNESS_FLASK_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{CLOUDHARNESS_FLASK_TAG_EXISTS}}', '{{CLOUDHARNESS_FLASK_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}', '{{CLOUDHARNESS_FLASK_TAG_FORCE_BUILD}}')
                 == false
   build_application_images:
     type: parallel
@@ -121,24 +115,22 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/accounts
         title: Accounts
         working_directory: ./applications/accounts
-        tag: "${{ACCOUNTS_TAG}}"
+        tag: '${{ACCOUNTS_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{ACCOUNTS_TAG_EXISTS}}', '{{ACCOUNTS_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{ACCOUNTS_TAG_FORCE_BUILD}}', '{{ACCOUNTS_TAG_FORCE_BUILD}}')
                 == false
       jupyterhub:
         type: build
@@ -166,217 +158,199 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
-          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_FRONTEND_BUILD=${{REGISTRY}}/cloudharness/cloudharness-frontend-build:${{CLOUDHARNESS_FRONTEND_BUILD_TAG}}
+        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/samples
         title: Samples
         working_directory: ./applications/samples
-        tag: "${{SAMPLES_TAG}}"
+        tag: '${{SAMPLES_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_TAG_EXISTS}}', '{{SAMPLES_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_TAG_FORCE_BUILD}}', '{{SAMPLES_TAG_FORCE_BUILD}}')
                 == false
       samples-print-file:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-print-file
         title: Samples print file
         working_directory: ./applications/samples/tasks/print-file
-        tag: "${{SAMPLES_PRINT_FILE_TAG}}"
+        tag: '${{SAMPLES_PRINT_FILE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_PRINT_FILE_TAG_EXISTS}}', '{{SAMPLES_PRINT_FILE_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}', '{{SAMPLES_PRINT_FILE_TAG_FORCE_BUILD}}')
                 == false
       samples-secret:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-secret
         title: Samples secret
         working_directory: ./applications/samples/tasks/secret
-        tag: "${{SAMPLES_SECRET_TAG}}"
+        tag: '${{SAMPLES_SECRET_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_SECRET_TAG_EXISTS}}', '{{SAMPLES_SECRET_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_SECRET_TAG_FORCE_BUILD}}', '{{SAMPLES_SECRET_TAG_FORCE_BUILD}}')
                 == false
       samples-sum:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/samples-sum
         title: Samples sum
         working_directory: ./applications/samples/tasks/sum
-        tag: "${{SAMPLES_SUM_TAG}}"
+        tag: '${{SAMPLES_SUM_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{SAMPLES_SUM_TAG_EXISTS}}', '{{SAMPLES_SUM_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{SAMPLES_SUM_TAG_FORCE_BUILD}}', '{{SAMPLES_SUM_TAG_FORCE_BUILD}}')
                 == false
       common:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/common
         title: Common
         working_directory: ./applications/common/server
-        tag: "${{COMMON_TAG}}"
+        tag: '${{COMMON_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{COMMON_TAG_EXISTS}}', '{{COMMON_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{COMMON_TAG_FORCE_BUILD}}', '{{COMMON_TAG_FORCE_BUILD}}')
                 == false
       workflows-send-result-event:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-send-result-event
         title: Workflows send result event
         working_directory: ./applications/workflows/tasks/send-result-event
-        tag: "${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}"
+        tag: '${{WORKFLOWS_SEND_RESULT_EVENT_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_SEND_RESULT_EVENT_TAG_FORCE_BUILD}}') == false
       workflows-extract-download:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/workflows-extract-download
         title: Workflows extract download
         working_directory: ./applications/workflows/tasks/extract-download
-        tag: "${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}"
+        tag: '${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_EXTRACT_DOWNLOAD_TAG_FORCE_BUILD}}') == false
       workflows-notify-queue:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/workflows-notify-queue
         title: Workflows notify queue
         working_directory: ./applications/workflows/tasks/notify-queue
-        tag: "${{WORKFLOWS_NOTIFY_QUEUE_TAG}}"
+        tag: '${{WORKFLOWS_NOTIFY_QUEUE_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
+              buildDoesNotExist: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_EXISTS}}') == true
-              forceNoCache:
-                includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
+              forceNoCache: includes('${{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}',
                 '{{WORKFLOWS_NOTIFY_QUEUE_TAG_FORCE_BUILD}}') == false
       workflows:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_FLASK=${{REGISTRY}}/cloudharness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}
         image_name: cloudharness/workflows
         title: Workflows
         working_directory: ./applications/workflows/server
-        tag: "${{WORKFLOWS_TAG}}"
+        tag: '${{WORKFLOWS_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{WORKFLOWS_TAG_EXISTS}}', '{{WORKFLOWS_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{WORKFLOWS_TAG_FORCE_BUILD}}', '{{WORKFLOWS_TAG_FORCE_BUILD}}')
                 == false
   tests_unit:
     stage: unittest
@@ -385,8 +359,8 @@ steps:
       samples_ut:
         title: Unit tests for samples
         commands:
-          - pytest /usr/src/app/samples/test
-        image: "${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}"
+        - pytest /usr/src/app/samples/test
+        image: '${{REGISTRY}}/cloudharness/samples:${{SAMPLES_TAG}}'
   deployment:
     stage: deploy
     type: helm
@@ -396,14 +370,14 @@ steps:
       helm_version: 3.6.2
       chart_name: deployment/helm
       release_name: test-${{NAMESPACE_BASENAME}}
-      kube_context: "${{CLUSTER_NAME}}"
+      kube_context: '${{CLUSTER_NAME}}'
       namespace: test-${{NAMESPACE_BASENAME}}
-      chart_version: "${{CF_SHORT_REVISION}}"
+      chart_version: '${{CF_SHORT_REVISION}}'
       cmd_ps: --timeout 600s --create-namespace
       custom_value_files:
-        - ./deployment/helm/values.yaml
+      - ./deployment/helm/values.yaml
       custom_values:
-        - apps_samples_harness_secrets_asecret=${{ASECRET}}
+      - apps_samples_harness_secrets_asecret=${{ASECRET}}
   build_test_images:
     title: Build test images
     type: parallel
@@ -413,119 +387,115 @@ steps:
         type: build
         stage: build
         dockerfile: Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
         image_name: cloudharness/test-e2e
         title: Test e2e
         working_directory: ./test/test-e2e
-        tag: "${{TEST_E2E_TAG}}"
+        tag: '${{TEST_E2E_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{TEST_E2E_TAG_EXISTS}}', '{{TEST_E2E_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{TEST_E2E_TAG_FORCE_BUILD}}', '{{TEST_E2E_TAG_FORCE_BUILD}}')
                 == false
       test-api:
         type: build
         stage: build
         dockerfile: test/test-api/Dockerfile
-        registry: "${{CODEFRESH_REGISTRY}}"
+        registry: '${{CODEFRESH_REGISTRY}}'
         buildkit: true
         build_arguments:
-          - DOMAIN=${{DOMAIN}}
-          - NOCACHE=${{CF_BUILD_ID}}
-          - REGISTRY=${{REGISTRY}}/cloudharness/
-          - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
+        - DOMAIN=${{DOMAIN}}
+        - NOCACHE=${{CF_BUILD_ID}}
+        - REGISTRY=${{REGISTRY}}/cloudharness/
+        - CLOUDHARNESS_BASE=${{REGISTRY}}/cloudharness/cloudharness-base:${{CLOUDHARNESS_BASE_TAG}}
         image_name: cloudharness/test-api
         title: Test api
         working_directory: ./.
-        tag: "${{TEST_API_TAG}}"
+        tag: '${{TEST_API_TAG}}'
         when:
           condition:
             any:
-              buildDoesNotExist:
-                includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
+              buildDoesNotExist: includes('${{TEST_API_TAG_EXISTS}}', '{{TEST_API_TAG_EXISTS}}')
                 == true
-              forceNoCache:
-                includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
+              forceNoCache: includes('${{TEST_API_TAG_FORCE_BUILD}}', '{{TEST_API_TAG_FORCE_BUILD}}')
                 == false
   wait_deployment:
     stage: qa
     title: Wait deployment to be ready
     image: codefresh/kubectl
     commands:
-      - kubectl config use-context ${{CLUSTER_NAME}}
-      - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
-      - kubectl rollout status deployment/accounts
-      - kubectl rollout status deployment/samples
-      - kubectl rollout status deployment/common
-      - kubectl rollout status deployment/workflows
-      - sleep 60
+    - kubectl config use-context ${{CLUSTER_NAME}}
+    - kubectl config set-context --current --namespace=test-${{NAMESPACE_BASENAME}}
+    - kubectl rollout status deployment/accounts
+    - kubectl rollout status deployment/samples
+    - kubectl rollout status deployment/common
+    - kubectl rollout status deployment/workflows
+    - sleep 60
   tests_api:
     stage: qa
     title: Api tests
     working_directory: /home/test
-    image: "${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}"
+    image: '${{REGISTRY}}/cloudharness/test-api:${{TEST_API_TAG}}'
     fail_fast: false
     commands:
-      - echo $APP_NAME
+    - echo $APP_NAME
     scale:
       samples_api_test:
         title: samples api test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/samples:/home/test"
-          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
+        - '${{CF_REPO_NAME}}/applications/samples:/home/test'
+        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
-          - APP_URL=https://samples.${{DOMAIN}}/api
-          - USERNAME=sample@testuser.com
-          - PASSWORD=test
+        - APP_URL=https://samples.${{DOMAIN}}/api
+        - USERNAME=sample@testuser.com
+        - PASSWORD=test
         commands:
-          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-            https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
-            --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
-            --show-errors-tracebacks
-          - pytest -v test/api
+        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
+          --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
+          --show-errors-tracebacks
+        - pytest -v test/api
       common_api_test:
         title: common api test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/common:/home/test"
-          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
+        - '${{CF_REPO_NAME}}/applications/common:/home/test'
+        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
-          - APP_URL=https://common.${{DOMAIN}}/api
+        - APP_URL=https://common.${{DOMAIN}}/api
         commands:
-          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-            https://common.${{DOMAIN}}/api -c all
+        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+          https://common.${{DOMAIN}}/api -c all
       workflows_api_test:
         title: workflows api test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/workflows:/home/test"
-          - "${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml"
+        - '${{CF_REPO_NAME}}/applications/workflows:/home/test'
+        - '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
         environment:
-          - APP_URL=https://workflows.${{DOMAIN}}/api
+        - APP_URL=https://workflows.${{DOMAIN}}/api
         commands:
-          - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-            https://workflows.${{DOMAIN}}/api -c all
+        - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
+          https://workflows.${{DOMAIN}}/api -c all
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-            - cf_export  FAILED=failed
+          - cf_export  FAILED=failed
   tests_e2e:
     stage: qa
     title: End to end tests
     working_directory: /home/test
-    image: "${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}"
+    image: '${{REGISTRY}}/cloudharness/test-e2e:${{TEST_E2E_TAG}}'
     fail_fast: false
     commands:
-      - yarn test
+    - yarn test
     scale:
       jupyterhub_e2e_test:
         title: jupyterhub e2e test
@@ -533,22 +503,20 @@ steps:
         - '${{CF_REPO_NAME}}/applications/jupyterhub/test/e2e:/home/test/__tests__/jupyterhub'
         environment:
         - APP_URL=https://hub.${{DOMAIN}}
-        - USERNAME=sample@testuser.com
-        - PASSWORD=test
       samples_e2e_test:
         title: samples e2e test
         volumes:
-          - "${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples"
+        - '${{CF_REPO_NAME}}/applications/samples/test/e2e:/home/test/__tests__/samples'
         environment:
-          - APP_URL=https://samples.${{DOMAIN}}
-          - USERNAME=sample@testuser.com
-          - PASSWORD=test
+        - APP_URL=https://samples.${{DOMAIN}}
+        - USERNAME=sample@testuser.com
+        - PASSWORD=test
     hooks:
       on_fail:
         exec:
           image: alpine
           commands:
-            - cf_export  FAILED=failed
+          - cf_export  FAILED=failed
   approval:
     type: pending-approval
     stage: qa
@@ -556,7 +524,7 @@ steps:
     description: The pipeline will fail after ${{WAIT_ON_FAIL}} minutes
     timeout:
       timeUnit: minutes
-      duration: "${{WAIT_ON_FAIL}}"
+      duration: '${{WAIT_ON_FAIL}}'
       finalState: denied
     when:
       condition:
@@ -568,5 +536,5 @@ steps:
     image: codefresh/kubectl
     stage: qa
     commands:
-      - kubectl config use-context ${{CLUSTER_NAME}}
-      - kubectl delete ns test-${{NAMESPACE_BASENAME}}
+    - kubectl config use-context ${{CLUSTER_NAME}}
+    - kubectl delete ns test-${{NAMESPACE_BASENAME}}

From 65bcc2b2e6cd6662ba4185da20aa58dcb4f11f96 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 15:02:58 +0200
Subject: [PATCH 158/210] CH-17 fix build issue

---
 infrastructure/base-images/cloudharness-base-debian/Dockerfile | 2 +-
 infrastructure/base-images/cloudharness-base/Dockerfile        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure/base-images/cloudharness-base-debian/Dockerfile b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
index 30e20348..6955614a 100644
--- a/infrastructure/base-images/cloudharness-base-debian/Dockerfile
+++ b/infrastructure/base-images/cloudharness-base-debian/Dockerfile
@@ -27,6 +27,6 @@ RUN pip install -e /libraries/cloudharness-common --no-cache-dir
 RUN pip install -e /libraries/client/cloudharness_cli --no-cache-dir
 
 ARG $DEBUG
-RUN if [[ -z "$DEBUG" ]] ; pip install debugpy --prefer-binary ; else echo "Debug not supported" ; fi
+RUN if [[ -z "$DEBUG" ]] ; then pip install debugpy --prefer-binary ; else echo "Debug not supported" ; fi
 
 WORKDIR /
\ No newline at end of file
diff --git a/infrastructure/base-images/cloudharness-base/Dockerfile b/infrastructure/base-images/cloudharness-base/Dockerfile
index 25392d99..a4537877 100644
--- a/infrastructure/base-images/cloudharness-base/Dockerfile
+++ b/infrastructure/base-images/cloudharness-base/Dockerfile
@@ -34,6 +34,6 @@ RUN pip install -e /libraries/cloudharness-common
 RUN pip install -e /libraries/client/cloudharness_cli
 
 ARG $DEBUG
-RUN if [[ -z "$DEBUG" ]] ; pip install debugpy --prefer-binary ; else echo "Debug not supported" ; fi
+RUN if [[ -z "$DEBUG" ]] ; then pip install debugpy --prefer-binary ; else echo "Debug not supported" ; fi
 
 WORKDIR /

From 1562e95ba0cfb40324156b57f8f25038bd099e32 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 19:17:38 +0200
Subject: [PATCH 159/210] CH-17 fix broken API tests

---
 applications/samples/api/openapi.yaml              |  3 ---
 .../backend/samples/controllers/auth_controller.py |  8 +++++++-
 applications/samples/deploy/values.yaml            |  6 +++++-
 deployment/codefresh-test.yaml                     |  8 +++++---
 .../tests/test_infrastructure.py                   |  2 +-
 tools/cloudharness-test/cloudharness_test/api.py   |  4 ++--
 .../cloudharness_test/apitest_init.py              | 14 +++++++++-----
 7 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/applications/samples/api/openapi.yaml b/applications/samples/api/openapi.yaml
index 3332cd2b..f51b328d 100644
--- a/applications/samples/api/openapi.yaml
+++ b/applications/samples/api/openapi.yaml
@@ -23,7 +23,6 @@ paths:
           description: This won't happen
         "500":
           description: Sentry entry should come!
-      deprecated: true
       operationId: error
       summary: test sentry is working
       x-openapi-router-controller: samples.controllers.test_controller
@@ -231,13 +230,11 @@ paths:
               schema:
                 type: object
           description: Operation result
-      deprecated: true
       operationId: submit_sync
       summary: Send a synchronous operation
       x-openapi-router-controller: samples.controllers.workflows_controller
   /operation_sync_results:
     get:
-      deprecated: true
       tags:
         - workflows
       parameters:
diff --git a/applications/samples/backend/samples/controllers/auth_controller.py b/applications/samples/backend/samples/controllers/auth_controller.py
index e2930680..e144a976 100644
--- a/applications/samples/backend/samples/controllers/auth_controller.py
+++ b/applications/samples/backend/samples/controllers/auth_controller.py
@@ -13,6 +13,8 @@ def valid_token():  # noqa: E501
 
     :rtype: List[Valid]
     """
+    from cloudharness.middleware import get_authentication_token
+    token = get_authentication_token()
     return 'OK!'
 
 
@@ -24,4 +26,8 @@ def valid_cookie():  # noqa: E501
 
     :rtype: List[Valid]
     """
-    return 'OK!'
+    from cloudharness.middleware import get_authentication_token
+    from cloudharness.auth import decode_token
+    token = get_authentication_token()
+    assert decode_token(token)
+    return 'OK'
diff --git a/applications/samples/deploy/values.yaml b/applications/samples/deploy/values.yaml
index 3d1717ec..1006e7a1 100644
--- a/applications/samples/deploy/values.yaml
+++ b/applications/samples/deploy/values.yaml
@@ -79,11 +79,15 @@ harness:
         - all
       runParams:
         - "--skip-deprecated-operations"
+        - "--exclude-operation-id=submit_sync"
+        - "--exclude-operation-id=submit_sync_with_results"
+        - "--exclude-operation-id=error"
         - "--hypothesis-suppress-health-check=too_slow"
         - "--hypothesis-deadline=180000"
         - "--request-timeout=180000"
         - "--hypothesis-max-examples=2"
-        - "--show-errors-tracebacks"
+        - "--show-trace"
+        - "--exclude-checks=ignored_auth" # ignored_auth is not working on schemathesis 3.36.0
 
   dockerfile:
     buildArgs:
diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index 900e3db7..f7ecda38 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -13,6 +13,7 @@ steps:
     repo: '${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}'
     revision: '${{CF_BRANCH}}'
     git: github
+
   prepare_deployment:
     title: Prepare helm chart
     image: python:3.12
@@ -458,9 +459,10 @@ steps:
         - PASSWORD=test
         commands:
         - st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
-          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --hypothesis-suppress-health-check=too_slow
-          --hypothesis-deadline=180000 --request-timeout=180000 --hypothesis-max-examples=2
-          --show-errors-tracebacks
+          https://samples.${{DOMAIN}}/api -c all --skip-deprecated-operations --exclude-operation-id=submit_sync
+          --exclude-operation-id=submit_sync_with_results --exclude-operation-id=error
+          --hypothesis-suppress-health-check=too_slow --hypothesis-deadline=180000
+          --request-timeout=180000 --hypothesis-max-examples=2 --show-trace --exclude-checks=ignored_auth
         - pytest -v test/api
       common_api_test:
         title: common api test
diff --git a/libraries/cloudharness-common/tests/test_infrastructure.py b/libraries/cloudharness-common/tests/test_infrastructure.py
index ab060d8e..dfcf6e1f 100644
--- a/libraries/cloudharness-common/tests/test_infrastructure.py
+++ b/libraries/cloudharness-common/tests/test_infrastructure.py
@@ -1,8 +1,8 @@
-from cloudharness.infrastructure import k8s
 from .test_env import set_test_environment
 
 set_test_environment()
 
+from cloudharness.infrastructure import k8s  # noqa: E402
 
 kubectl_enabled = False
 
diff --git a/tools/cloudharness-test/cloudharness_test/api.py b/tools/cloudharness-test/cloudharness_test/api.py
index 216a669c..af80f6bd 100644
--- a/tools/cloudharness-test/cloudharness_test/api.py
+++ b/tools/cloudharness-test/cloudharness_test/api.py
@@ -42,7 +42,7 @@ def run_api_tests(root_paths, helm_values: HarnessMainConfig, base_domain, inclu
         api_filename = get_api_filename(app_dir)
 
         if not app_config.domain and not app_config.subdomain:
-            logging.warn(
+            logging.warning(
                 "Application %s has a api specification but no subdomain/domain is specified", appname)
             continue
 
@@ -65,7 +65,7 @@ def run_api_tests(root_paths, helm_values: HarnessMainConfig, base_domain, inclu
             for path in root_paths:
                 # use local schema if available to simplify test development
                 if os.path.exists(os.path.join(path, schema_file)):
-                    app_env["APP_SCHEMA_FILE"] = schema_file
+                    app_env["APP_SCHEMA_FILE"] = os.path.abspath(schema_file)
 
             if api_config.autotest:
                 logging.info("Running auto api tests")
diff --git a/tools/cloudharness-test/cloudharness_test/apitest_init.py b/tools/cloudharness-test/cloudharness_test/apitest_init.py
index e39e4d92..e137464b 100644
--- a/tools/cloudharness-test/cloudharness_test/apitest_init.py
+++ b/tools/cloudharness-test/cloudharness_test/apitest_init.py
@@ -10,16 +10,22 @@
     app_schema = os.environ.get("APP_SCHEMA_FILE", None)
     app_url = os.environ.get("APP_URL", "http://samples.ch.local/api")
     logging.info("Start schemathesis tests on %s", app_url)
+    schema = None
     if app_schema:
         # Test locally with harness-test -- use local schema for convenience during test development
         openapi_uri = app_schema
-        schema = st.from_file(openapi_uri)
-    else:
+        try:
+            schema = st.from_file(openapi_uri)
+        except st.exceptions.SchemaError:
+            logging.exception("The local schema file %s cannot be loaded. Attempting loading from URL", openapi_uri)
+
+    if not schema:
         # remote testing: might be /api/openapi.json or /openapi.json
         try:
             openapi_uri = openapi_uri = app_url + "/openapi.json"
+            logging.info("Using openapi spec at %s", openapi_uri)
             schema = st.from_uri(openapi_uri)
-        except st.exceptions.SchemaError as e:
+        except st.exceptions.SchemaError:
             # Use alternative configuration
             try:
                 openapi_uri = app_url.replace("/api", "") + "/openapi.json"
@@ -33,8 +39,6 @@
             raise Exception(
                 f"Cannot setup api tests: {openapi_uri}: {e}") from e
 
-    logging.info("Using openapi spec at %s", openapi_uri)
-
     if "USERNAME" in os.environ and "PASSWORD" in os.environ:
         logging.info("Setting token from username and password")
 

From 0f88e072dc7222fb5b5d1937f978df75d70c1b88 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 19:17:49 +0200
Subject: [PATCH 160/210] Improve testing docs

---
 docs/testing.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/testing.md b/docs/testing.md
index 27356fea..0a941f90 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -83,11 +83,11 @@ harness:
       - "--hypothesis-deadline=60000"
       - "--request-timeout=60000"
       - "--hypothesis-max-examples=2"
-      - "--show-errors-tracebacks"
+      - "--show-trace"
 ```
 
-See [the model documentation](model/ApiTestsConfig.md) for more insights about parameters.
-
+See [the model documentation](model/ApiTestsConfig.md) for more insights about test parameters.
+See the [Schemathesis documentation](https://schemathesis.readthedocs.io/en/stable/cli.html#basic-usage) for more information about command line parameters (runParams).
 
 ### Write API tests
 

From 2535a1628ab252397a7eefd146c98c67b668a252 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Mon, 16 Sep 2024 19:18:42 +0200
Subject: [PATCH 161/210] Improve cookie auth automations

---
 .../cloudharness-common/cloudharness/middleware/django.py      | 3 +--
 libraries/cloudharness-common/cloudharness/middleware/flask.py | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/middleware/django.py b/libraries/cloudharness-common/cloudharness/middleware/django.py
index a3b528e1..4a24ac86 100644
--- a/libraries/cloudharness-common/cloudharness/middleware/django.py
+++ b/libraries/cloudharness-common/cloudharness/middleware/django.py
@@ -1,4 +1,3 @@
-from django.conf import settings
 from cloudharness.middleware import set_authentication_token
 
 
@@ -13,7 +12,7 @@ def __call__(self, request):
 
         # retrieve the bearer token from the header
         # and save it for use in the AuthClient
-        set_authentication_token(request.headers.get('Authorization'))
+        set_authentication_token(request.headers.get('Authorization', '').split(' ')[-1] or request.cookies.get('kc-access', None))
 
         response = self.get_response(request)
 
diff --git a/libraries/cloudharness-common/cloudharness/middleware/flask.py b/libraries/cloudharness-common/cloudharness/middleware/flask.py
index 670e9360..cad901a1 100644
--- a/libraries/cloudharness-common/cloudharness/middleware/flask.py
+++ b/libraries/cloudharness-common/cloudharness/middleware/flask.py
@@ -15,6 +15,7 @@ def __call__(self, environ, start_response):
 
         # retrieve the bearer token from the header
         # and save it for use in the AuthClient
-        set_authentication_token(request.headers.get('Authorization'))
+        #
+        set_authentication_token(request.headers.get('Authorization', '').split(' ')[-1] or request.cookies.get('kc-access', None))
 
         return self.app(environ, start_response)

From 18c47cd0f2d04038248742909809d158b1957667 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 17 Sep 2024 10:26:47 +0200
Subject: [PATCH 162/210] Lint fixes

---
 .../jupyterhub/deploy/resources/hub/jupyterhub_config.py       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
index 2033ff1b..c3318bac 100755
--- a/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
+++ b/applications/jupyterhub/deploy/resources/hub/jupyterhub_config.py
@@ -25,7 +25,7 @@
 configuration_directory = os.path.dirname(os.path.realpath(__file__))
 sys.path.insert(0, configuration_directory)
 
-from z2jh import ( # noqa
+from z2jh import (  # noqa
     get_config,
     get_name,
     get_name_env,
@@ -33,6 +33,7 @@
     set_config_if_not_none,
 )
 
+
 def camelCaseify(s):
     """convert snake_case to camelCase
 

From 0eae79b7470db8cd78d989e1987618d75f0e3374 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 17 Sep 2024 10:26:57 +0200
Subject: [PATCH 163/210] Lint fixes

---
 lint-check.sh                                 |  2 +-
 .../ch_cli_tools/codefresh.py                 | 23 ++++----
 .../deployment-cli-tools/ch_cli_tools/helm.py |  2 +-
 .../deployment-cli-tools/harness-application  |  2 +-
 tools/deployment-cli-tools/harness-deployment | 59 +++++++++----------
 5 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/lint-check.sh b/lint-check.sh
index 426bfaff..869f51b7 100644
--- a/lint-check.sh
+++ b/lint-check.sh
@@ -4,6 +4,6 @@ diff_output=$(autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --diff --excl
 # Check if the output is non-empty
 if [ -n "$diff_output" ]; then
     echo $diff_output
-    echo "Code style issues found in the above files. Please run autopep8 to fix them."
+    echo "Code style issues found in the above files. Please run autopep8 to fix."
     exit 1
 fi
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
index e4dca514..e41fdb5d 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/codefresh.py
@@ -245,9 +245,6 @@ def codefresh_steps_from_base_path(base_path, build_step, fixed_context=None, in
                                 environment=e2e_test_environment(app_config)
                             )
 
-
-
-
             def add_unit_test_step(app_config: ApplicationHarnessConfig):
                 # Create a run step for each application with tests/unit.yaml file using the corresponding image built at the previous step
 
@@ -264,24 +261,24 @@ def add_unit_test_step(app_config: ApplicationHarnessConfig):
 
             if helm_values[KEY_TASK_IMAGES]:
                 codefresh_steps_from_base_path(join(root_path, BASE_IMAGES_PATH), CD_BUILD_STEP_BASE,
-                                            fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
+                                               fixed_context=relpath(root_path, os.getcwd()), include=helm_values[KEY_TASK_IMAGES].keys())
                 codefresh_steps_from_base_path(join(root_path, STATIC_IMAGES_PATH), CD_BUILD_STEP_STATIC,
-                                            include=helm_values[KEY_TASK_IMAGES].keys())
+                                               include=helm_values[KEY_TASK_IMAGES].keys())
 
                 codefresh_steps_from_base_path(join(
                     root_path, APPS_PATH), CD_BUILD_STEP_PARALLEL)
 
             if CD_E2E_TEST_STEP in steps:
-                    name = "test-e2e"
-                    codefresh_steps_from_base_path(join(
-                        root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), publish=False)
-                    steps[CD_E2E_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
+                name = "test-e2e"
+                codefresh_steps_from_base_path(join(
+                    root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), publish=False)
+                steps[CD_E2E_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
 
             if CD_API_TEST_STEP in steps:
-                    name = "test-api"
-                    codefresh_steps_from_base_path(join(
-                        root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False)
-                    steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
+                name = "test-api"
+                codefresh_steps_from_base_path(join(
+                    root_path, TEST_IMAGES_PATH), CD_BUILD_STEP_TEST, include=(name,), fixed_context=relpath(root_path, os.getcwd()), publish=False)
+                steps[CD_API_TEST_STEP]["image"] = image_tag_with_variables(name, app_specific_tag_variable(name), base_name=base_image_name)
 
     if not codefresh:
         logging.warning(
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index df2b2080..d1725c67 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -161,7 +161,7 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
         if os.path.exists(specific_template_path):
             logging.info("Specific values template found: " +
-                        specific_template_path)
+                         specific_template_path)
             values = get_template(specific_template_path)
         else:
             values = {}
diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index ac4824cb..551d0ae1 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -25,7 +25,7 @@ if __name__ == "__main__":
         description='Creates a new Application.')
     parser.add_argument('name', metavar='name', type=str,
                         help='Application name')
-    parser.add_argument('-t', '--template', dest='templates', action="append", default=['base',],
+    parser.add_argument('-t', '--template', dest='templates', action="append", default=['base', ],
                         help="""Add a template name.
 
                         Available templates:
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index 40d4b09a..908caed0 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -62,11 +62,10 @@ if __name__ == "__main__":
     parser.add_argument('-N', '--no-cd', dest='no_cd_gen', action="store_const", default=None, const=True,
                         help=f'Do not generate ci/cd files')
     parser.add_argument('-we', '--write-env', dest='write_env', action="store_const", default=None, const=True,
-                            help=f'Write build env to .env file in {DEPLOYMENT_PATH}')
+                        help=f'Write build env to .env file in {DEPLOYMENT_PATH}')
     parser.add_argument('--docker-compose', dest='docker_compose', action="store_true",
                         help='Generate docker-compose.yaml and dedicated Skaffold configuration')
 
-
     args, unknown = parser.parse_known_args(sys.argv[1:])
 
     root_paths = [os.path.join(os.getcwd(), path) for path in args.paths]
@@ -87,36 +86,36 @@ if __name__ == "__main__":
 
         if not args.docker_compose:
             helm_values = create_helm_chart(
-            root_paths,
-            tag=args.tag,
-            registry=args.registry,
-            domain=args.domain,
-            local=args.local,
-            secured=not args.unsecured,
-            output_path=args.output_path,
-            exclude=args.exclude,
-            include=args.include,
-            registry_secret=args.registry_secret,
-            tls=not args.no_tls,
-            env=envs,
-            namespace=args.namespace
-        )
+                root_paths,
+                tag=args.tag,
+                registry=args.registry,
+                domain=args.domain,
+                local=args.local,
+                secured=not args.unsecured,
+                output_path=args.output_path,
+                exclude=args.exclude,
+                include=args.include,
+                registry_secret=args.registry_secret,
+                tls=not args.no_tls,
+                env=envs,
+                namespace=args.namespace
+            )
         else:
             helm_values = create_docker_compose_configuration(
-            root_paths,
-            tag=args.tag,
-            registry=args.registry,
-            domain=args.domain,
-            local=args.local,
-            secured=not args.unsecured,
-            output_path=args.output_path,
-            exclude=args.exclude,
-            include=args.include,
-            registry_secret=args.registry_secret,
-            tls=not args.no_tls,
-            env=envs,
-            namespace=args.namespace,
-        )
+                root_paths,
+                tag=args.tag,
+                registry=args.registry,
+                domain=args.domain,
+                local=args.local,
+                secured=not args.unsecured,
+                output_path=args.output_path,
+                exclude=args.exclude,
+                include=args.include,
+                registry_secret=args.registry_secret,
+                tls=not args.no_tls,
+                env=envs,
+                namespace=args.namespace,
+            )
 
         merged_root_paths = preprocess_build_overrides(
             root_paths=root_paths, helm_values=helm_values)

From 35292005ea5e624c78d9258e9b175c04791f7e31 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 17 Sep 2024 14:21:29 +0200
Subject: [PATCH 164/210] CH-110 small changes to docker compose generation

---
 deployment-configuration/compose/Chart.yaml   | 14 +++---
 deployment-configuration/compose/README.md    |  2 +-
 deployment-configuration/compose/values.yaml  | 47 +------------------
 deployment-configuration/helm/Chart.yaml      | 12 ++---
 deployment-configuration/helm/values.yaml     |  7 +--
 .../skaffold-template.yaml                    |  3 +-
 .../ch_cli_tools/dockercompose.py             |  4 +-
 .../ch_cli_tools/skaffold.py                  | 22 +++++----
 8 files changed, 32 insertions(+), 79 deletions(-)

diff --git a/deployment-configuration/compose/Chart.yaml b/deployment-configuration/compose/Chart.yaml
index 83bf4933..1b396ffe 100644
--- a/deployment-configuration/compose/Chart.yaml
+++ b/deployment-configuration/compose/Chart.yaml
@@ -1,10 +1,8 @@
 apiVersion: v1
-appVersion: "0.0.1"
-description: CloudHarness Docker Compose
-name: cloudharness
-version: 0.0.1
+appVersion: 2.4.0-compose
+description: CloudHarness Docker compose Helm Chart
 maintainers:
-  - name: Filippo Ledda
-    email: filippo@metacell.us
-  - name: Zoran Sinnema
-    email: zoran@metacell.us
+- {email: filippo@metacell.us, name: Filippo Ledda}
+- {email: vincent@metacell.us, name: Vincent Aranega}
+name: cloudharness
+version: 0.0.1
\ No newline at end of file
diff --git a/deployment-configuration/compose/README.md b/deployment-configuration/compose/README.md
index 391b61c6..5387ebbe 100644
--- a/deployment-configuration/compose/README.md
+++ b/deployment-configuration/compose/README.md
@@ -1,3 +1,3 @@
 # CloudHarness Docker Compose: deploy CloudHarness to Docker Compose
 
-Helm is used to define templates about how the CloudHarness deployment on Docker Compose. For further information about Helm, see https://helm.sh.
+Helm is used to define templates about how the CloudHarness deployment on Docker Compose. For further information about Helm, see https://helm.sh.
\ No newline at end of file
diff --git a/deployment-configuration/compose/values.yaml b/deployment-configuration/compose/values.yaml
index 434dcac7..0fa87e29 100644
--- a/deployment-configuration/compose/values.yaml
+++ b/deployment-configuration/compose/values.yaml
@@ -21,52 +21,7 @@ apps: {}
 env:
   # -- Cloud Harness version
   - name: CH_VERSION
-    value: 0.0.1
-  # -- Cloud harness chart version
-  - name: CH_CHART_VERSION
-    value: 0.0.1
-privenv:
-  # -- Defines a secret as private environment variable that is injected in containers.
-  - name: CH_SECRET
-    value: In God we trust; all others must bring data. ― W. Edwards Deming
-ingress:
-  # -- Flag to enable/disalbe ingress controller.
-  enabled: true
-  # -- K8s Name of ingress.
-  name: cloudharness-ingress
-  # -- Enables/disables SSL redirect.
-  ssl_redirect: true
-  letsencrypt:
-    # -- Email for letsencrypt.
-    email: filippo@metacell.us
-backup:
-  # -- Flag to enable/disable backups.
-  active: false
-  # -- Number of days to keep backups.
-  keep_days: "7"
-  # -- Number of weeks to keep backups.
-  keep_weeks: "4"
-  # -- Number of months to keep backups.
-  keep_months: "6"
-  # -- Schedule as cronjob expression.
-  schedule: "*/5 * * * *"
-  # -- The file suffix added to backup files.
-  suffix: ".gz"
-  # -- The volume size for backups (all backups share the same volume)
-  volumesize: "2Gi"
-  # -- Target directory of backups, the mount point of the persistent volume.
-  dir: "/backups"
-  resources:
-    requests:
-      # -- K8s memory resource definition.
-      memory: "32Mi"
-      # -- K8s cpu resource definition.
-      cpu: "25m"
-    limits:
-      # -- K8s memory resource definition.
-      memory: "64Mi"
-      # -- K8s cpu resource definition.
-      cpu: "50m"
+    value: 2.4.0
 proxy:
   timeout:
     # -- Timeout for proxy connections in seconds.
diff --git a/deployment-configuration/helm/Chart.yaml b/deployment-configuration/helm/Chart.yaml
index f294c3e7..31dbc5ff 100644
--- a/deployment-configuration/helm/Chart.yaml
+++ b/deployment-configuration/helm/Chart.yaml
@@ -1,10 +1,8 @@
 apiVersion: v1
-appVersion: "0.0.1"
+appVersion: 2.4.0
 description: CloudHarness Helm Chart
-name: cloudharness
-version: 0.0.1
 maintainers:
-  - name: Filippo Ledda
-    email: filippo@metacell.us
-  - name: Zoran Sinnema
-    email: zoran@metacell.us
+- {email: filippo@metacell.us, name: Filippo Ledda}
+- {email: zoran@metacell.us, name: Zoran Sinnema}
+name: cloudharness
+version: 0.0.1
\ No newline at end of file
diff --git a/deployment-configuration/helm/values.yaml b/deployment-configuration/helm/values.yaml
index 59fd7a67..86ada06f 100644
--- a/deployment-configuration/helm/values.yaml
+++ b/deployment-configuration/helm/values.yaml
@@ -21,10 +21,7 @@ apps: {}
 env:
   # -- Cloud Harness version
   - name: CH_VERSION
-    value: 0.0.1
-  # -- Cloud harness chart version
-  - name: CH_CHART_VERSION
-    value: 0.0.1
+    value: 2.4.0
 privenv:
   # -- Defines a secret as private environment variable that is injected in containers.
   - name: CH_SECRET
@@ -38,7 +35,7 @@ ingress:
   ssl_redirect: true
   letsencrypt:
     # -- Email for letsencrypt.
-    email: filippo@metacell.us
+    email: cloudharness@metacell.us
 backup:
   # -- Flag to enable/disable backups.
   active: false
diff --git a/deployment-configuration/skaffold-template.yaml b/deployment-configuration/skaffold-template.yaml
index 6331c4d8..2b2a3a25 100644
--- a/deployment-configuration/skaffold-template.yaml
+++ b/deployment-configuration/skaffold-template.yaml
@@ -1,8 +1,7 @@
 apiVersion: skaffold/v2beta28
 kind: Config
 build:
-  tagPolicy:
-    sha256: {}
+  tagPolicy: {}
   local:
     useBuildkit: true
     concurrency: 4
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index a4a3e1b8..e714f1f1 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -16,7 +16,9 @@
 
 from .models import HarnessMainConfig
 
-from .configurationgenerator import ConfigurationGenerator, validate_helm_values, KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates
+from .configurationgenerator import ConfigurationGenerator, \
+    validate_helm_values, values_from_legacy, values_set_legacy, get_included_with_dependencies, create_env_variables, collect_apps_helm_templates, \
+    KEY_HARNESS, KEY_SERVICE, KEY_DATABASE, KEY_APPS, KEY_TASK_IMAGES, KEY_TEST_IMAGES, KEY_DEPLOYMENT
 
 
 def create_docker_compose_configuration(root_paths, tag: Union[str, int, None] = 'latest', registry='', local=True, domain=None, exclude=(), secured=True,
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index aefc8607..0c471f42 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -9,8 +9,8 @@
 from cloudharness_utils.constants import APPS_PATH, DEPLOYMENT_CONFIGURATION_PATH, \
     BASE_IMAGES_PATH, STATIC_IMAGES_PATH, HELM_ENGINE, COMPOSE_ENGINE
 from .helm import KEY_APPS, KEY_HARNESS, KEY_DEPLOYMENT, KEY_TASK_IMAGES
-from .utils import get_template, dict_merge, find_dockerfiles_paths, app_name_from_path, \
-    find_file_paths, guess_build_dependencies_from_dockerfile, merge_to_yaml_file, get_json_template, get_image_name
+from .utils import get_template, dict_merge, find_dockerfiles_paths, app_name_from_path, yaml, \
+    find_file_paths, guess_build_dependencies_from_dockerfile, get_json_template, get_image_name
 
 from . import HERE
 
@@ -22,12 +22,13 @@ def relpath_if(p1, p2):
 
 
 def create_skaffold_configuration(root_paths, helm_values: HarnessMainConfig, output_path='.', manage_task_images=True, backend_deploy=HELM_ENGINE):
-    skaffold_conf = get_template('skaffold-template.yaml', True)
+    backend = backend_deploy or HELM_ENGINE
+    template_name = 'skaffold-template.yaml'
+    skaffold_conf = get_template(template_name, True)
     apps = helm_values.apps
     base_image_name = (helm_values.registry.name or "") + helm_values.name
     artifacts = {}
     overrides = {}
-    backend = backend_deploy or HELM_ENGINE
 
     def remove_tag(image_name):
         return image_name.split(":")[0]
@@ -101,7 +102,7 @@ def process_build_dockerfile(
 
     for root_path in root_paths:
         skaffold_conf = dict_merge(skaffold_conf, get_template(
-            join(root_path, DEPLOYMENT_CONFIGURATION_PATH, 'skaffold-template.yaml')))
+            join(root_path, DEPLOYMENT_CONFIGURATION_PATH, template_name)))
 
         base_dockerfiles = find_dockerfiles_paths(
             join(root_path, BASE_IMAGES_PATH))
@@ -219,15 +220,19 @@ def identify_unicorn_based_main(candidates):
                 'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
             }
         }
+    if backend == COMPOSE_ENGINE or not helm_values.tag:
         skaffold_conf['build']['tagPolicy'] = {
             'envTemplate': {
                 'template': '"{{.TAG}}"'
             }
         }
+    else:
+        skaffold_conf['build']['tagPolicy'] = {"sha256": {}}
 
     skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
-    merge_to_yaml_file(skaffold_conf, os.path.join(
-        output_path, 'skaffold.yaml'))
+
+    with open('skaffold.yaml', "w") as f:
+        yaml.dump(skaffold_conf, f)
     return skaffold_conf
 
 
@@ -244,8 +249,7 @@ def git_clone_hook(conf: GitDependencyConfig, context_path: str):
 
 
 def create_vscode_debug_configuration(root_paths, helm_values):
-    logging.info(
-        "Creating VS code cloud build configuration.\nCloud build extension is needed to debug.")
+    logging.info("Creating VS code cloud build configuration.\nCloud build extension is needed to debug.")
 
     vscode_launch_path = '.vscode/launch.json'
 

From 08b964570f59b530424dbfb6aec29aa0184998f9 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 17 Sep 2024 17:43:59 +0200
Subject: [PATCH 165/210] CH-100 refactoring, small fixes

---
 .dockerignore                                 |  3 +-
 .gitignore                                    |  2 +-
 .../compose/templates/auto-compose.yaml       |  6 +-
 .../compose/templates/auto-gatekeepers.yaml   |  6 +-
 .../ch_cli_tools/configurationgenerator.py    | 23 ++++---
 .../ch_cli_tools/dockercompose.py             | 11 ++--
 .../deployment-cli-tools/ch_cli_tools/helm.py |  2 +-
 .../ch_cli_tools/skaffold.py                  |  2 +-
 tools/deployment-cli-tools/harness-deployment | 64 +++++++------------
 .../tests/test_dockercompose.py               |  4 +-
 10 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index f98de6cc..a5b6ffed 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -19,4 +19,5 @@ __pycache__
 /application-templates
 /deployment-configuration
 /cloud-harness
-.openapi-generator
\ No newline at end of file
+.openapi-generator
+docker-compose.yaml
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 1c0fcc2e..f4d38460 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ node_modules
 *.DS_Store
 deployment/helm
 deployment/compose
-deployment/docker-compose.yaml
+docker-compose.yaml
 *.egg-info
 *.idea
 /build
diff --git a/deployment-configuration/compose/templates/auto-compose.yaml b/deployment-configuration/compose/templates/auto-compose.yaml
index 46b07661..b0085085 100644
--- a/deployment-configuration/compose/templates/auto-compose.yaml
+++ b/deployment-configuration/compose/templates/auto-compose.yaml
@@ -163,9 +163,9 @@ services:
     {{- end }}
     {{- end }}
     volumes:
-      - ./compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
+      - ./deployment/compose/allvalues.yaml:/opt/cloudharness/resources/allvalues.yaml:ro
     {{- range $file_name, $_ := $app_config.harness.secrets }}
-      - ./compose/resources/generated/auth/{{ $file_name }}:/opt/cloudharness/resources/auth/{{ $file_name }}
+      - ./deployment/compose/resources/generated/auth/{{ $file_name }}:/opt/cloudharness/resources/auth/{{ $file_name }}
     {{- end }}
     {{- if or $deployment.volume $app_config.harness.resources }}
     {{- with $deployment.volume }}
@@ -176,7 +176,7 @@ services:
     {{- with $app_config.harness.resources }}
     {{- range .}}
       - type: bind
-        source: ./compose/resources/generated/{{ $app_name }}/{{ .src }}
+        source: ./deployment/compose/resources/generated/{{ $app_name }}/{{ .src }}
         target: {{ .dst }}
     {{- end }}
     {{- end}}
diff --git a/deployment-configuration/compose/templates/auto-gatekeepers.yaml b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
index fcd7d19a..4e6b7ac5 100644
--- a/deployment-configuration/compose/templates/auto-gatekeepers.yaml
+++ b/deployment-configuration/compose/templates/auto-gatekeepers.yaml
@@ -23,9 +23,9 @@
   environment:
     - PROXY_CONFIG_FILE=/opt/proxy.yml
   volumes:
-    - ./compose/resources/generated/{{ $gk_name }}/proxy.yml:/opt/proxy.yml
-    - ./compose/resources/generated/{{ $gk_name }}/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
-    - ./compose/resources/generated/{{ $gk_name }}/access-denied.html.tmpl:/templates/access-denied.html.tmpl
+    - ./deployment/compose/resources/generated/{{ $gk_name }}/proxy.yml:/opt/proxy.yml
+    - ./deployment/compose/resources/generated/{{ $gk_name }}/cacert.crt:/etc/pki/ca-trust/source/anchors/cacert.crt
+    - ./deployment/compose/resources/generated/{{ $gk_name }}/access-denied.html.tmpl:/templates/access-denied.html.tmpl
   labels:
     - "traefik.enable=true"
     - "traefik.http.services.{{ $gk_name }}.loadbalancer.server.port={{ .app.harness.service.port }}"
diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
index 2228e3af..56c4f9ac 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
@@ -1,7 +1,7 @@
 """
 Utilities to create a helm chart from a CloudHarness directory structure
 """
-from typing import Union
+from typing import List, Union
 import yaml
 import os
 import shutil
@@ -10,7 +10,7 @@
 import tarfile
 from docker import from_env as DockerClient
 from pathlib import Path
-
+import abc
 
 from . import HERE, CH_ROOT
 from cloudharness_utils.constants import TEST_IMAGES_PATH, HELM_CHART_PATH, APPS_PATH, HELM_PATH, \
@@ -32,10 +32,11 @@
 DEFAULT_IGNORE = ('/tasks', '.dockerignore', '.hypothesis', "__pycache__", '.node_modules', 'dist', 'build', '.coverage')
 
 
-class ConfigurationGenerator(object):
-    def __init__(self, root_paths, tag: Union[str, int, None] = 'latest', registry='', local=True, domain=None, exclude=(), secured=True,
-                 output_path='./deployment', include=None, registry_secret=None, tls=True, env=None,
-                 namespace=None, templates_path=HELM_PATH):
+class ConfigurationGenerator(object, metaclass=abc.ABCMeta):
+
+    def __init__(self, root_paths: List[str], tag: Union[str, int, None] = 'latest', registry='', local=True, domain=None, exclude=(), secured=True,
+                 output_path='./deployment', include: List[str] = None, registry_secret: str = None, tls: str = True, env: str = None,
+                 namespace: str = None, templates_path: str = HELM_PATH):
         assert domain, 'A domain must be specified'
         self.root_paths = [Path(r) for r in root_paths]
         self.tag = tag
@@ -63,6 +64,10 @@ def __init__(self, root_paths, tag: Union[str, int, None] = 'latest', registry='
         self.base_images = {}
         self.all_images = {}
 
+    @abc.abstractmethod
+    def create_app_values_spec(self, app_name, app_path, base_image_name=None, helm_values={}):
+        ...
+
     def __init_deployment(self):
         """
         Create the base helm chart
@@ -94,11 +99,11 @@ def _process_applications(self, helm_values, base_image_name):
 
             app_base_path = root_path / APPS_PATH
             app_values = self.collect_app_values(
-                app_base_path, base_image_name=base_image_name)
+                app_base_path, base_image_name=base_image_name, helm_values=helm_values)
             helm_values[KEY_APPS] = dict_merge(helm_values[KEY_APPS],
                                                app_values)
 
-    def collect_app_values(self, app_base_path, base_image_name=None):
+    def collect_app_values(self, app_base_path, base_image_name=None, helm_values=None):
         values = {}
 
         for app_path in app_base_path.glob("*/"):  # We get the sub-files that are directories
@@ -108,7 +113,7 @@ def collect_app_values(self, app_base_path, base_image_name=None):
                 continue
             app_key = app_name.replace('-', '_')
 
-            app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name)
+            app_values = self.create_app_values_spec(app_name, app_path, base_image_name=base_image_name, helm_values=helm_values)
 
             # dockerfile_path = next(app_path.rglob('**/Dockerfile'), None)
             # # for dockerfile_path in app_path.rglob('**/Dockerfile'):
diff --git a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
index e714f1f1..87ecf5b4 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/dockercompose.py
@@ -84,7 +84,7 @@ def process_values(self) -> HarnessMainConfig:
 
     def generate_docker_compose_yaml(self):
         compose_templates = self.dest_deployment_path
-        dest_compose_yaml = self.dest_deployment_path.parent / "docker-compose.yaml"
+        dest_compose_yaml = self.dest_deployment_path.parent.parent / "docker-compose.yaml"
 
         logging.info(f'Generate docker compose configuration in: {dest_compose_yaml}, using templates from {compose_templates}')
         command = f"helm template {compose_templates} > {dest_compose_yaml}"
@@ -204,7 +204,7 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    def create_app_values_spec(self, app_name, app_path, base_image_name=None):
+    def create_app_values_spec(self, app_name, app_path, base_image_name=None, helm_values={}):
         logging.info('Generating values script for ' + app_name)
 
         deploy_path = app_path / 'deploy'
@@ -231,9 +231,10 @@ def create_app_values_spec(self, app_name, app_path, base_image_name=None):
         image_paths = [path for path in find_dockerfiles_paths(
             app_path) if 'tasks/' not in path and 'subapps' not in path]
 
-        # Inject entry points commands
-        for image_path in image_paths:
-            self.inject_entry_points_commands(values, image_path, app_path)
+        # Inject entry points commands to enable debug
+        if helm_values.get("debug", False):
+            for image_path in image_paths:
+                self.inject_entry_points_commands(values, image_path, app_path)
 
         if len(image_paths) > 1:
             logging.warning('Multiple Dockerfiles found in application %s. Picking the first one: %s', app_name,
diff --git a/tools/deployment-cli-tools/ch_cli_tools/helm.py b/tools/deployment-cli-tools/ch_cli_tools/helm.py
index d1725c67..b81d0f19 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/helm.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/helm.py
@@ -155,7 +155,7 @@ def __finish_helm_values(self, values):
         create_env_variables(values)
         return values, self.include
 
-    def create_app_values_spec(self, app_name, app_path, base_image_name=None):
+    def create_app_values_spec(self, app_name, app_path, base_image_name=None, helm_values={}):
         logging.info('Generating values script for ' + app_name)
 
         specific_template_path = os.path.join(app_path, 'deploy', 'values.yaml')
diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 0c471f42..22320082 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -231,7 +231,7 @@ def identify_unicorn_based_main(candidates):
 
     skaffold_conf['build']['artifacts'] = [v for v in artifacts.values()]
 
-    with open('skaffold.yaml', "w") as f:
+    with open(os.path.join(output_path, 'skaffold.yaml'), "w") as f:
         yaml.dump(skaffold_conf, f)
     return skaffold_conf
 
diff --git a/tools/deployment-cli-tools/harness-deployment b/tools/deployment-cli-tools/harness-deployment
index 908caed0..f4c9fe3d 100644
--- a/tools/deployment-cli-tools/harness-deployment
+++ b/tools/deployment-cli-tools/harness-deployment
@@ -11,7 +11,7 @@ from ch_cli_tools.skaffold import create_skaffold_configuration, create_vscode_d
 from ch_cli_tools.codefresh import create_codefresh_deployment_scripts, write_env_file
 from ch_cli_tools.preprocessing import preprocess_build_overrides
 from ch_cli_tools.utils import merge_app_directories
-from cloudharness_utils.constants import DEPLOYMENT_PATH, COMPOSE_ENGINE
+from cloudharness_utils.constants import DEPLOYMENT_PATH, COMPOSE_ENGINE, HELM_ENGINE
 
 HERE = os.path.dirname(os.path.realpath(__file__)).replace(os.path.sep, '/')
 ROOT = os.path.dirname(os.path.dirname(HERE)).replace(os.path.sep, '/')
@@ -79,48 +79,33 @@ if __name__ == "__main__":
     else:
 
         if args.merge:
-            logging.warn(
+            logging.warning(
                 "Merge (-m, --merge) argument is deprecated. Directory merging is now set automatically")
             merge_app_directories(root_paths, destination=args.merge)
             root_paths = [args.merge]
 
-        if not args.docker_compose:
-            helm_values = create_helm_chart(
-                root_paths,
-                tag=args.tag,
-                registry=args.registry,
-                domain=args.domain,
-                local=args.local,
-                secured=not args.unsecured,
-                output_path=args.output_path,
-                exclude=args.exclude,
-                include=args.include,
-                registry_secret=args.registry_secret,
-                tls=not args.no_tls,
-                env=envs,
-                namespace=args.namespace
-            )
-        else:
-            helm_values = create_docker_compose_configuration(
-                root_paths,
-                tag=args.tag,
-                registry=args.registry,
-                domain=args.domain,
-                local=args.local,
-                secured=not args.unsecured,
-                output_path=args.output_path,
-                exclude=args.exclude,
-                include=args.include,
-                registry_secret=args.registry_secret,
-                tls=not args.no_tls,
-                env=envs,
-                namespace=args.namespace,
-            )
+        chart_fn = create_helm_chart if not args.docker_compose else create_docker_compose_configuration
+
+        helm_values = chart_fn(
+            root_paths,
+            tag=args.tag,
+            registry=args.registry,
+            domain=args.domain,
+            local=args.local,
+            secured=not args.unsecured,
+            output_path=args.output_path,
+            exclude=args.exclude,
+            include=args.include,
+            registry_secret=args.registry_secret,
+            tls=not args.no_tls,
+            env=envs,
+            namespace=args.namespace
+        )
 
         merged_root_paths = preprocess_build_overrides(
             root_paths=root_paths, helm_values=helm_values)
 
-        if not args.no_cd_gen and envs:
+        if not args.no_cd_gen and envs and not args.docker_compose:
             create_codefresh_deployment_scripts(
                 merged_root_paths,
                 include=args.include,
@@ -132,13 +117,12 @@ if __name__ == "__main__":
         if args.write_env:
             write_env_file(helm_values, os.path.join(root_paths[-1], DEPLOYMENT_PATH, ".env"))
 
+        create_skaffold_configuration(merged_root_paths, helm_values, backend_deploy=COMPOSE_ENGINE if args.docker_compose else HELM_ENGINE)
+
         if not args.docker_compose:
-            create_skaffold_configuration(merged_root_paths, helm_values)
-        else:
-            create_skaffold_configuration(merged_root_paths, helm_values, backend_deploy=COMPOSE_ENGINE)
-        create_vscode_debug_configuration(root_paths, helm_values)
+            create_vscode_debug_configuration(root_paths, helm_values)
 
-        hosts_info(helm_values)
+            hosts_info(helm_values)
 
     if args.deploy:
         deploy(args.namespace, args.output_path)
diff --git a/tools/deployment-cli-tools/tests/test_dockercompose.py b/tools/deployment-cli-tools/tests/test_dockercompose.py
index 3e2c2300..13959434 100644
--- a/tools/deployment-cli-tools/tests/test_dockercompose.py
+++ b/tools/deployment-cli-tools/tests/test_dockercompose.py
@@ -67,7 +67,7 @@ def test_collect_compose_values(tmp_path):
     compose_path = out_folder / COMPOSE_PATH
 
     # Check files
-    assert exists(out_folder / 'docker-compose.yaml')
+    assert exists(out_folder.parent / 'docker-compose.yaml')
     assert exists(compose_path)
     assert exists(compose_path / 'values.yaml')
     assert exists(compose_path / 'allvalues.yaml')
@@ -136,7 +136,7 @@ def test_collect_compose_values_noreg_noinclude(tmp_path):
     compose_path = out_path / COMPOSE_PATH
 
     # Check files
-    assert exists(out_path / 'docker-compose.yaml')
+    assert exists(out_path.parent / 'docker-compose.yaml')
     assert exists(compose_path)
     assert exists(compose_path / 'values.yaml')
     assert exists(compose_path / 'allvalues.yaml')

From 7eb8ca393c159db2791c2f5911b8b12f4f7687c5 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 17 Sep 2024 18:12:44 +0200
Subject: [PATCH 166/210] Linting fix

---
 lint-check.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lint-check.sh b/lint-check.sh
index 869f51b7..58260bfe 100644
--- a/lint-check.sh
+++ b/lint-check.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 # Run autopep8 with --diff and capture the output
-diff_output=$(autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --diff --exclude '**/cloudharness_cli/**/*,**/models/*,**/model/*' .)
+diff_output=$(python -m autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --diff --exclude '**/cloudharness_cli/**/*,**/models/*,**/model/*' .)
 # Check if the output is non-empty
 if [ -n "$diff_output" ]; then
-    echo $diff_output
-    echo "Code style issues found in the above files. Please run autopep8 to fix."
+    printf "%s\n" "$diff_output"
+    echo "Code style issues found in the above files. To fix you can run: "
+    echo "autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive  --in-place --exclude '**/cloudharness_cli/**/*,**/models/*,**/model/*'"
     exit 1
 fi
\ No newline at end of file

From 8bb9a1b06e2059aa0b6d6f77725ebbb73dd853af Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 17 Sep 2024 18:14:44 +0200
Subject: [PATCH 167/210] Linting fix

---
 libraries/cloudharness-common/cloudharness/applications.py | 4 ++--
 lint-check.sh                                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/applications.py b/libraries/cloudharness-common/cloudharness/applications.py
index cea37e32..855f8c82 100644
--- a/libraries/cloudharness-common/cloudharness/applications.py
+++ b/libraries/cloudharness-common/cloudharness/applications.py
@@ -42,10 +42,10 @@ def get_db_connection_string(self, **kwargs) -> str:
         elif self.db_type == 'postgres':
             database_name = kwargs.get('database_name', self.harness.database.postgres['initialdb'])
             return f"postgres://{self.db_name}:{self.harness.database.postgres.ports[0]['port']}/" \
-                   f"{database_name}?user={self.harness.database.user}&password={self.harness.database['pass']}"
+                f"{database_name}?user={self.harness.database.user}&password={self.harness.database['pass']}"
         elif self.db_type == 'neo4j':
             return f"{self.harness.database.neo4j.get('ports')[1]['name']}://{self.db_name}:" \
-                   f"{self.harness.database.neo4j.get('ports')[1]['port']}/"
+                f"{self.harness.database.neo4j.get('ports')[1]['port']}/"
         else:
             raise NotImplementedError(
                 f'Database connection string discovery not yet supported for database type {self.db_type}')
diff --git a/lint-check.sh b/lint-check.sh
index 58260bfe..88fa6ed2 100644
--- a/lint-check.sh
+++ b/lint-check.sh
@@ -5,6 +5,6 @@ diff_output=$(python -m autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive --d
 if [ -n "$diff_output" ]; then
     printf "%s\n" "$diff_output"
     echo "Code style issues found in the above files. To fix you can run: "
-    echo "autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive  --in-place --exclude '**/cloudharness_cli/**/*,**/models/*,**/model/*'"
+    echo "autopep8 --select=E1,E2,E3,W,E4,E7,E502  --recursive  --in-place --exclude '**/cloudharness_cli/**/*,**/models/*,**/model/*' ."
     exit 1
 fi
\ No newline at end of file

From b6e883d90e7f16803452370107f493f5b8066242 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 19:38:51 +0000
Subject: [PATCH 168/210] Bump vite from 5.4.3 to 5.4.6 in
 /applications/samples/frontend

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.3 to 5.4.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.6/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 applications/samples/frontend/package.json | 2 +-
 applications/samples/frontend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/samples/frontend/package.json b/applications/samples/frontend/package.json
index 6d468d9a..1ff691f0 100644
--- a/applications/samples/frontend/package.json
+++ b/applications/samples/frontend/package.json
@@ -28,6 +28,6 @@
     "globals": "^15.9.0",
     "typescript": "^5.5.3",
     "typescript-eslint": "^8.0.1",
-    "vite": "^5.4.1"
+    "vite": "^5.4.6"
   }
 }
diff --git a/applications/samples/frontend/yarn.lock b/applications/samples/frontend/yarn.lock
index 5fe49fa2..728bea9b 100644
--- a/applications/samples/frontend/yarn.lock
+++ b/applications/samples/frontend/yarn.lock
@@ -1540,10 +1540,10 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-vite@^5.4.1:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.3.tgz#771c470e808cb6732f204e1ee96c2ed65b97a0eb"
-  integrity sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==
+vite@^5.4.6:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.6.tgz#85a93a1228a7fb5a723ca1743e337a2588ed008f"
+  integrity sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"

From 1efc7c098252068a47a3c4b730da0ae46edee168 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 17 Sep 2024 09:28:10 +0100
Subject: [PATCH 169/210] CH-45 Update main template to support bearer and
 cookie access tokens

---
 .../django-app/api/templates/main.jinja2      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/application-templates/django-app/api/templates/main.jinja2 b/application-templates/django-app/api/templates/main.jinja2
index d3177fd7..e351e841 100644
--- a/application-templates/django-app/api/templates/main.jinja2
+++ b/application-templates/django-app/api/templates/main.jinja2
@@ -49,13 +49,17 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-from cloudharness.middleware import set_authentication_token
+from cloudharness.middleware import set_authentication_token, get_authentication_token
 @app.middleware("http")
 async def add_process_time_header(request: Request, call_next):
     # retrieve the bearer token from the header
     # and save it for use in the AuthClient
-    authorization = request.headers.get('Authorization')
+    authorization = request.headers.get('Authorization') or request.cookies.get('kc-access')
+
     if authorization:
+        if 'Bearer ' in authorization:
+            authorization = authorization.split('Bearer ')[1]
+
         set_authentication_token(authorization)
 
     return await call_next(request)
@@ -67,16 +71,17 @@ if os.environ.get('KUBERNETES_SERVICE_HOST', None):
     # start the kafka event listener when running in/for k8s
     import cloudharness_django.services.events
 
-# enable the Bearer Authentication
-security = HTTPBearer()
-
-async def has_access(credentials: HTTPBasicCredentials = Depends(security)):
+async def has_access():
     """
     Function that is used to validate the token in the case that it requires it
     """
     if not os.environ.get('KUBERNETES_SERVICE_HOST', None):
         return {}
-    token = credentials.credentials
+
+    token = get_authentication_token()
+
+    if not token:
+        raise HTTPException(status_code=401)
 
     try:
         payload = get_auth_service().get_auth_client().decode_token(token)

From 60b02cabf9ede78dced50965011a9b2a01957ee4 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 17 Sep 2024 09:28:47 +0100
Subject: [PATCH 170/210] CH-45 Fix linting errors in webapp template

---
 .../webapp/frontend/src/App.tsx               | 16 ++++-----
 .../webapp/frontend/vite.config.ts            | 34 ++++++++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/application-templates/webapp/frontend/src/App.tsx b/application-templates/webapp/frontend/src/App.tsx
index 5f2286b2..7e620ca7 100644
--- a/application-templates/webapp/frontend/src/App.tsx
+++ b/application-templates/webapp/frontend/src/App.tsx
@@ -3,14 +3,14 @@ import Version from './components/Version';
 
 
 const Main = () => (
-    <>
-      <img src="/logo.png" width="800" />
-      <h1>__APP_NAME__ React application is working!</h1>
-      <Version />
-      <RestTest />
-      <p>See api documentation <a href="/api/ui/">here</a></p>
-    </>
-  )
+  <>
+    <img src="/logo.png" width="800" />
+    <h1>__APP_NAME__ React application is working!</h1>
+    <Version />
+    <RestTest />
+    <p>See api documentation <a href="/api/ui/">here</a></p>
+  </>
+)
 
 
 export default Main;
diff --git a/application-templates/webapp/frontend/vite.config.ts b/application-templates/webapp/frontend/vite.config.ts
index 15155d73..1d1df394 100644
--- a/application-templates/webapp/frontend/vite.config.ts
+++ b/application-templates/webapp/frontend/vite.config.ts
@@ -10,7 +10,7 @@ export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), '')
 
   const theDomain = env && env.DOMAIN ? env.DOMAIN : 'localhost:5000';
-  
+
   console.log('Dev server address: ', theDomain);
 
   const proxyTarget = theDomain;
@@ -22,21 +22,23 @@ export default defineConfig(({ mode }) => {
 
 
   return {
-  plugins: [react()],
-  server: {
-    port: 9000,
-    proxy: {
-      '/api/': {
-        target: replaceHost( proxyTarget, 'samples'),
-        secure: false,
-        changeOrigin: true,
-      },
-      '/proxy/common/api': {
-        target: replaceHost( proxyTarget, 'common'),
-        secure: false,
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
+    plugins: [react()],
+    server: {
+      port: 9000,
+      proxy: {
+        '/api/': {
+          target: replaceHost(proxyTarget, 'samples'),
+          secure: false,
+          changeOrigin: true,
+        },
+        '/proxy/common/api': {
+          target: replaceHost(proxyTarget, 'common'),
+          secure: false,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
+        }
       }
+    }
   }
-}}}
+}
 )

From 29f6dd39124d9d1e9a2da54a80ae7860f2e43a31 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 12 Sep 2024 11:51:48 +0100
Subject: [PATCH 171/210] CH-59 Rename __APP_NAME__ directory to ch_django and
 api directory to __APP_NAME__

---
 .../backend/{api => __APP_NAME__}/admin.py    |  0
 .../backend/{api => __APP_NAME__}/apps.py     |  0
 .../controllers/__init__.py                   |  0
 .../{api => __APP_NAME__}/controllers/test.py |  0
 .../backend/{api => __APP_NAME__}/tests.py    |  0
 .../django-app/backend/__APP_NAME__/views.py  | 25 ++-----------------
 .../django-app/backend/api/views.py           |  3 ---
 .../backend/{api => ch_django}/__init__.py    |  0
 .../{__APP_NAME__ => ch_django}/asgi.py       |  0
 .../migrations/0001_initial.py                |  0
 .../{api => ch_django}/migrations/__init__.py |  0
 .../backend/{api => ch_django}/models.py      |  0
 .../{__APP_NAME__ => ch_django}/settings.py   |  0
 .../static/www/index.html                     |  0
 .../templates/__APP_NAME__/index.html         |  0
 .../templates/__APP_NAME__/swagger-ui.html    |  0
 .../{__APP_NAME__ => ch_django}/urls.py       |  0
 .../django-app/backend/ch_django/views.py     | 24 ++++++++++++++++++
 .../{__APP_NAME__ => ch_django}/wsgi.py       |  0
 19 files changed, 26 insertions(+), 26 deletions(-)
 rename application-templates/django-app/backend/{api => __APP_NAME__}/admin.py (100%)
 rename application-templates/django-app/backend/{api => __APP_NAME__}/apps.py (100%)
 rename application-templates/django-app/backend/{api => __APP_NAME__}/controllers/__init__.py (100%)
 rename application-templates/django-app/backend/{api => __APP_NAME__}/controllers/test.py (100%)
 rename application-templates/django-app/backend/{api => __APP_NAME__}/tests.py (100%)
 delete mode 100644 application-templates/django-app/backend/api/views.py
 rename application-templates/django-app/backend/{api => ch_django}/__init__.py (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/asgi.py (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/migrations/0001_initial.py (100%)
 rename application-templates/django-app/backend/{api => ch_django}/migrations/__init__.py (100%)
 rename application-templates/django-app/backend/{api => ch_django}/models.py (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/settings.py (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/static/www/index.html (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/templates/__APP_NAME__/index.html (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/templates/__APP_NAME__/swagger-ui.html (100%)
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/urls.py (100%)
 create mode 100644 application-templates/django-app/backend/ch_django/views.py
 rename application-templates/django-app/backend/{__APP_NAME__ => ch_django}/wsgi.py (100%)

diff --git a/application-templates/django-app/backend/api/admin.py b/application-templates/django-app/backend/__APP_NAME__/admin.py
similarity index 100%
rename from application-templates/django-app/backend/api/admin.py
rename to application-templates/django-app/backend/__APP_NAME__/admin.py
diff --git a/application-templates/django-app/backend/api/apps.py b/application-templates/django-app/backend/__APP_NAME__/apps.py
similarity index 100%
rename from application-templates/django-app/backend/api/apps.py
rename to application-templates/django-app/backend/__APP_NAME__/apps.py
diff --git a/application-templates/django-app/backend/api/controllers/__init__.py b/application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py
similarity index 100%
rename from application-templates/django-app/backend/api/controllers/__init__.py
rename to application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py
diff --git a/application-templates/django-app/backend/api/controllers/test.py b/application-templates/django-app/backend/__APP_NAME__/controllers/test.py
similarity index 100%
rename from application-templates/django-app/backend/api/controllers/test.py
rename to application-templates/django-app/backend/__APP_NAME__/controllers/test.py
diff --git a/application-templates/django-app/backend/api/tests.py b/application-templates/django-app/backend/__APP_NAME__/tests.py
similarity index 100%
rename from application-templates/django-app/backend/api/tests.py
rename to application-templates/django-app/backend/__APP_NAME__/tests.py
diff --git a/application-templates/django-app/backend/__APP_NAME__/views.py b/application-templates/django-app/backend/__APP_NAME__/views.py
index b9a7c360..91ea44a2 100644
--- a/application-templates/django-app/backend/__APP_NAME__/views.py
+++ b/application-templates/django-app/backend/__APP_NAME__/views.py
@@ -1,24 +1,3 @@
-import mimetypes
-from pathlib import Path
+from django.shortcuts import render
 
-from django.conf import settings
-from django.http import FileResponse, HttpResponseRedirect
-from django.urls import reverse
-from django.utils._os import safe_join
-
-
-def view_404(request, exception=None):
-    return HttpResponseRedirect(reverse("index"))
-
-
-def index(request, path=""):
-    if path == "":
-        path = "index.html"
-    fullpath = Path(safe_join(settings.STATIC_ROOT, "www", path))
-    content_type, encoding = mimetypes.guess_type(str(fullpath))
-    content_type = content_type or "application/octet-stream"
-    try:
-        fullpath.open("rb")
-    except FileNotFoundError:
-        return index(request, "")  # index.html
-    return FileResponse(fullpath.open("rb"), content_type=content_type)
+# Create your views here.
diff --git a/application-templates/django-app/backend/api/views.py b/application-templates/django-app/backend/api/views.py
deleted file mode 100644
index 91ea44a2..00000000
--- a/application-templates/django-app/backend/api/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
diff --git a/application-templates/django-app/backend/api/__init__.py b/application-templates/django-app/backend/ch_django/__init__.py
similarity index 100%
rename from application-templates/django-app/backend/api/__init__.py
rename to application-templates/django-app/backend/ch_django/__init__.py
diff --git a/application-templates/django-app/backend/__APP_NAME__/asgi.py b/application-templates/django-app/backend/ch_django/asgi.py
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/asgi.py
rename to application-templates/django-app/backend/ch_django/asgi.py
diff --git a/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py b/application-templates/django-app/backend/ch_django/migrations/0001_initial.py
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
rename to application-templates/django-app/backend/ch_django/migrations/0001_initial.py
diff --git a/application-templates/django-app/backend/api/migrations/__init__.py b/application-templates/django-app/backend/ch_django/migrations/__init__.py
similarity index 100%
rename from application-templates/django-app/backend/api/migrations/__init__.py
rename to application-templates/django-app/backend/ch_django/migrations/__init__.py
diff --git a/application-templates/django-app/backend/api/models.py b/application-templates/django-app/backend/ch_django/models.py
similarity index 100%
rename from application-templates/django-app/backend/api/models.py
rename to application-templates/django-app/backend/ch_django/models.py
diff --git a/application-templates/django-app/backend/__APP_NAME__/settings.py b/application-templates/django-app/backend/ch_django/settings.py
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/settings.py
rename to application-templates/django-app/backend/ch_django/settings.py
diff --git a/application-templates/django-app/backend/__APP_NAME__/static/www/index.html b/application-templates/django-app/backend/ch_django/static/www/index.html
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/static/www/index.html
rename to application-templates/django-app/backend/ch_django/static/www/index.html
diff --git a/application-templates/django-app/backend/__APP_NAME__/templates/__APP_NAME__/index.html b/application-templates/django-app/backend/ch_django/templates/__APP_NAME__/index.html
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/templates/__APP_NAME__/index.html
rename to application-templates/django-app/backend/ch_django/templates/__APP_NAME__/index.html
diff --git a/application-templates/django-app/backend/__APP_NAME__/templates/__APP_NAME__/swagger-ui.html b/application-templates/django-app/backend/ch_django/templates/__APP_NAME__/swagger-ui.html
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/templates/__APP_NAME__/swagger-ui.html
rename to application-templates/django-app/backend/ch_django/templates/__APP_NAME__/swagger-ui.html
diff --git a/application-templates/django-app/backend/__APP_NAME__/urls.py b/application-templates/django-app/backend/ch_django/urls.py
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/urls.py
rename to application-templates/django-app/backend/ch_django/urls.py
diff --git a/application-templates/django-app/backend/ch_django/views.py b/application-templates/django-app/backend/ch_django/views.py
new file mode 100644
index 00000000..b9a7c360
--- /dev/null
+++ b/application-templates/django-app/backend/ch_django/views.py
@@ -0,0 +1,24 @@
+import mimetypes
+from pathlib import Path
+
+from django.conf import settings
+from django.http import FileResponse, HttpResponseRedirect
+from django.urls import reverse
+from django.utils._os import safe_join
+
+
+def view_404(request, exception=None):
+    return HttpResponseRedirect(reverse("index"))
+
+
+def index(request, path=""):
+    if path == "":
+        path = "index.html"
+    fullpath = Path(safe_join(settings.STATIC_ROOT, "www", path))
+    content_type, encoding = mimetypes.guess_type(str(fullpath))
+    content_type = content_type or "application/octet-stream"
+    try:
+        fullpath.open("rb")
+    except FileNotFoundError:
+        return index(request, "")  # index.html
+    return FileResponse(fullpath.open("rb"), content_type=content_type)
diff --git a/application-templates/django-app/backend/__APP_NAME__/wsgi.py b/application-templates/django-app/backend/ch_django/wsgi.py
similarity index 100%
rename from application-templates/django-app/backend/__APP_NAME__/wsgi.py
rename to application-templates/django-app/backend/ch_django/wsgi.py

From 9127e92d2082b016ab23cfdedf26a0df601a0f47 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 12 Sep 2024 11:53:53 +0100
Subject: [PATCH 172/210] CH-59 Move settings back to __APP_NAME__ directory

---
 .../django-app/backend/{ch_django => __APP_NAME__}/settings.py    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename application-templates/django-app/backend/{ch_django => __APP_NAME__}/settings.py (100%)

diff --git a/application-templates/django-app/backend/ch_django/settings.py b/application-templates/django-app/backend/__APP_NAME__/settings.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/settings.py
rename to application-templates/django-app/backend/__APP_NAME__/settings.py

From 301b8edb2ad46a57f5c739e1b56ca8f60ab16184 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 12 Sep 2024 12:03:39 +0100
Subject: [PATCH 173/210] CH-59 Add initial api migration depending on
 ch_django migration

---
 .../backend/__APP_NAME__/migrations/0001_initial.py    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py

diff --git a/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py b/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
new file mode 100644
index 00000000..34c1f836
--- /dev/null
+++ b/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
@@ -0,0 +1,10 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ch_django", "0001_initial"),
+    ]
+
+    operations = []
\ No newline at end of file

From 15b447080676e295933beadff2c1a73200bfcd0f Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Fri, 13 Sep 2024 14:31:19 +0100
Subject: [PATCH 174/210] CH-59 Update api to __APP_NAME__ in django templates

---
 application-templates/django-app/api/templates/main.jinja2    | 2 +-
 application-templates/django-app/backend/__APP_NAME__/apps.py | 2 +-
 .../django-app/backend/__APP_NAME__/controllers/__init__.py   | 2 +-
 .../django-app/backend/__APP_NAME__/settings.py               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application-templates/django-app/api/templates/main.jinja2 b/application-templates/django-app/api/templates/main.jinja2
index d3177fd7..6d859f73 100644
--- a/application-templates/django-app/api/templates/main.jinja2
+++ b/application-templates/django-app/api/templates/main.jinja2
@@ -20,7 +20,7 @@ apps.populate(settings.INSTALLED_APPS)
 # migrate the Django models
 os.system("python manage.py migrate")
 
-from api.controllers import *
+from __APP_NAME__.controllers import *
 
 app = FastAPI(
     {% if info %}
diff --git a/application-templates/django-app/backend/__APP_NAME__/apps.py b/application-templates/django-app/backend/__APP_NAME__/apps.py
index 66656fd2..456a2f40 100644
--- a/application-templates/django-app/backend/__APP_NAME__/apps.py
+++ b/application-templates/django-app/backend/__APP_NAME__/apps.py
@@ -3,4 +3,4 @@
 
 class ApiConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'api'
+    name = '__APP_NAME__'
diff --git a/application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py b/application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py
index 1344f5cc..71fac320 100644
--- a/application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py
+++ b/application-templates/django-app/backend/__APP_NAME__/controllers/__init__.py
@@ -1 +1 @@
-import api.controllers.test as test_controller
+import __APP_NAME__.controllers.test as test_controller
diff --git a/application-templates/django-app/backend/__APP_NAME__/settings.py b/application-templates/django-app/backend/__APP_NAME__/settings.py
index 9b3c6d22..cebc607c 100644
--- a/application-templates/django-app/backend/__APP_NAME__/settings.py
+++ b/application-templates/django-app/backend/__APP_NAME__/settings.py
@@ -130,8 +130,8 @@
 
 # add the local apps
 INSTALLED_APPS += [
-    "api",
-    "__APP_NAME__"
+    "__APP_NAME__",
+    "ch_django"
 ]
 
 # override django admin base template with a local template

From 21c6167c80cc17c0bc8214da9f108a116ef77598 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 16 Sep 2024 09:57:41 +0100
Subject: [PATCH 175/210] CH-59 Rename ch_django directory to django_baseapp
 directory in the django template

---
 .../django-app/backend/__APP_NAME__/migrations/0001_initial.py  | 2 +-
 .../django-app/backend/__APP_NAME__/settings.py                 | 2 +-
 .../backend/{ch_django => django_baseapp}/__init__.py           | 0
 .../django-app/backend/{ch_django => django_baseapp}/asgi.py    | 0
 .../{ch_django => django_baseapp}/migrations/0001_initial.py    | 0
 .../{ch_django => django_baseapp}/migrations/__init__.py        | 0
 .../django-app/backend/{ch_django => django_baseapp}/models.py  | 0
 .../backend/{ch_django => django_baseapp}/static/www/index.html | 0
 .../templates/__APP_NAME__/index.html                           | 0
 .../templates/__APP_NAME__/swagger-ui.html                      | 0
 .../django-app/backend/{ch_django => django_baseapp}/urls.py    | 0
 .../django-app/backend/{ch_django => django_baseapp}/views.py   | 0
 .../django-app/backend/{ch_django => django_baseapp}/wsgi.py    | 0
 13 files changed, 2 insertions(+), 2 deletions(-)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/__init__.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/asgi.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/migrations/0001_initial.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/migrations/__init__.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/models.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/static/www/index.html (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/templates/__APP_NAME__/index.html (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/templates/__APP_NAME__/swagger-ui.html (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/urls.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/views.py (100%)
 rename application-templates/django-app/backend/{ch_django => django_baseapp}/wsgi.py (100%)

diff --git a/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py b/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
index 34c1f836..e3f84b27 100644
--- a/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
+++ b/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
@@ -4,7 +4,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("ch_django", "0001_initial"),
+        ("django_baseapp", "0001_initial"),
     ]
 
     operations = []
\ No newline at end of file
diff --git a/application-templates/django-app/backend/__APP_NAME__/settings.py b/application-templates/django-app/backend/__APP_NAME__/settings.py
index cebc607c..28077f39 100644
--- a/application-templates/django-app/backend/__APP_NAME__/settings.py
+++ b/application-templates/django-app/backend/__APP_NAME__/settings.py
@@ -131,7 +131,7 @@
 # add the local apps
 INSTALLED_APPS += [
     "__APP_NAME__",
-    "ch_django"
+    "django_baseapp"
 ]
 
 # override django admin base template with a local template
diff --git a/application-templates/django-app/backend/ch_django/__init__.py b/application-templates/django-app/backend/django_baseapp/__init__.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/__init__.py
rename to application-templates/django-app/backend/django_baseapp/__init__.py
diff --git a/application-templates/django-app/backend/ch_django/asgi.py b/application-templates/django-app/backend/django_baseapp/asgi.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/asgi.py
rename to application-templates/django-app/backend/django_baseapp/asgi.py
diff --git a/application-templates/django-app/backend/ch_django/migrations/0001_initial.py b/application-templates/django-app/backend/django_baseapp/migrations/0001_initial.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/migrations/0001_initial.py
rename to application-templates/django-app/backend/django_baseapp/migrations/0001_initial.py
diff --git a/application-templates/django-app/backend/ch_django/migrations/__init__.py b/application-templates/django-app/backend/django_baseapp/migrations/__init__.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/migrations/__init__.py
rename to application-templates/django-app/backend/django_baseapp/migrations/__init__.py
diff --git a/application-templates/django-app/backend/ch_django/models.py b/application-templates/django-app/backend/django_baseapp/models.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/models.py
rename to application-templates/django-app/backend/django_baseapp/models.py
diff --git a/application-templates/django-app/backend/ch_django/static/www/index.html b/application-templates/django-app/backend/django_baseapp/static/www/index.html
similarity index 100%
rename from application-templates/django-app/backend/ch_django/static/www/index.html
rename to application-templates/django-app/backend/django_baseapp/static/www/index.html
diff --git a/application-templates/django-app/backend/ch_django/templates/__APP_NAME__/index.html b/application-templates/django-app/backend/django_baseapp/templates/__APP_NAME__/index.html
similarity index 100%
rename from application-templates/django-app/backend/ch_django/templates/__APP_NAME__/index.html
rename to application-templates/django-app/backend/django_baseapp/templates/__APP_NAME__/index.html
diff --git a/application-templates/django-app/backend/ch_django/templates/__APP_NAME__/swagger-ui.html b/application-templates/django-app/backend/django_baseapp/templates/__APP_NAME__/swagger-ui.html
similarity index 100%
rename from application-templates/django-app/backend/ch_django/templates/__APP_NAME__/swagger-ui.html
rename to application-templates/django-app/backend/django_baseapp/templates/__APP_NAME__/swagger-ui.html
diff --git a/application-templates/django-app/backend/ch_django/urls.py b/application-templates/django-app/backend/django_baseapp/urls.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/urls.py
rename to application-templates/django-app/backend/django_baseapp/urls.py
diff --git a/application-templates/django-app/backend/ch_django/views.py b/application-templates/django-app/backend/django_baseapp/views.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/views.py
rename to application-templates/django-app/backend/django_baseapp/views.py
diff --git a/application-templates/django-app/backend/ch_django/wsgi.py b/application-templates/django-app/backend/django_baseapp/wsgi.py
similarity index 100%
rename from application-templates/django-app/backend/ch_django/wsgi.py
rename to application-templates/django-app/backend/django_baseapp/wsgi.py

From ae198ee6025d00c673250fd7f1efecf754a08a87 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Mon, 16 Sep 2024 16:22:43 +0100
Subject: [PATCH 176/210] CH-59 Fix linting issues

---
 .../django-app/backend/__APP_NAME__/migrations/0001_initial.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py b/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
index e3f84b27..8120bb65 100644
--- a/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
+++ b/application-templates/django-app/backend/__APP_NAME__/migrations/0001_initial.py
@@ -7,4 +7,4 @@ class Migration(migrations.Migration):
         ("django_baseapp", "0001_initial"),
     ]
 
-    operations = []
\ No newline at end of file
+    operations = []

From ff1faf97641052a10a2d1d29bd03478a6c0f7bf6 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 18 Sep 2024 12:58:53 +0200
Subject: [PATCH 177/210] Fix tag generation regression

---
 .../ch_cli_tools/configurationgenerator.py                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
index 56c4f9ac..b8e971f2 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/configurationgenerator.py
@@ -311,10 +311,11 @@ def image_tag(self, image_name, build_context_path=None, dependencies=()):
             ignore = set(DEFAULT_IGNORE)
             if os.path.exists(ignore_path):
                 with open(ignore_path) as f:
-                    ignore = ignore.union({line.strip() for line in f})
+                    ignore = ignore.union({line.strip() for line in f if line.strip() and not line.startswith('#')})
             logging.info(f"Ignoring {ignore}")
             tag = generate_tag_from_content(build_context_path, ignore)
             logging.info(f"Content hash: {tag}")
+            dependencies = dependencies or guess_build_dependencies_from_dockerfile(build_context_path)
             tag = sha1((tag + "".join(self.all_images.get(n, '') for n in dependencies)).encode("utf-8")).hexdigest()
             logging.info(f"Generated tag: {tag}")
             app_name = image_name.split("/")[-1]  # the image name can have a prefix

From 5639c06b0a27e45a96f70b3bd9ef67dbd6943d36 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 18 Sep 2024 13:05:09 +0200
Subject: [PATCH 178/210] Fix regression

---
 tools/deployment-cli-tools/ch_cli_tools/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/utils.py b/tools/deployment-cli-tools/ch_cli_tools/utils.py
index cb167110..7a00626d 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/utils.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/utils.py
@@ -411,7 +411,7 @@ def to_python_module(name):
 @cache
 def guess_build_dependencies_from_dockerfile(filename):
     dependencies = []
-    if not "Dockerfile" in filename:
+    if "Dockerfile" not in str(filename):
         filename = join(filename, "Dockerfile")
     if not os.path.exists(filename):
         return dependencies

From a978cf6451512c671a63a75c1d8bbfcab5c0b61f Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 18 Sep 2024 14:53:19 +0200
Subject: [PATCH 179/210] Fix middleware regression

---
 .../cloudharness-common/cloudharness/middleware/django.py   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/middleware/django.py b/libraries/cloudharness-common/cloudharness/middleware/django.py
index 4a24ac86..e7883751 100644
--- a/libraries/cloudharness-common/cloudharness/middleware/django.py
+++ b/libraries/cloudharness-common/cloudharness/middleware/django.py
@@ -1,18 +1,18 @@
 from cloudharness.middleware import set_authentication_token
-
+from django.http.request import HttpRequest
 
 class CloudharnessMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
         # One-time configuration and initialization.
 
-    def __call__(self, request):
+    def __call__(self, request: HttpRequest):
         # Code to be executed for each request before
         # the view (and later middleware) are called.
 
         # retrieve the bearer token from the header
         # and save it for use in the AuthClient
-        set_authentication_token(request.headers.get('Authorization', '').split(' ')[-1] or request.cookies.get('kc-access', None))
+        set_authentication_token(request.headers.get('Authorization', '').split(' ')[-1] or request.COOKIES.get('kc-access', None))
 
         response = self.get_response(request)
 

From a0982f1fb1ec8dc442e0de1f4e6140fd8fc4ba20 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 18 Sep 2024 15:11:55 +0200
Subject: [PATCH 180/210] test cover dockerignore related issues

---
 .../tests/resources/applications/myapp/.dockerignore       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/tests/resources/applications/myapp/.dockerignore b/tools/deployment-cli-tools/tests/resources/applications/myapp/.dockerignore
index 669be813..e6971fe2 100644
--- a/tools/deployment-cli-tools/tests/resources/applications/myapp/.dockerignore
+++ b/tools/deployment-cli-tools/tests/resources/applications/myapp/.dockerignore
@@ -1 +1,6 @@
-*.ignored
\ No newline at end of file
+*.ignored
+# Comment: this should be ignored by the 
+
+ 
+# The spaces above should be ignored too
+!*.notignored 
\ No newline at end of file

From 542de1c560a103f6eb75c7af22a762bab7e0851d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 04:43:39 +0000
Subject: [PATCH 181/210] Bump rollup from 4.21.2 to 4.22.4 in
 /applications/samples/frontend

Bumps [rollup](https://github.com/rollup/rollup) from 4.21.2 to 4.22.4.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.21.2...v4.22.4)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 applications/samples/frontend/yarn.lock | 196 ++++++++++++------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/applications/samples/frontend/yarn.lock b/applications/samples/frontend/yarn.lock
index 5fe49fa2..d344f751 100644
--- a/applications/samples/frontend/yarn.lock
+++ b/applications/samples/frontend/yarn.lock
@@ -443,85 +443,85 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@rollup/rollup-android-arm-eabi@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz#0412834dc423d1ff7be4cb1fc13a86a0cd262c11"
-  integrity sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==
-
-"@rollup/rollup-android-arm64@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz#baf1a014b13654f3b9e835388df9caf8c35389cb"
-  integrity sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==
-
-"@rollup/rollup-darwin-arm64@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz#0a2c364e775acdf1172fe3327662eec7c46e55b1"
-  integrity sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==
-
-"@rollup/rollup-darwin-x64@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz#a972db75890dfab8df0da228c28993220a468c42"
-  integrity sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz#1609d0630ef61109dd19a278353e5176d92e30a1"
-  integrity sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==
-
-"@rollup/rollup-linux-arm-musleabihf@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz#3c1dca5f160aa2e79e4b20ff6395eab21804f266"
-  integrity sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==
-
-"@rollup/rollup-linux-arm64-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz#c2fe376e8b04eafb52a286668a8df7c761470ac7"
-  integrity sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==
-
-"@rollup/rollup-linux-arm64-musl@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz#e62a4235f01e0f66dbba587c087ca6db8008ec80"
-  integrity sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz#24b3457e75ee9ae5b1c198bd39eea53222a74e54"
-  integrity sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==
-
-"@rollup/rollup-linux-riscv64-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz#38edfba9620fe2ca8116c97e02bd9f2d606bde09"
-  integrity sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==
-
-"@rollup/rollup-linux-s390x-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz#a3bfb8bc5f1e802f8c76cff4a4be2e9f9ac36a18"
-  integrity sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==
-
-"@rollup/rollup-linux-x64-gnu@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz#0dadf34be9199fcdda44b5985a086326344f30ad"
-  integrity sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==
-
-"@rollup/rollup-linux-x64-musl@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz#7b7deddce240400eb87f2406a445061b4fed99a8"
-  integrity sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==
-
-"@rollup/rollup-win32-arm64-msvc@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz#a0ca0c5149c2cfb26fab32e6ba3f16996fbdb504"
-  integrity sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==
-
-"@rollup/rollup-win32-ia32-msvc@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz#aae2886beec3024203dbb5569db3a137bc385f8e"
-  integrity sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==
-
-"@rollup/rollup-win32-x64-msvc@4.21.2":
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz#e4291e3c1bc637083f87936c333cdbcad22af63b"
-  integrity sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==
+"@rollup/rollup-android-arm-eabi@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz#8b613b9725e8f9479d142970b106b6ae878610d5"
+  integrity sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==
+
+"@rollup/rollup-android-arm64@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz#654ca1049189132ff602bfcf8df14c18da1f15fb"
+  integrity sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==
+
+"@rollup/rollup-darwin-arm64@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz#6d241d099d1518ef0c2205d96b3fa52e0fe1954b"
+  integrity sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==
+
+"@rollup/rollup-darwin-x64@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz#42bd19d292a57ee11734c980c4650de26b457791"
+  integrity sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz#f23555ee3d8fe941c5c5fd458cd22b65eb1c2232"
+  integrity sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==
+
+"@rollup/rollup-linux-arm-musleabihf@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz#f3bbd1ae2420f5539d40ac1fde2b38da67779baa"
+  integrity sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==
+
+"@rollup/rollup-linux-arm64-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz#7abe900120113e08a1f90afb84c7c28774054d15"
+  integrity sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==
+
+"@rollup/rollup-linux-arm64-musl@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz#9e655285c8175cd44f57d6a1e8e5dedfbba1d820"
+  integrity sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz#9a79ae6c9e9d8fe83d49e2712ecf4302db5bef5e"
+  integrity sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==
+
+"@rollup/rollup-linux-riscv64-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz#67ac70eca4ace8e2942fabca95164e8874ab8128"
+  integrity sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==
+
+"@rollup/rollup-linux-s390x-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz#9f883a7440f51a22ed7f99e1d070bd84ea5005fc"
+  integrity sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==
+
+"@rollup/rollup-linux-x64-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz#70116ae6c577fe367f58559e2cffb5641a1dd9d0"
+  integrity sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==
+
+"@rollup/rollup-linux-x64-musl@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz#f473f88219feb07b0b98b53a7923be716d1d182f"
+  integrity sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==
+
+"@rollup/rollup-win32-arm64-msvc@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz#4349482d17f5d1c58604d1c8900540d676f420e0"
+  integrity sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==
+
+"@rollup/rollup-win32-ia32-msvc@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz#a6fc39a15db618040ec3c2a24c1e26cb5f4d7422"
+  integrity sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==
+
+"@rollup/rollup-win32-x64-msvc@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz#3dd5d53e900df2a40841882c02e56f866c04d202"
+  integrity sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==
 
 "@types/babel__core@^7.20.5":
   version "7.20.5"
@@ -1391,28 +1391,28 @@ reusify@^1.0.4:
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rollup@^4.20.0:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.2.tgz#f41f277a448d6264e923dd1ea179f0a926aaf9b7"
-  integrity sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.4.tgz#4135a6446671cd2a2453e1ad42a45d5973ec3a0f"
+  integrity sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==
   dependencies:
     "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.21.2"
-    "@rollup/rollup-android-arm64" "4.21.2"
-    "@rollup/rollup-darwin-arm64" "4.21.2"
-    "@rollup/rollup-darwin-x64" "4.21.2"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.21.2"
-    "@rollup/rollup-linux-arm-musleabihf" "4.21.2"
-    "@rollup/rollup-linux-arm64-gnu" "4.21.2"
-    "@rollup/rollup-linux-arm64-musl" "4.21.2"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.21.2"
-    "@rollup/rollup-linux-riscv64-gnu" "4.21.2"
-    "@rollup/rollup-linux-s390x-gnu" "4.21.2"
-    "@rollup/rollup-linux-x64-gnu" "4.21.2"
-    "@rollup/rollup-linux-x64-musl" "4.21.2"
-    "@rollup/rollup-win32-arm64-msvc" "4.21.2"
-    "@rollup/rollup-win32-ia32-msvc" "4.21.2"
-    "@rollup/rollup-win32-x64-msvc" "4.21.2"
+    "@rollup/rollup-android-arm-eabi" "4.22.4"
+    "@rollup/rollup-android-arm64" "4.22.4"
+    "@rollup/rollup-darwin-arm64" "4.22.4"
+    "@rollup/rollup-darwin-x64" "4.22.4"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.22.4"
+    "@rollup/rollup-linux-arm-musleabihf" "4.22.4"
+    "@rollup/rollup-linux-arm64-gnu" "4.22.4"
+    "@rollup/rollup-linux-arm64-musl" "4.22.4"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.22.4"
+    "@rollup/rollup-linux-riscv64-gnu" "4.22.4"
+    "@rollup/rollup-linux-s390x-gnu" "4.22.4"
+    "@rollup/rollup-linux-x64-gnu" "4.22.4"
+    "@rollup/rollup-linux-x64-musl" "4.22.4"
+    "@rollup/rollup-win32-arm64-msvc" "4.22.4"
+    "@rollup/rollup-win32-ia32-msvc" "4.22.4"
+    "@rollup/rollup-win32-x64-msvc" "4.22.4"
     fsevents "~2.3.2"
 
 run-parallel@^1.1.9:

From 6201a14fefebba7aa3766790f747345457943a03 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 24 Sep 2024 10:49:08 +0100
Subject: [PATCH 182/210] CH-59 Move settings back to the django_baseapp in the
 django-app template

---
 .../backend/{__APP_NAME__ => django_baseapp}/settings.py      | 4 ++--
 application-templates/django-app/backend/manage.py            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename application-templates/django-app/backend/{__APP_NAME__ => django_baseapp}/settings.py (98%)

diff --git a/application-templates/django-app/backend/__APP_NAME__/settings.py b/application-templates/django-app/backend/django_baseapp/settings.py
similarity index 98%
rename from application-templates/django-app/backend/__APP_NAME__/settings.py
rename to application-templates/django-app/backend/django_baseapp/settings.py
index 28077f39..78ba0cbc 100644
--- a/application-templates/django-app/backend/__APP_NAME__/settings.py
+++ b/application-templates/django-app/backend/django_baseapp/settings.py
@@ -53,7 +53,7 @@
 ]
 
 
-ROOT_URLCONF = "__APP_NAME__.urls"
+ROOT_URLCONF = "django_baseapp.urls"
 
 TEMPLATES = [
     {
@@ -71,7 +71,7 @@
     },
 ]
 
-WSGI_APPLICATION = "__APP_NAME__.wsgi.application"
+WSGI_APPLICATION = "django_baseapp.wsgi.application"
 
 
 # Password validation
diff --git a/application-templates/django-app/backend/manage.py b/application-templates/django-app/backend/manage.py
index 0412a721..d106b954 100644
--- a/application-templates/django-app/backend/manage.py
+++ b/application-templates/django-app/backend/manage.py
@@ -6,7 +6,7 @@
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "__APP_NAME__.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_baseapp.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

From 21a21ca77ccde903f19e409e7a3919cf710f66dc Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 24 Sep 2024 11:39:35 +0100
Subject: [PATCH 183/210] CH-59 Add back in the removed shutil import

---
 tools/deployment-cli-tools/harness-application | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index 551d0ae1..9b538858 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -3,6 +3,7 @@
 import sys
 import os
 import re
+import shutil
 import tempfile
 import subprocess
 import logging

From 1a604bdb3041b7cfd77c934c2f4bc1bd6b1fb928 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 24 Sep 2024 16:23:46 +0100
Subject: [PATCH 184/210] CH-59 Update django settings location

---
 application-templates/django-app/api/templates/main.jinja2      | 2 +-
 application-templates/django-app/backend/django_baseapp/wsgi.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-templates/django-app/api/templates/main.jinja2 b/application-templates/django-app/api/templates/main.jinja2
index 576f8aee..5c88b48f 100644
--- a/application-templates/django-app/api/templates/main.jinja2
+++ b/application-templates/django-app/api/templates/main.jinja2
@@ -14,7 +14,7 @@ from fastapi.staticfiles import StaticFiles
 
 {{imports | replace(".","openapi.")}}
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "__APP_NAME__.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_baseapp.settings")
 apps.populate(settings.INSTALLED_APPS)
 
 # migrate the Django models
diff --git a/application-templates/django-app/backend/django_baseapp/wsgi.py b/application-templates/django-app/backend/django_baseapp/wsgi.py
index 678932f0..e2bea2b4 100644
--- a/application-templates/django-app/backend/django_baseapp/wsgi.py
+++ b/application-templates/django-app/backend/django_baseapp/wsgi.py
@@ -11,7 +11,7 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "__APP_NAME__.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_baseapp.settings")
 
 application = get_wsgi_application()
 

From fcf609c6887637890449f1b150d53c3a1f138fa3 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Tue, 24 Sep 2024 16:27:13 +0100
Subject: [PATCH 185/210] CH-59 Update views import to import from
 django_baseapp

---
 application-templates/django-app/backend/django_baseapp/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-templates/django-app/backend/django_baseapp/urls.py b/application-templates/django-app/backend/django_baseapp/urls.py
index ce1b9629..ecfee23e 100644
--- a/application-templates/django-app/backend/django_baseapp/urls.py
+++ b/application-templates/django-app/backend/django_baseapp/urls.py
@@ -19,7 +19,7 @@
 from django.contrib import admin
 from django.urls import path, re_path
 
-from __APP_NAME__.views import index
+from django_baseapp.views import index
 
 
 urlpatterns = [path("admin/", admin.site.urls)]

From e76fc023a791f03bb6dda5cbbe4a68f13384917f Mon Sep 17 00:00:00 2001
From: Filippo Ledda <46561561+filippomc@users.noreply.github.com>
Date: Wed, 25 Sep 2024 11:47:04 +0200
Subject: [PATCH 186/210] Neo4j auth enabled by default

---
 deployment-configuration/value-template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment-configuration/value-template.yaml b/deployment-configuration/value-template.yaml
index ff281466..50cc7b11 100644
--- a/deployment-configuration/value-template.yaml
+++ b/deployment-configuration/value-template.yaml
@@ -100,7 +100,7 @@ harness:
         heap:
           initial: 64M
           max: 128M
-      dbms_security_auth_enabled: "false"
+      dbms_security_auth_enabled: "true"
       ports:
         - name: http
           port: 7474

From 37a628e421c35355627ffc3a33bed88ed42216d7 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 12:13:06 +0100
Subject: [PATCH 187/210] CH-149 Refactor harness-application script for better
 maintainability

---
 .../deployment-cli-tools/harness-application  | 166 ++++++++++++------
 tools/deployment-cli-tools/requirements.txt   |   3 +-
 tools/deployment-cli-tools/setup.py           |   4 +-
 3 files changed, 114 insertions(+), 59 deletions(-)

diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index 9b538858..a2ffdcea 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -7,6 +7,7 @@ import shutil
 import tempfile
 import subprocess
 import logging
+import argparse
 
 from ch_cli_tools import CH_ROOT
 from cloudharness_utils.constants import APPLICATION_TEMPLATE_PATH
@@ -14,19 +15,70 @@ from ch_cli_tools.openapi import generate_server, generate_fastapi_server, APPLI
 from ch_cli_tools.utils import merge_configuration_directories, replaceindir, replace_in_file, \
     to_python_module, copymergedir
 
+try:
+    from enum import StrEnum
+except ImportError:
+    from strenum import StrEnum
+
 # Only allow lowercased alphabetical characters separated by "-".
 name_pattern = re.compile("[a-z]+((-)?[a-z])?")
 
 PLACEHOLDER = '__APP_NAME__'
 
-if __name__ == "__main__":
-    import argparse
 
-    parser = argparse.ArgumentParser(
-        description='Creates a new Application.')
+class TemplateType(StrEnum):
+    BASE = 'base'
+    FLASK_SERVER = 'flask-server'
+    WEBAPP = 'webapp'
+    DB_POSTGRES = 'db-postgres'
+    DB_NEO4J = 'db-neo4j'
+    DB_MONGO = 'db-mongo'
+    DJANGO_APP = 'django-app'
+    SERVER = 'server'
+
+
+def main():
+    app_name, templates = get_command_line_arguments()
+
+    app_path = os.path.join(APPLICATIONS_SRC_PATH, app_name)
+    os.makedirs(app_path, exist_ok=True)
+
+    if TemplateType.DJANGO_APP in templates and TemplateType.WEBAPP not in templates:
+        templates = [TemplateType.BASE, TemplateType.WEBAPP] + templates
+
+    if TemplateType.WEBAPP in templates:
+        handle_webapp_template(app_name, app_path)
+
+    if TemplateType.SERVER in templates:
+        handle_server_template(app_path)
+
+    for template_name in templates:
+        merge_template_directories(template_name, app_path)
+
+    if TemplateType.FLASK_SERVER in templates:
+        handle_flask_server_template(app_path)
+
+    replace_in_file(os.path.join(app_path, 'api/config.json'), PLACEHOLDER, to_python_module(app_name))
+
+    if TemplateType.DJANGO_APP in templates:
+        handle_django_app_template(app_name, app_path)
+
+    replaceindir(app_path, PLACEHOLDER, app_name)
+
+    if TemplateType.WEBAPP in templates:
+        handle_webapp_template_cleanup(app_path)
+
+
+def get_command_line_arguments() -> tuple[str, list[str]]:
+    parser = argparse.ArgumentParser(description='Creates a new Application.')
+
     parser.add_argument('name', metavar='name', type=str,
                         help='Application name')
-    parser.add_argument('-t', '--template', dest='templates', action="append", default=['base', ],
+    parser.add_argument('-t', '--template',
+                        dest='templates',
+                        action="append",
+                        default=[TemplateType.BASE],
+                        type=str,
                         help="""Add a template name.
 
                         Available templates:
@@ -55,58 +107,60 @@ if __name__ == "__main__":
         print("Invalid regex")
         exit(1)
 
-    app_path = os.path.join(APPLICATIONS_SRC_PATH, args.name)
-    os.makedirs(app_path, exist_ok=True)
-    templates = args.templates
-
-    if "django-app" in args.templates and "webapp" not in templates:
-        templates = ["base", "webapp"] + templates
-
-    if 'webapp' in templates:
-        if os.path.exists(os.path.join(app_path, 'frontend')):
-            shutil.rmtree(os.path.join(app_path, 'frontend'))
-        cmd = ["yarn", "create", "vite", args.name, "--template", "react-ts"]
-        logging.info(f"Running command: {' '.join(cmd)}")
-        subprocess.run(cmd, cwd=app_path)
-        shutil.move(os.path.join(app_path, args.name), os.path.join(app_path, 'frontend'))
-        generate_ts_client(openapi_file=os.path.join(app_path, 'api/openapi.yaml'))
-
-    if 'server' in templates:
-        with tempfile.TemporaryDirectory() as tmp_dirname:
-            copymergedir(os.path.join(CH_ROOT, APPLICATION_TEMPLATE_PATH, template_name), tmp_dirname)
-            merge_configuration_directories(app_path, tmp_dirname)
-            generate_server(app_path, tmp_dirname)
+    return args.name, args.templates
 
-    for template_name in templates:
-        for base_path in (CH_ROOT, os.getcwd()):
-            template_path = os.path.join(base_path, APPLICATION_TEMPLATE_PATH, template_name)
-            if os.path.exists(template_path):
-                merge_configuration_directories(template_path, app_path)
 
-    if "flask-server" in templates:
+def handle_webapp_template(app_name: str, app_path: str) -> None:
+    if os.path.exists(os.path.join(app_path, 'frontend')):
+        shutil.rmtree(os.path.join(app_path, 'frontend'))
+    cmd = ["yarn", "create", "vite", app_name, "--template", "react-ts"]
+    logging.info(f"Running command: {' '.join(cmd)}")
+    subprocess.run(cmd, cwd=app_path)
+    shutil.move(os.path.join(app_path, app_name), os.path.join(app_path, 'frontend'))
+    generate_ts_client(openapi_file=os.path.join(app_path, 'api/openapi.yaml'))
+
+
+def handle_webapp_template_cleanup(app_path: str) -> None:
+    try:
+        os.remove(os.path.join(app_path, 'backend', 'Dockerfile'))
+    except FileNotFoundError:
+        # backend dockerfile not found, continue
+        pass
+
+
+def handle_server_template(app_path: str) -> None:
+    with tempfile.TemporaryDirectory() as tmp_dirname:
+        copymergedir(os.path.join(CH_ROOT, APPLICATION_TEMPLATE_PATH, TemplateType.SERVER), tmp_dirname)
+        merge_configuration_directories(app_path, tmp_dirname)
+        generate_server(app_path, tmp_dirname)
+
+
+def handle_flask_server_template(app_path: str) -> None:
         generate_server(app_path)
 
-    replace_in_file(os.path.join(app_path, 'api/config.json'), PLACEHOLDER, to_python_module(args.name))
-
-    if "django-app" in templates:
-        replace_in_file(os.path.join(app_path, 'api/templates/main.jinja2'), PLACEHOLDER, to_python_module(args.name))
-        generate_fastapi_server(app_path)
-        replace_in_file(
-            os.path.join(app_path, 'deploy/values.yaml'),
-            f"{PLACEHOLDER}:{PLACEHOLDER}",
-            f"{to_python_module(args.name)}:{to_python_module(args.name)}"
-        )
-        try:
-            os.remove(os.path.join(app_path, 'backend', "__APP_NAME__", "__main__.py"))
-        except FileNotFoundError:
-            # backend dockerfile not found, continue
-            pass
-
-    replaceindir(app_path, PLACEHOLDER, args.name)
-
-    if 'webapp' in templates:
-        try:
-            os.remove(os.path.join(app_path, 'backend', 'Dockerfile'))
-        except FileNotFoundError:
-            # backend dockerfile not found, continue
-            pass
+
+def handle_django_app_template(app_name: str, app_path: str) -> None:
+    replace_in_file(os.path.join(app_path, 'api/templates/main.jinja2'), PLACEHOLDER, to_python_module(app_name))
+    generate_fastapi_server(app_path)
+    replace_in_file(
+        os.path.join(app_path, 'deploy/values.yaml'),
+        f"{PLACEHOLDER}:{PLACEHOLDER}",
+        f"{to_python_module(app_name)}:{to_python_module(app_name)}"
+    )
+    replace_in_file(os.path.join(app_path, "dev-setup.sh"), PLACEHOLDER, app_name)
+    try:
+        os.remove(os.path.join(app_path, 'backend', "__APP_NAME__", "__main__.py"))
+    except FileNotFoundError:
+        # backend dockerfile not found, continue
+        pass
+
+
+def merge_template_directories(template_name: str, app_path: str) -> None:
+    for base_path in (CH_ROOT, os.getcwd()):
+        template_path = os.path.join(base_path, APPLICATION_TEMPLATE_PATH, template_name)
+        if os.path.exists(template_path):
+            merge_configuration_directories(template_path, app_path)
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/requirements.txt b/tools/deployment-cli-tools/requirements.txt
index 622565b9..266ae27f 100644
--- a/tools/deployment-cli-tools/requirements.txt
+++ b/tools/deployment-cli-tools/requirements.txt
@@ -4,4 +4,5 @@ ruamel.yaml
 oyaml
 cloudharness_model
 cloudharness_utils
-dirhash
\ No newline at end of file
+dirhash
+StrEnum ; python_version < '3.11'
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/setup.py b/tools/deployment-cli-tools/setup.py
index b01b2ae2..280cd716 100644
--- a/tools/deployment-cli-tools/setup.py
+++ b/tools/deployment-cli-tools/setup.py
@@ -28,10 +28,10 @@
     'cloudharness_model',
     'cloudharness_utils',
     'fastapi-code-generator',
-    'dirhash'
+    'dirhash',
+    "StrEnum ; python_version < '3.11'",
 ]
 
-
 setup(
     name=NAME,
     version=VERSION,

From c8ce9709d46116e6757922cb9db539b6a96761a8 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 12:13:43 +0100
Subject: [PATCH 188/210] CH-149 Add dev setup script for django applications

---
 application-templates/django-app/dev-setup.sh | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 application-templates/django-app/dev-setup.sh

diff --git a/application-templates/django-app/dev-setup.sh b/application-templates/django-app/dev-setup.sh
new file mode 100644
index 00000000..7bdd8250
--- /dev/null
+++ b/application-templates/django-app/dev-setup.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+CURRENT_PATH=$(pwd)
+CH_DIRECTORY="../../cloud-harness"
+INSTALL_PYTEST=false
+CURRENT_DIRECTORY="$(pwd)"
+APP_NAME="__APP_NAME__"
+
+pip_upgrade_error() {
+    echo "Unable to upgrade pip"
+    exit 1
+}
+
+install_error () {
+    echo "Unable to install $1" 1>&2
+    exit 1
+}
+
+while getopts ch_directory:pytest arg;
+do
+    case "$arg" in
+        ch_directory) CH_DIRECTORY=${OPTARG};;
+        pytest) INSTALL_PYTEST=true;;
+    esac
+done
+
+pip install --upgrade pip || pip_upgrade_error
+
+# Install pip dependencies from cloudharness-base-debian image
+
+if $INSTALL_PYTEST; then
+    pip install pytest || install_error pytest
+fi
+
+pip install -r "$CH_DIRECTORY/libraries/models/requirements.txt" || install_error "models requirements"
+pip install -r "$CH_DIRECTORY/libraries/cloudharness-common/requirements.txt" || install_error "cloudharness-common requirements"
+pip install -r "$CH_DIRECTORY/libraries/client/cloudharness_cli/requirements.txt" || install_error "cloudharness_cli requirements"
+
+pip install -e "$CH_DIRECTORY/libraries/models" || install_error models
+pip install -e "$CH_DIRECTORY/libraries/cloudharness-common" || install_error cloudharness-common
+pip install -e "$CH_DIRECTORY/libraries/client/cloudharness_cli" || install_error cloudharness_cli
+
+# Install pip dependencies from cloudharness-django image
+
+pip install -r "$CH_DIRECTORY/infrastructure/common-images/cloudharness-django/libraries/fastapi/requirements.txt" || install_error "cloudharness-django fastapi requirements"
+pip install -e "$CH_DIRECTORY/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django" || install_error cloudharness-django
+
+# Install application
+
+pip install -r "$CURRENT_DIRECTORY/backend/requirements.txt" || install_error "$APP_NAME dependencies"
+pip install -e "$CURRENT_DIRECTORY/backend" || install_error "$APP_NAME"
\ No newline at end of file

From 63a4e1862533bdc39bcd6cbbed6c164e9083d067 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 12:14:42 +0100
Subject: [PATCH 189/210] CH-149 Change cloudharness-django depdencies from
 fixed versions to min versions

---
 .../libraries/cloudharness-django/setup.cfg                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/setup.cfg b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/setup.cfg
index d298dece..5ca2ead8 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/setup.cfg
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/setup.cfg
@@ -31,6 +31,6 @@ python_requires = >=3.6
 install_requires =
     Django>=4.0.7
     django-admin-extra-buttons>=1.4.2
-    psycopg2-binary==2.9.3
-    Pillow==9.2.0
+    psycopg2-binary>=2.9.3
+    Pillow>=9.2.0
     python-keycloak

From 795b7d4e56d359a48346bd657c6ec41b8fd6cefa Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 15:15:48 +0100
Subject: [PATCH 190/210] CH-149 Add debug configuration to vscode launch
 settings when creating a django app

---
 .../vscode-django-app-debug-template.json     | 24 +++++++++++++++++
 .../ch_cli_tools/utils.py                     | 17 ++++++++++++
 .../deployment-cli-tools/harness-application  | 26 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 deployment-configuration/vscode-django-app-debug-template.json

diff --git a/deployment-configuration/vscode-django-app-debug-template.json b/deployment-configuration/vscode-django-app-debug-template.json
new file mode 100644
index 00000000..f049d5e5
--- /dev/null
+++ b/deployment-configuration/vscode-django-app-debug-template.json
@@ -0,0 +1,24 @@
+{
+    "args": [
+      "--host",
+      "0.0.0.0",
+      "--port",
+      "8000",
+      "main:app"
+    ],
+    "console": "integratedTerminal",
+    "cwd": "${workspaceFolder}/applications/__APP_NAME__/backend",
+    "env": {
+      "ACCOUNTS_ADMIN_PASSWORD": "metacell",
+      "ACCOUNTS_ADMIN_USERNAME": "admin",
+      "CH_CURRENT_APP_NAME": "__APP_NAME__",
+      "CH_VALUES_PATH": "${workspaceFolder}/deployment/helm/values.yaml",
+      "DJANGO_SETTINGS_MODULE": "django_baseapp.settings",
+      "KUBERNETES_SERVICE_HOST": "ssdds"
+    },
+    "justMyCode": false,
+    "module": "uvicorn",
+    "name": "__APP_NAME__ backend",
+    "request": "launch",
+    "type": "debugpy"
+  }
\ No newline at end of file
diff --git a/tools/deployment-cli-tools/ch_cli_tools/utils.py b/tools/deployment-cli-tools/ch_cli_tools/utils.py
index 7a00626d..17e5c154 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/utils.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/utils.py
@@ -2,6 +2,7 @@
 import socket
 import glob
 import subprocess
+from typing import Any
 import requests
 import os
 from functools import cache
@@ -188,6 +189,22 @@ def replace_in_file(src_file, source, replace):
             pass
 
 
+def replace_in_dict(src_dict: dict, source: str, replacement: str) -> dict:
+    def replace_value(value: Any) -> Any:
+        if isinstance(value, str):
+            return value.replace(source, replacement)
+        if isinstance(value, list):
+            return [replace_value(item) for item in value]
+        if isinstance(value, dict):
+            return replace_in_dict(value, source, replacement)
+        return value
+    
+    return {
+        key: replace_value(value)
+        for key, value in src_dict.items()
+    }
+
+
 def copymergedir(root_src_dir, root_dst_dir):
     """
     Does copy and merge (shutil.copytree requires that the destination does not exist)
diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index a2ffdcea..36b3e040 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+import json
+import pathlib
 import sys
 import os
 import re
@@ -13,7 +15,7 @@ from ch_cli_tools import CH_ROOT
 from cloudharness_utils.constants import APPLICATION_TEMPLATE_PATH
 from ch_cli_tools.openapi import generate_server, generate_fastapi_server, APPLICATIONS_SRC_PATH, generate_ts_client
 from ch_cli_tools.utils import merge_configuration_directories, replaceindir, replace_in_file, \
-    to_python_module, copymergedir
+    to_python_module, copymergedir, get_json_template, replace_in_dict
 
 try:
     from enum import StrEnum
@@ -148,6 +150,7 @@ def handle_django_app_template(app_name: str, app_path: str) -> None:
         f"{to_python_module(app_name)}:{to_python_module(app_name)}"
     )
     replace_in_file(os.path.join(app_path, "dev-setup.sh"), PLACEHOLDER, app_name)
+    create_django_app_vscode_debug_configuration(app_name)
     try:
         os.remove(os.path.join(app_path, 'backend', "__APP_NAME__", "__main__.py"))
     except FileNotFoundError:
@@ -155,6 +158,27 @@ def handle_django_app_template(app_name: str, app_path: str) -> None:
         pass
 
 
+def create_django_app_vscode_debug_configuration(app_name: str):
+    vscode_launch_path = pathlib.Path('.vscode/launch.json')
+    configuration_name = f'{app_name} backend'
+
+    launch_config = get_json_template(vscode_launch_path, True)
+
+    launch_config['configurations'] = [
+        configuration for configuration in launch_config['configurations']
+        if configuration['name'] != configuration_name
+    ]
+
+    debug_config = get_json_template('vscode-django-app-debug-template.json', True)
+    debug_config = replace_in_dict(debug_config, PLACEHOLDER, app_name)
+
+    launch_config['configurations'].append(debug_config)
+
+    vscode_launch_path.parent.mkdir(parents=True, exist_ok=True)
+    with vscode_launch_path.open('w') as f:
+        json.dump(launch_config, f, indent=2, sort_keys=True)
+    
+
 def merge_template_directories(template_name: str, app_path: str) -> None:
     for base_path in (CH_ROOT, os.getcwd()):
         template_path = os.path.join(base_path, APPLICATION_TEMPLATE_PATH, template_name)

From d4937fbaa7652b16223aa6eb5c8b754a178a47e9 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 16:59:04 +0100
Subject: [PATCH 191/210] CH-67 Make events listener initialization an explicit
 action instead of implicit on import

---
 .../django-app/backend/django_baseapp/asgi.py             | 4 +++-
 .../django-app/backend/django_baseapp/wsgi.py             | 4 +++-
 .../cloudharness-django/cloudharness_django/README.md     | 4 +++-
 .../cloudharness_django/services/events.py                | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/application-templates/django-app/backend/django_baseapp/asgi.py b/application-templates/django-app/backend/django_baseapp/asgi.py
index 6d1bf4d9..049df40e 100644
--- a/application-templates/django-app/backend/django_baseapp/asgi.py
+++ b/application-templates/django-app/backend/django_baseapp/asgi.py
@@ -21,4 +21,6 @@
 init_services()
 
 # start the kafka event listener
-import cloudharness_django.services.events  # noqa E402
+from cloudharness_django.services.events import init_listner  # noqa E402
+
+init_listner()
diff --git a/application-templates/django-app/backend/django_baseapp/wsgi.py b/application-templates/django-app/backend/django_baseapp/wsgi.py
index e2bea2b4..e2d6fc09 100644
--- a/application-templates/django-app/backend/django_baseapp/wsgi.py
+++ b/application-templates/django-app/backend/django_baseapp/wsgi.py
@@ -21,4 +21,6 @@
 init_services()
 
 # start the kafka event listener
-import cloudharness_django.services.events  # noqa E402
+from cloudharness_django.services.events import init_listner  # noqa E402
+
+init_listner()
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/README.md b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/README.md
index e6d7074b..9e4eda59 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/README.md
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/README.md
@@ -46,7 +46,9 @@ Quick start
     init_services()
 
     # start the kafka event listener
-    import cloudharness_django.services.events
+    from cloudharness_django.services.events import init_listner  # noqa E402
+
+    init_listner()
     ```
 
 4. Start the development server and visit http://127.0.0.1:8000/
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
index 55909afe..1cbd1e93 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
@@ -79,8 +79,8 @@ def setup_event_service(self):
             pass
 
 
-# start services
-if not hasattr(settings, "PROJECT_NAME"):
-    raise KeycloakOIDCNoProjectError("Project name not found, please set PROJECT_NAME in your settings module")
+def init_listener():
+    if not hasattr(settings, "PROJECT_NAME"):
+        raise KeycloakOIDCNoProjectError("Project name not found, please set PROJECT_NAME in your settings module")
 
-KeycloakMessageService(settings.PROJECT_NAME).setup_event_service()
+    KeycloakMessageService(settings.PROJECT_NAME).setup_event_service()
\ No newline at end of file

From 2f7b47423be86816f1cde5d3a17a703163efd283 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 17:18:12 +0100
Subject: [PATCH 192/210] CH-67 Change listener initialization to use a
 singleton and the setup_event_service call idempotent

---
 .../cloudharness_django/services/events.py         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
index 1cbd1e93..c199616a 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
@@ -15,6 +15,7 @@ class KeycloakMessageService:
     def __init__(self, kafka_group_id):
         self._topic = "keycloak.fct.admin"
         self.kafka_group_id = kafka_group_id
+        self.topics_initialized = False
 
     @staticmethod
     def event_handler(app, event_client, message):
@@ -50,6 +51,9 @@ def event_handler(app, event_client, message):
                 raise e
 
     def init_topics(self):
+        if self.topics_initialized:
+            return
+
         log.info("Starting Kafka consumer threads")
         try:
             event_client = EventClient(self._topic)
@@ -59,6 +63,7 @@ def init_topics(self):
             except TopicAlreadyExistsError as e:
                 pass
             event_client.async_consume(app={}, group_id=self.kafka_group_id, handler=KeycloakMessageService.event_handler)
+            self.topics_initialized = True
         except Exception as e:
             log.error(f"Error creating topic {self._topic}", exc_info=e)
 
@@ -79,8 +84,15 @@ def setup_event_service(self):
             pass
 
 
+_message_service_singleton = None
+
+
 def init_listener():
     if not hasattr(settings, "PROJECT_NAME"):
         raise KeycloakOIDCNoProjectError("Project name not found, please set PROJECT_NAME in your settings module")
 
-    KeycloakMessageService(settings.PROJECT_NAME).setup_event_service()
\ No newline at end of file
+    global _message_service_singleton
+    if _message_service_singleton is None:
+        _message_service_singleton = KeycloakMessageService(settings.PROJECT_NAME).setup_event_service()
+
+    _message_service_singleton.setup_event_service()

From 2a1824ab6cc02e9c22b7b10d7511ba349e2158f1 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Thu, 26 Sep 2024 17:18:53 +0100
Subject: [PATCH 193/210] CH-67 Add background initialization for auth and
 events to main.py template

---
 .../django-app/api/templates/main.jinja2      |  8 +++---
 .../cloudharness_django/services/__init__.py  | 25 +++++++++++++++++++
 .../cloudharness_django/services/events.py    | 20 +++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/application-templates/django-app/api/templates/main.jinja2 b/application-templates/django-app/api/templates/main.jinja2
index 5c88b48f..2afff27a 100644
--- a/application-templates/django-app/api/templates/main.jinja2
+++ b/application-templates/django-app/api/templates/main.jinja2
@@ -66,10 +66,12 @@ async def add_process_time_header(request: Request, call_next):
 
 if os.environ.get('KUBERNETES_SERVICE_HOST', None):
     # init the auth service when running in/for k8s
-    from cloudharness_django.services import init_services, get_auth_service
-    init_services()
+    from cloudharness_django.services import init_services_in_background, get_auth_service
+    init_services_in_background()
+
     # start the kafka event listener when running in/for k8s
-    import cloudharness_django.services.events
+    from cloudharness_django.services.events import init_listener_in_background
+    init_listener_in_background()
 
 async def has_access():
     """
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py
index 4efca516..330a760e 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/__init__.py
@@ -43,3 +43,28 @@ def init_services(
         admin_role=admin_role)
     _user_service = UserService(_auth_service)
     return _auth_service
+
+
+def init_services_in_background(
+        client_name: str = settings.KC_CLIENT_NAME,
+        client_roles: List[str] = settings.KC_ALL_ROLES,
+        privileged_roles: List[str] = settings.KC_PRIVILEGED_ROLES,
+        admin_role: str = settings.KC_ADMIN_ROLE,
+        default_user_role: str = settings.KC_DEFAULT_USER_ROLE
+):
+    import threading
+    import time
+    from cloudharness import log
+
+    def background_operation():
+        services_initialized = False
+
+        while not services_initialized:
+            try:
+                init_services(client_name, client_roles, privileged_roles, admin_role, default_user_role)
+                services_initialized = True
+            except:
+                log.exception("Error initializing services. Retrying in 5 seconds...")
+                time.sleep(5)
+
+    threading.Thread(target=background_operation).start()
diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
index c199616a..62d9c7f7 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
@@ -96,3 +96,23 @@ def init_listener():
         _message_service_singleton = KeycloakMessageService(settings.PROJECT_NAME).setup_event_service()
 
     _message_service_singleton.setup_event_service()
+
+
+def init_listener_in_background():
+    import threading
+    import time
+    from cloudharness import log
+
+    def background_operation():
+        listener_initialized = False
+
+        while not listener_initialized:
+            try:
+                init_listener()
+                log.info('User sync events listener started')
+                listener_initialized = True
+            except:
+                log.exception('Error initializing event queue. Retrying in 5 seconds...')
+                time.sleep(5)
+
+    threading.Thread(target=background_operation).start()

From b2918426291f38913c384ccbb389f69c05f0a8a4 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Fri, 27 Sep 2024 10:50:55 +0100
Subject: [PATCH 194/210] CH-149 Update command in generate_fastapi_server

---
 tools/deployment-cli-tools/ch_cli_tools/openapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/openapi.py b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
index e6f23223..4df7b883 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/openapi.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/openapi.py
@@ -33,7 +33,7 @@ def generate_server(app_path, overrides_folder=""):
 
 
 def generate_fastapi_server(app_path):
-    command = f"cd {app_path}/api && bash -c ./genapi.sh"
+    command = f"cd {app_path}/api && bash genapi.sh"
     os.system(command)
 
 

From 0dfd8c86b845091a9b53e47818c8b65d5d39464b Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Fri, 27 Sep 2024 11:24:45 +0100
Subject: [PATCH 195/210] CH-149 Add unit tests for the added utility

---
 .../deployment-cli-tools/tests/test_utils.py  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/tools/deployment-cli-tools/tests/test_utils.py b/tools/deployment-cli-tools/tests/test_utils.py
index 78e84333..0ce932fe 100644
--- a/tools/deployment-cli-tools/tests/test_utils.py
+++ b/tools/deployment-cli-tools/tests/test_utils.py
@@ -87,3 +87,65 @@ def test_find_dockerfile_paths():
     assert len(dockerfiles) == 2
     assert next(d for d in dockerfiles if d.endswith("myapp")), "Must find the Dockerfile in the root directory"
     assert next(d for d in dockerfiles if d.endswith("myapp/tasks/mytask")), "Must find the Dockerfile in the tasks directory"
+
+
+class TestReplaceInDict:
+    def test_does_not_replace_in_keys(_):
+        src_dict = {
+            'foo': 1,
+            'bar': 2,
+            'baz': 3,
+            'foobar': 4,
+        }
+
+        new_dict = replace_in_dict(src_dict, 'foo', 'xxx')
+
+        assert new_dict.keys() == src_dict.keys()
+    
+    def test_replaces_in_values(_):
+        src_dict = {
+            'a': 'foo',
+            'b': 'bar',
+            'c': 'baz',
+            'd': 3,
+            'e': 'foobar',
+        }
+
+        new_dict = replace_in_dict(src_dict, 'foo', 'xxx')
+
+        assert new_dict == {
+            'a': 'xxx',
+            'b': 'bar',
+            'c': 'baz',
+            'd': 3,
+            'e': 'xxxbar',
+        }
+
+    def test_replaces_in_values_within_lists(_):
+        src_dict = {
+            'a': ['foo', 'bar', 'baz', 3, 'foobar'],
+        }
+
+        new_dict = replace_in_dict(src_dict, 'foo', 'xxx')
+
+        assert new_dict['a'] == ['xxx', 'bar', 'baz', 3, 'xxxbar']
+
+    
+    def test_replaces_in_values_within_nested_dict(_):
+        src_dict = {
+            'a': {
+                'a': 'foo',
+                'b': 'bar',
+                'c': 'foobar',
+                'e': ['foo', 'bar', 'foobar'],
+            },
+        }
+
+        new_dict = replace_in_dict(src_dict, 'foo', 'xxx')
+
+        assert new_dict['a'] == {
+            'a': 'xxx',
+            'b': 'bar',
+            'c': 'xxxbar',
+            'e': ['xxx', 'bar', 'xxxbar']
+        }
\ No newline at end of file

From 09d984259da2aef8ad1a1dde372ab3a49e2f0101 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Fri, 27 Sep 2024 11:30:55 +0100
Subject: [PATCH 196/210] CH-59 Fix linting errors

---
 .../cloudharness-common/cloudharness/middleware/django.py   | 1 +
 tools/deployment-cli-tools/ch_cli_tools/utils.py            | 2 +-
 tools/deployment-cli-tools/harness-application              | 6 +++---
 tools/deployment-cli-tools/tests/test_utils.py              | 5 ++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/middleware/django.py b/libraries/cloudharness-common/cloudharness/middleware/django.py
index e7883751..f3f6ee76 100644
--- a/libraries/cloudharness-common/cloudharness/middleware/django.py
+++ b/libraries/cloudharness-common/cloudharness/middleware/django.py
@@ -1,6 +1,7 @@
 from cloudharness.middleware import set_authentication_token
 from django.http.request import HttpRequest
 
+
 class CloudharnessMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
diff --git a/tools/deployment-cli-tools/ch_cli_tools/utils.py b/tools/deployment-cli-tools/ch_cli_tools/utils.py
index 17e5c154..85fcb5bb 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/utils.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/utils.py
@@ -198,7 +198,7 @@ def replace_value(value: Any) -> Any:
         if isinstance(value, dict):
             return replace_in_dict(value, source, replacement)
         return value
-    
+
     return {
         key: replace_value(value)
         for key, value in src_dict.items()
diff --git a/tools/deployment-cli-tools/harness-application b/tools/deployment-cli-tools/harness-application
index 36b3e040..d3601f7a 100644
--- a/tools/deployment-cli-tools/harness-application
+++ b/tools/deployment-cli-tools/harness-application
@@ -138,7 +138,7 @@ def handle_server_template(app_path: str) -> None:
 
 
 def handle_flask_server_template(app_path: str) -> None:
-        generate_server(app_path)
+    generate_server(app_path)
 
 
 def handle_django_app_template(app_name: str, app_path: str) -> None:
@@ -177,7 +177,7 @@ def create_django_app_vscode_debug_configuration(app_name: str):
     vscode_launch_path.parent.mkdir(parents=True, exist_ok=True)
     with vscode_launch_path.open('w') as f:
         json.dump(launch_config, f, indent=2, sort_keys=True)
-    
+
 
 def merge_template_directories(template_name: str, app_path: str) -> None:
     for base_path in (CH_ROOT, os.getcwd()):
@@ -187,4 +187,4 @@ def merge_template_directories(template_name: str, app_path: str) -> None:
 
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tools/deployment-cli-tools/tests/test_utils.py b/tools/deployment-cli-tools/tests/test_utils.py
index 0ce932fe..0c4060f3 100644
--- a/tools/deployment-cli-tools/tests/test_utils.py
+++ b/tools/deployment-cli-tools/tests/test_utils.py
@@ -101,7 +101,7 @@ def test_does_not_replace_in_keys(_):
         new_dict = replace_in_dict(src_dict, 'foo', 'xxx')
 
         assert new_dict.keys() == src_dict.keys()
-    
+
     def test_replaces_in_values(_):
         src_dict = {
             'a': 'foo',
@@ -130,7 +130,6 @@ def test_replaces_in_values_within_lists(_):
 
         assert new_dict['a'] == ['xxx', 'bar', 'baz', 3, 'xxxbar']
 
-    
     def test_replaces_in_values_within_nested_dict(_):
         src_dict = {
             'a': {
@@ -148,4 +147,4 @@ def test_replaces_in_values_within_nested_dict(_):
             'b': 'bar',
             'c': 'xxxbar',
             'e': ['xxx', 'bar', 'xxxbar']
-        }
\ No newline at end of file
+        }

From e11608f2d1c1fc3a2d27715d635a8afc39313470 Mon Sep 17 00:00:00 2001
From: Jake Conkerton-Darby <jake@metacell.us>
Date: Fri, 27 Sep 2024 13:35:41 +0100
Subject: [PATCH 197/210] CH-67 Fix incorrect assignment of singleton

---
 .../cloudharness-django/cloudharness_django/services/events.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
index 62d9c7f7..170b41ac 100644
--- a/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
+++ b/infrastructure/common-images/cloudharness-django/libraries/cloudharness-django/cloudharness_django/services/events.py
@@ -93,7 +93,7 @@ def init_listener():
 
     global _message_service_singleton
     if _message_service_singleton is None:
-        _message_service_singleton = KeycloakMessageService(settings.PROJECT_NAME).setup_event_service()
+        _message_service_singleton = KeycloakMessageService(settings.PROJECT_NAME)
 
     _message_service_singleton.setup_event_service()
 

From d1cc0b75b6005f09107f5839d553d79e810e1a5a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 1 Oct 2024 14:28:27 +0200
Subject: [PATCH 198/210] chore: delete unused file

---
 test/test-e2e/package-lock.json | 8841 -------------------------------
 1 file changed, 8841 deletions(-)
 delete mode 100644 test/test-e2e/package-lock.json

diff --git a/test/test-e2e/package-lock.json b/test/test-e2e/package-lock.json
deleted file mode 100644
index 8ef84f0f..00000000
--- a/test/test-e2e/package-lock.json
+++ /dev/null
@@ -1,8841 +0,0 @@
-{
-  "name": "cloudharness-e2e-test",
-  "version": "1.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "cloudharness-e2e-test",
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "jest": "^28.1.0",
-        "puppeteer": "22.14.0",
-        "ts-jest": "^28.0.2",
-        "typescript": "^4.6.4"
-      },
-      "devDependencies": {
-        "@types/jest": "26.0.24",
-        "@types/node": "13.13.52",
-        "@types/puppeteer": "3.0.8",
-        "husky": "6.0.0",
-        "lint-staged": "10.5.4",
-        "prettier": "2.6.2",
-        "tslint": "6.1.3",
-        "tslint-config-prettier": "1.18.0",
-        "tslint-plugin-prettier": "2.3.0"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-      "dependencies": {
-        "@babel/highlight": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
-      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz",
-      "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-module-transforms": "^7.20.2",
-        "@babel/helpers": "^7.20.5",
-        "@babel/parser": "^7.20.5",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz",
-      "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==",
-      "dependencies": {
-        "@babel/types": "^7.20.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-      "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz",
-      "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "dependencies": {
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz",
-      "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==",
-      "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz",
-      "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz",
-      "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.5",
-        "@babel/types": "^7.20.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz",
-      "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
-      "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz",
-      "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==",
-      "dependencies": {
-        "@jest/console": "^28.1.3",
-        "@jest/reporters": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^28.1.3",
-        "jest-config": "^28.1.3",
-        "jest-haste-map": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.3",
-        "jest-resolve-dependencies": "^28.1.3",
-        "jest-runner": "^28.1.3",
-        "jest-runtime": "^28.1.3",
-        "jest-snapshot": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "jest-watcher": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.3",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/@jest/environment": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz",
-      "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==",
-      "dependencies": {
-        "@jest/fake-timers": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "jest-mock": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/expect": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz",
-      "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==",
-      "dependencies": {
-        "expect": "^28.1.3",
-        "jest-snapshot": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz",
-      "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==",
-      "dependencies": {
-        "jest-get-type": "^28.0.2"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz",
-      "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@sinonjs/fake-timers": "^9.1.2",
-        "@types/node": "*",
-        "jest-message-util": "^28.1.3",
-        "jest-mock": "^28.1.3",
-        "jest-util": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz",
-      "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==",
-      "dependencies": {
-        "@jest/environment": "^28.1.3",
-        "@jest/expect": "^28.1.3",
-        "@jest/types": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz",
-      "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==",
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@jridgewell/trace-mapping": "^0.3.13",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-worker": "^28.1.3",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^9.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
-      "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
-      "dependencies": {
-        "@sinclair/typebox": "^0.24.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "28.1.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz",
-      "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.13",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
-      "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
-      "dependencies": {
-        "@jest/console": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz",
-      "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==",
-      "dependencies": {
-        "@jest/test-result": "^28.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz",
-      "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^28.1.3",
-        "@jridgewell/trace-mapping": "^0.3.13",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
-      "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "node_modules/@puppeteer/browsers": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
-      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
-      "dependencies": {
-        "debug": "^4.3.5",
-        "extract-zip": "^2.0.1",
-        "progress": "^2.0.3",
-        "proxy-agent": "^6.4.0",
-        "semver": "^7.6.3",
-        "tar-fs": "^3.0.6",
-        "unbzip2-stream": "^1.4.3",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "browsers": "lib/cjs/main-cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@puppeteer/browsers/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.24.51",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
-      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "node_modules/@tootallnate/quickjs-emscripten": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
-      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.20",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz",
-      "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
-      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest": {
-      "version": "26.0.24",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
-      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
-      "dev": true,
-      "dependencies": {
-        "jest-diff": "^26.0.0",
-        "pretty-format": "^26.0.0"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "13.13.52",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz",
-      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="
-    },
-    "node_modules/@types/puppeteer": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-3.0.8.tgz",
-      "integrity": "sha512-YmaPF3KLyDNJfTMlbONOWsAfUh9j0up8xA1G/uyz4c8yD80C2VUM5OTjf+sAS89EN6A6gas0oEzJThICf4OUpw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-    },
-    "node_modules/@types/yargs": {
-      "version": "17.0.17",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz",
-      "integrity": "sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/ast-types": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
-      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-      "dependencies": {
-        "tslib": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/b4a": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
-      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
-    },
-    "node_modules/babel-jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz",
-      "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==",
-      "dependencies": {
-        "@jest/transform": "^28.1.3",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^28.1.3",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz",
-      "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==",
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz",
-      "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==",
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^28.1.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
-      "optional": true
-    },
-    "node_modules/bare-fs": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
-      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
-      "optional": true,
-      "dependencies": {
-        "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
-        "bare-stream": "^2.0.0"
-      }
-    },
-    "node_modules/bare-os": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
-      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
-      "optional": true
-    },
-    "node_modules/bare-path": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
-      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
-      "optional": true,
-      "dependencies": {
-        "bare-os": "^2.1.0"
-      }
-    },
-    "node_modules/bare-stream": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
-      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
-      "optional": true,
-      "dependencies": {
-        "streamx": "^2.18.0"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/basic-ftp": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
-      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dependencies": {
-        "fast-json-stable-stringify": "2.x"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001439",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz",
-      "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/chromium-bidi": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz",
-      "integrity": "sha512-4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==",
-      "dependencies": {
-        "mitt": "3.0.1",
-        "urlpattern-polyfill": "10.0.0",
-        "zod": "3.23.8"
-      },
-      "peerDependencies": {
-        "devtools-protocol": "*"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz",
-      "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-      "dev": true,
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/data-uri-to-buffer": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
-      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/degenerator": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
-      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
-      "dependencies": {
-        "ast-types": "^0.13.4",
-        "escodegen": "^2.1.0",
-        "esprima": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/devtools-protocol": {
-      "version": "0.0.1312386",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
-      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA=="
-    },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
-    },
-    "node_modules/emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz",
-      "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==",
-      "dev": true,
-      "dependencies": {
-        "fast-diff": "^1.1.1",
-        "jest-docblock": "^21.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      },
-      "peerDependencies": {
-        "prettier": ">= 0.11.0"
-      }
-    },
-    "node_modules/eslint-plugin-prettier/node_modules/jest-docblock": {
-      "version": "21.2.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz",
-      "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==",
-      "dev": true
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expect": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz",
-      "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==",
-      "dependencies": {
-        "@jest/expect-utils": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/extract-zip/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
-    "node_modules/fast-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-      "dev": true
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-uri": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
-      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
-      "dependencies": {
-        "basic-ftp": "^5.0.2",
-        "data-uri-to-buffer": "^6.0.2",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.2.0"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/husky": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz",
-      "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==",
-      "dev": true,
-      "bin": {
-        "husky": "lib/bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/typicode"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/ip-address/node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz",
-      "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==",
-      "dependencies": {
-        "@jest/core": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^28.1.3"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz",
-      "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==",
-      "dependencies": {
-        "execa": "^5.0.0",
-        "p-limit": "^3.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-circus": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz",
-      "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==",
-      "dependencies": {
-        "@jest/environment": "^28.1.3",
-        "@jest/expect": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^28.1.3",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-runtime": "^28.1.3",
-        "jest-snapshot": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-cli": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz",
-      "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==",
-      "dependencies": {
-        "@jest/core": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz",
-      "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "babel-jest": "^28.1.3",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^28.1.3",
-        "jest-environment-node": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.3",
-        "jest-runner": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-diff/node_modules/jest-get-type": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz",
-      "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==",
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz",
-      "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "jest-util": "^28.1.3",
-        "pretty-format": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-environment-node": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz",
-      "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==",
-      "dependencies": {
-        "@jest/environment": "^28.1.3",
-        "@jest/fake-timers": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "jest-mock": "^28.1.3",
-        "jest-util": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz",
-      "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.3",
-        "jest-worker": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz",
-      "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==",
-      "dependencies": {
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz",
-      "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/diff-sequences": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/jest-diff": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz",
-      "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-message-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
-      "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-mock": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz",
-      "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz",
-      "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz",
-      "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==",
-      "dependencies": {
-        "jest-regex-util": "^28.0.2",
-        "jest-snapshot": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz",
-      "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==",
-      "dependencies": {
-        "@jest/console": "^28.1.3",
-        "@jest/environment": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^28.1.1",
-        "jest-environment-node": "^28.1.3",
-        "jest-haste-map": "^28.1.3",
-        "jest-leak-detector": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-resolve": "^28.1.3",
-        "jest-runtime": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-watcher": "^28.1.3",
-        "jest-worker": "^28.1.3",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz",
-      "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==",
-      "dependencies": {
-        "@jest/environment": "^28.1.3",
-        "@jest/fake-timers": "^28.1.3",
-        "@jest/globals": "^28.1.3",
-        "@jest/source-map": "^28.1.2",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-mock": "^28.1.3",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.3",
-        "jest-snapshot": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz",
-      "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^28.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-haste-map": "^28.1.3",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^28.1.3",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/diff-sequences": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-diff": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz",
-      "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
-      "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz",
-      "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-validate/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-watcher": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
-      "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
-      "dependencies": {
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.3",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
-      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "node_modules/lint-staged": {
-      "version": "10.5.4",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz",
-      "integrity": "sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "cli-truncate": "^2.1.0",
-        "commander": "^6.2.0",
-        "cosmiconfig": "^7.0.0",
-        "debug": "^4.2.0",
-        "dedent": "^0.7.0",
-        "enquirer": "^2.3.6",
-        "execa": "^4.1.0",
-        "listr2": "^3.2.2",
-        "log-symbols": "^4.0.0",
-        "micromatch": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "please-upgrade-node": "^3.2.0",
-        "string-argv": "0.3.1",
-        "stringify-object": "^3.3.0"
-      },
-      "bin": {
-        "lint-staged": "bin/lint-staged.js"
-      },
-      "funding": {
-        "url": "https://opencollective.com/lint-staged"
-      }
-    },
-    "node_modules/lint-staged/node_modules/execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/lint-staged/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.12.0"
-      }
-    },
-    "node_modules/listr2": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.1",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mitt": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
-      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "node_modules/netmask": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
-      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.7.tgz",
-      "integrity": "sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ=="
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pac-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
-      "dependencies": {
-        "@tootallnate/quickjs-emscripten": "^0.23.0",
-        "agent-base": "^7.0.2",
-        "debug": "^4.3.4",
-        "get-uri": "^6.0.1",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.5",
-        "pac-resolver": "^7.0.1",
-        "socks-proxy-agent": "^8.0.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/pac-resolver": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
-      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
-      "dependencies": {
-        "degenerator": "^5.0.0",
-        "netmask": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/please-upgrade-node": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
-      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
-      "dev": true,
-      "dependencies": {
-        "semver-compare": "^1.0.0"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
-      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^26.6.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/pretty-format/node_modules/@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10.14.2"
-      }
-    },
-    "node_modules/pretty-format/node_modules/@types/yargs": {
-      "version": "15.0.14",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
-      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/proxy-agent": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
-      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
-      "dependencies": {
-        "agent-base": "^7.0.2",
-        "debug": "^4.3.4",
-        "http-proxy-agent": "^7.0.1",
-        "https-proxy-agent": "^7.0.3",
-        "lru-cache": "^7.14.1",
-        "pac-proxy-agent": "^7.0.1",
-        "proxy-from-env": "^1.1.0",
-        "socks-proxy-agent": "^8.0.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/proxy-agent/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/puppeteer": {
-      "version": "22.14.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz",
-      "integrity": "sha512-MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@puppeteer/browsers": "2.3.0",
-        "cosmiconfig": "^9.0.0",
-        "devtools-protocol": "0.0.1312386",
-        "puppeteer-core": "22.14.0"
-      },
-      "bin": {
-        "puppeteer": "lib/esm/puppeteer/node/cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/puppeteer-core": {
-      "version": "22.14.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz",
-      "integrity": "sha512-rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==",
-      "dependencies": {
-        "@puppeteer/browsers": "2.3.0",
-        "chromium-bidi": "0.6.2",
-        "debug": "^4.3.5",
-        "devtools-protocol": "0.0.1312386",
-        "ws": "^8.18.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/puppeteer/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/puppeteer/node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/puppeteer/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/puppeteer/node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
-    },
-    "node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz",
-      "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
-      "dependencies": {
-        "ip-address": "^9.0.5",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
-      "dependencies": {
-        "agent-base": "^7.1.1",
-        "debug": "^4.3.4",
-        "socks": "^2.8.3"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/streamx": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
-      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
-      "dependencies": {
-        "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
-        "text-decoder": "^1.1.0"
-      },
-      "optionalDependencies": {
-        "bare-events": "^2.2.0"
-      }
-    },
-    "node_modules/string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.19"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dev": true,
-      "dependencies": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tar-fs": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
-      "dependencies": {
-        "pump": "^3.0.0",
-        "tar-stream": "^3.1.5"
-      },
-      "optionalDependencies": {
-        "bare-fs": "^2.1.1",
-        "bare-path": "^2.1.0"
-      }
-    },
-    "node_modules/tar-stream": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
-      "dependencies": {
-        "b4a": "^1.6.4",
-        "fast-fifo": "^1.2.0",
-        "streamx": "^2.15.0"
-      }
-    },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
-      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
-      "dependencies": {
-        "b4a": "^1.6.4"
-      }
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/ts-jest": {
-      "version": "28.0.8",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz",
-      "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==",
-      "dependencies": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^28.0.0",
-        "json5": "^2.2.1",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "^21.0.1"
-      },
-      "bin": {
-        "ts-jest": "cli.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/types": "^28.0.0",
-        "babel-jest": "^28.0.0",
-        "jest": "^28.0.0",
-        "typescript": ">=4.3"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@jest/types": {
-          "optional": true
-        },
-        "babel-jest": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
-    },
-    "node_modules/tslint": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
-      "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.3",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.13.0",
-        "tsutils": "^2.29.0"
-      },
-      "bin": {
-        "tslint": "bin/tslint"
-      },
-      "engines": {
-        "node": ">=4.8.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 4.0.0-dev"
-      }
-    },
-    "node_modules/tslint-config-prettier": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
-      "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
-      "dev": true,
-      "bin": {
-        "tslint-config-prettier-check": "bin/check.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/tslint-plugin-prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz",
-      "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-plugin-prettier": "^2.2.0",
-        "lines-and-columns": "^1.1.6",
-        "tslib": "^1.7.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "peerDependencies": {
-        "prettier": "^1.9.0 || ^2.0.0",
-        "tslint": "^5.0.0 || ^6.0.0"
-      }
-    },
-    "node_modules/tslint-plugin-prettier/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tslint/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslint/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslint/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/tslint/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/tslint/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/tslint/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/tslint/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslint/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/tslint/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslint/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dependencies": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist-lint": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/urlpattern-polyfill": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
-      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zod": {
-      "version": "3.23.8",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    }
-  },
-  "dependencies": {
-    "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-      "requires": {
-        "@babel/highlight": "^7.18.6"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
-      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="
-    },
-    "@babel/core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz",
-      "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==",
-      "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-module-transforms": "^7.20.2",
-        "@babel/helpers": "^7.20.5",
-        "@babel/parser": "^7.20.5",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/generator": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz",
-      "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==",
-      "requires": {
-        "@babel/types": "^7.20.5",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "jsesc": "^2.5.1"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
-      "requires": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
-    },
-    "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-      "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz",
-      "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.2"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "requires": {
-        "@babel/types": "^7.20.2"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
-    },
-    "@babel/helpers": {
-      "version": "7.20.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz",
-      "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==",
-      "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.5",
-        "@babel/types": "^7.20.5"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz",
-      "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
-      "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz",
-      "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==",
-      "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.5",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.5",
-        "@babel/types": "^7.20.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz",
-      "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==",
-      "requires": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
-    },
-    "@jest/console": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
-      "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "slash": "^3.0.0"
-      }
-    },
-    "@jest/core": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz",
-      "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==",
-      "requires": {
-        "@jest/console": "^28.1.3",
-        "@jest/reporters": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^28.1.3",
-        "jest-config": "^28.1.3",
-        "jest-haste-map": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.3",
-        "jest-resolve-dependencies": "^28.1.3",
-        "jest-runner": "^28.1.3",
-        "jest-runtime": "^28.1.3",
-        "jest-snapshot": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "jest-watcher": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.3",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "@jest/environment": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz",
-      "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==",
-      "requires": {
-        "@jest/fake-timers": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "jest-mock": "^28.1.3"
-      }
-    },
-    "@jest/expect": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz",
-      "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==",
-      "requires": {
-        "expect": "^28.1.3",
-        "jest-snapshot": "^28.1.3"
-      }
-    },
-    "@jest/expect-utils": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz",
-      "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==",
-      "requires": {
-        "jest-get-type": "^28.0.2"
-      }
-    },
-    "@jest/fake-timers": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz",
-      "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "@sinonjs/fake-timers": "^9.1.2",
-        "@types/node": "*",
-        "jest-message-util": "^28.1.3",
-        "jest-mock": "^28.1.3",
-        "jest-util": "^28.1.3"
-      }
-    },
-    "@jest/globals": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz",
-      "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==",
-      "requires": {
-        "@jest/environment": "^28.1.3",
-        "@jest/expect": "^28.1.3",
-        "@jest/types": "^28.1.3"
-      }
-    },
-    "@jest/reporters": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz",
-      "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==",
-      "requires": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@jridgewell/trace-mapping": "^0.3.13",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-worker": "^28.1.3",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^9.0.1"
-      }
-    },
-    "@jest/schemas": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
-      "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
-      "requires": {
-        "@sinclair/typebox": "^0.24.1"
-      }
-    },
-    "@jest/source-map": {
-      "version": "28.1.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz",
-      "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==",
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.13",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      }
-    },
-    "@jest/test-result": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
-      "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
-      "requires": {
-        "@jest/console": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz",
-      "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==",
-      "requires": {
-        "@jest/test-result": "^28.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "slash": "^3.0.0"
-      }
-    },
-    "@jest/transform": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz",
-      "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==",
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^28.1.3",
-        "@jridgewell/trace-mapping": "^0.3.13",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.1"
-      }
-    },
-    "@jest/types": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
-      "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
-      "requires": {
-        "@jest/schemas": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      }
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "@puppeteer/browsers": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz",
-      "integrity": "sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==",
-      "requires": {
-        "debug": "^4.3.5",
-        "extract-zip": "^2.0.1",
-        "progress": "^2.0.3",
-        "proxy-agent": "^6.4.0",
-        "semver": "^7.6.3",
-        "tar-fs": "^3.0.6",
-        "unbzip2-stream": "^1.4.3",
-        "yargs": "^17.7.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.6.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-          "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
-        }
-      }
-    },
-    "@sinclair/typebox": {
-      "version": "0.24.51",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
-    },
-    "@sinonjs/commons": {
-      "version": "1.8.6",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
-      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
-      "requires": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-      "requires": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "@tootallnate/quickjs-emscripten": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
-      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="
-    },
-    "@types/babel__core": {
-      "version": "7.1.20",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz",
-      "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
-      "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
-      "requires": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
-    },
-    "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "requires": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "@types/jest": {
-      "version": "26.0.24",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
-      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
-      "dev": true,
-      "requires": {
-        "jest-diff": "^26.0.0",
-        "pretty-format": "^26.0.0"
-      }
-    },
-    "@types/node": {
-      "version": "13.13.52",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz",
-      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "@types/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="
-    },
-    "@types/puppeteer": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-3.0.8.tgz",
-      "integrity": "sha512-YmaPF3KLyDNJfTMlbONOWsAfUh9j0up8xA1G/uyz4c8yD80C2VUM5OTjf+sAS89EN6A6gas0oEzJThICf4OUpw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-    },
-    "@types/yargs": {
-      "version": "17.0.17",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz",
-      "integrity": "sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==",
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
-    },
-    "@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "optional": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "requires": {
-        "debug": "^4.3.4"
-      }
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "requires": {
-        "type-fest": "^0.21.3"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "ast-types": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
-      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
-      "requires": {
-        "tslib": "^2.0.1"
-      }
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "b4a": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
-      "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="
-    },
-    "babel-jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz",
-      "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==",
-      "requires": {
-        "@jest/transform": "^28.1.3",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^28.1.3",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      }
-    },
-    "babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      }
-    },
-    "babel-plugin-jest-hoist": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz",
-      "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==",
-      "requires": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
-    "babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "requires": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      }
-    },
-    "babel-preset-jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz",
-      "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==",
-      "requires": {
-        "babel-plugin-jest-hoist": "^28.1.3",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
-      "optional": true
-    },
-    "bare-fs": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
-      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
-      "optional": true,
-      "requires": {
-        "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
-        "bare-stream": "^2.0.0"
-      }
-    },
-    "bare-os": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
-      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
-      "optional": true
-    },
-    "bare-path": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
-      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
-      "optional": true,
-      "requires": {
-        "bare-os": "^2.1.0"
-      }
-    },
-    "bare-stream": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
-      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
-      "optional": true,
-      "requires": {
-        "streamx": "^2.18.0"
-      }
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "basic-ftp": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
-      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "requires": {
-        "fill-range": "^7.1.1"
-      }
-    },
-    "browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-      "requires": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
-      }
-    },
-    "bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "requires": {
-        "fast-json-stable-stringify": "2.x"
-      }
-    },
-    "bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
-      "dev": true
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001439",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz",
-      "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A=="
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
-    },
-    "chromium-bidi": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz",
-      "integrity": "sha512-4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==",
-      "requires": {
-        "mitt": "3.0.1",
-        "urlpattern-polyfill": "10.0.0",
-        "zod": "3.23.8"
-      }
-    },
-    "ci-info": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz",
-      "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog=="
-    },
-    "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      }
-    },
-    "cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
-    },
-    "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
-    "commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "cosmiconfig": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-      "dev": true,
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "data-uri-to-buffer": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
-      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw=="
-    },
-    "debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
-    },
-    "degenerator": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
-      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
-      "requires": {
-        "ast-types": "^0.13.4",
-        "escodegen": "^2.1.0",
-        "esprima": "^4.0.1"
-      }
-    },
-    "detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
-    },
-    "devtools-protocol": {
-      "version": "0.0.1312386",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
-      "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA=="
-    },
-    "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true
-    },
-    "diff-sequences": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
-      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
-    },
-    "emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
-    "env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-    },
-    "escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "source-map": "~0.6.1"
-      }
-    },
-    "eslint-plugin-prettier": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz",
-      "integrity": "sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.1",
-        "jest-docblock": "^21.0.0"
-      },
-      "dependencies": {
-        "jest-docblock": {
-          "version": "21.2.0",
-          "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz",
-          "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==",
-          "dev": true
-        }
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-    },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
-    },
-    "expect": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz",
-      "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==",
-      "requires": {
-        "@jest/expect-utils": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3"
-      }
-    },
-    "extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
-    "fast-fifo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "requires": {
-        "bser": "2.1.1"
-      }
-    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
-    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-      "dev": true
-    },
-    "get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
-    },
-    "get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-    },
-    "get-uri": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz",
-      "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==",
-      "requires": {
-        "basic-ftp": "^5.0.2",
-        "data-uri-to-buffer": "^6.0.2",
-        "debug": "^4.3.4",
-        "fs-extra": "^11.2.0"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "requires": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
-      "requires": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      }
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-    },
-    "husky": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz",
-      "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==",
-      "dev": true
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-        }
-      }
-    },
-    "import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-      "requires": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
-      "dependencies": {
-        "sprintf-js": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-          "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-      "dev": true
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
-    },
-    "istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz",
-      "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==",
-      "requires": {
-        "@jest/core": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^28.1.3"
-      }
-    },
-    "jest-changed-files": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz",
-      "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==",
-      "requires": {
-        "execa": "^5.0.0",
-        "p-limit": "^3.1.0"
-      }
-    },
-    "jest-circus": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz",
-      "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==",
-      "requires": {
-        "@jest/environment": "^28.1.3",
-        "@jest/expect": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^28.1.3",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-runtime": "^28.1.3",
-        "jest-snapshot": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-cli": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz",
-      "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==",
-      "requires": {
-        "@jest/core": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      }
-    },
-    "jest-config": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz",
-      "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==",
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "babel-jest": "^28.1.3",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^28.1.3",
-        "jest-environment-node": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.3",
-        "jest-runner": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
-      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^26.6.2",
-        "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.6.2"
-      },
-      "dependencies": {
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        }
-      }
-    },
-    "jest-docblock": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz",
-      "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==",
-      "requires": {
-        "detect-newline": "^3.0.0"
-      }
-    },
-    "jest-each": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz",
-      "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "jest-util": "^28.1.3",
-        "pretty-format": "^28.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-environment-node": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz",
-      "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==",
-      "requires": {
-        "@jest/environment": "^28.1.3",
-        "@jest/fake-timers": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "jest-mock": "^28.1.3",
-        "jest-util": "^28.1.3"
-      }
-    },
-    "jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA=="
-    },
-    "jest-haste-map": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz",
-      "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.3.2",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.3",
-        "jest-worker": "^28.1.3",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      }
-    },
-    "jest-leak-detector": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz",
-      "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==",
-      "requires": {
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz",
-      "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==",
-      "requires": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "diff-sequences": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-          "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw=="
-        },
-        "jest-diff": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz",
-          "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^28.1.1",
-            "jest-get-type": "^28.0.2",
-            "pretty-format": "^28.1.3"
-          }
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-message-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
-      "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-mock": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz",
-      "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*"
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "requires": {}
-    },
-    "jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
-    },
-    "jest-resolve": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz",
-      "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==",
-      "requires": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.3",
-        "jest-validate": "^28.1.3",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      }
-    },
-    "jest-resolve-dependencies": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz",
-      "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==",
-      "requires": {
-        "jest-regex-util": "^28.0.2",
-        "jest-snapshot": "^28.1.3"
-      }
-    },
-    "jest-runner": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz",
-      "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==",
-      "requires": {
-        "@jest/console": "^28.1.3",
-        "@jest/environment": "^28.1.3",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^28.1.1",
-        "jest-environment-node": "^28.1.3",
-        "jest-haste-map": "^28.1.3",
-        "jest-leak-detector": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-resolve": "^28.1.3",
-        "jest-runtime": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "jest-watcher": "^28.1.3",
-        "jest-worker": "^28.1.3",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      }
-    },
-    "jest-runtime": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz",
-      "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==",
-      "requires": {
-        "@jest/environment": "^28.1.3",
-        "@jest/fake-timers": "^28.1.3",
-        "@jest/globals": "^28.1.3",
-        "@jest/source-map": "^28.1.2",
-        "@jest/test-result": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-mock": "^28.1.3",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.3",
-        "jest-snapshot": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      }
-    },
-    "jest-snapshot": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz",
-      "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==",
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^28.1.3",
-        "@jest/transform": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^28.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^28.1.3",
-        "jest-get-type": "^28.0.2",
-        "jest-haste-map": "^28.1.3",
-        "jest-matcher-utils": "^28.1.3",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^28.1.3",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "diff-sequences": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-          "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw=="
-        },
-        "jest-diff": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz",
-          "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^28.1.1",
-            "jest-get-type": "^28.0.2",
-            "pretty-format": "^28.1.3"
-          }
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        },
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "jest-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
-      "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      }
-    },
-    "jest-validate": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz",
-      "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==",
-      "requires": {
-        "@jest/types": "^28.1.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "camelcase": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
-      "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
-      "requires": {
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.3",
-        "string-length": "^4.0.1"
-      }
-    },
-    "jest-worker": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
-      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
-    },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "lint-staged": {
-      "version": "10.5.4",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz",
-      "integrity": "sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "cli-truncate": "^2.1.0",
-        "commander": "^6.2.0",
-        "cosmiconfig": "^7.0.0",
-        "debug": "^4.2.0",
-        "dedent": "^0.7.0",
-        "enquirer": "^2.3.6",
-        "execa": "^4.1.0",
-        "listr2": "^3.2.2",
-        "log-symbols": "^4.0.0",
-        "micromatch": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "please-upgrade-node": "^3.2.0",
-        "string-argv": "0.3.1",
-        "stringify-object": "^3.3.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.0",
-            "get-stream": "^5.0.0",
-            "human-signals": "^1.1.1",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.0",
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "human-signals": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-          "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-          "dev": true
-        }
-      }
-    },
-    "listr2": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
-      "dev": true,
-      "requires": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.1",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
-    "log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "slice-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "requires": {
-        "semver": "^6.0.0"
-      }
-    },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
-    },
-    "makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "requires": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "requires": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true
-    },
-    "mitt": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
-      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.6"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "netmask": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
-      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node-releases": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.7.tgz",
-      "integrity": "sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ=="
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "requires": {
-        "path-key": "^3.0.0"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "requires": {
-        "p-limit": "^2.2.0"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        }
-      }
-    },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "pac-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==",
-      "requires": {
-        "@tootallnate/quickjs-emscripten": "^0.23.0",
-        "agent-base": "^7.0.2",
-        "debug": "^4.3.4",
-        "get-uri": "^6.0.1",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.5",
-        "pac-resolver": "^7.0.1",
-        "socks-proxy-agent": "^8.0.4"
-      }
-    },
-    "pac-resolver": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
-      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
-      "requires": {
-        "degenerator": "^5.0.0",
-        "netmask": "^2.0.2"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-    },
-    "pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "requires": {
-        "find-up": "^4.0.0"
-      }
-    },
-    "please-upgrade-node": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
-      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
-      "dev": true,
-      "requires": {
-        "semver-compare": "^1.0.0"
-      }
-    },
-    "prettier": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
-      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
-      "dev": true
-    },
-    "pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^26.6.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "26.6.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^15.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "15.0.14",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
-          "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
-      }
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      }
-    },
-    "proxy-agent": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz",
-      "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==",
-      "requires": {
-        "agent-base": "^7.0.2",
-        "debug": "^4.3.4",
-        "http-proxy-agent": "^7.0.1",
-        "https-proxy-agent": "^7.0.3",
-        "lru-cache": "^7.14.1",
-        "pac-proxy-agent": "^7.0.1",
-        "proxy-from-env": "^1.1.0",
-        "socks-proxy-agent": "^8.0.2"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "7.18.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
-        }
-      }
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "puppeteer": {
-      "version": "22.14.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz",
-      "integrity": "sha512-MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==",
-      "requires": {
-        "@puppeteer/browsers": "2.3.0",
-        "cosmiconfig": "^9.0.0",
-        "devtools-protocol": "0.0.1312386",
-        "puppeteer-core": "22.14.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "cosmiconfig": {
-          "version": "9.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-          "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
-          "requires": {
-            "env-paths": "^2.2.1",
-            "import-fresh": "^3.3.0",
-            "js-yaml": "^4.1.0",
-            "parse-json": "^5.2.0"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "typescript": {
-          "version": "5.5.4",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-          "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-          "optional": true,
-          "peer": true
-        }
-      }
-    },
-    "puppeteer-core": {
-      "version": "22.14.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz",
-      "integrity": "sha512-rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==",
-      "requires": {
-        "@puppeteer/browsers": "2.3.0",
-        "chromium-bidi": "0.6.2",
-        "debug": "^4.3.5",
-        "devtools-protocol": "0.0.1312386",
-        "ws": "^8.18.0"
-      }
-    },
-    "queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
-    },
-    "react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "requires": {
-        "resolve-from": "^5.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
-    },
-    "resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rxjs": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz",
-      "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-    },
-    "semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-    },
-    "slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      }
-    },
-    "smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
-    },
-    "socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
-      "requires": {
-        "ip-address": "^9.0.5",
-        "smart-buffer": "^4.2.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
-      "requires": {
-        "agent-base": "^7.1.1",
-        "debug": "^4.3.4",
-        "socks": "^2.8.3"
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "requires": {
-        "escape-string-regexp": "^2.0.0"
-      }
-    },
-    "streamx": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
-      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
-      "requires": {
-        "bare-events": "^2.2.0",
-        "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
-        "text-decoder": "^1.1.0"
-      }
-    },
-    "string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-      "dev": true
-    },
-    "string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "requires": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dev": true,
-      "requires": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "requires": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-    },
-    "tar-fs": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
-      "requires": {
-        "bare-fs": "^2.1.1",
-        "bare-path": "^2.1.0",
-        "pump": "^3.0.0",
-        "tar-stream": "^3.1.5"
-      }
-    },
-    "tar-stream": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
-      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
-      "requires": {
-        "b4a": "^1.6.4",
-        "fast-fifo": "^1.2.0",
-        "streamx": "^2.15.0"
-      }
-    },
-    "terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      }
-    },
-    "test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "requires": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "text-decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz",
-      "integrity": "sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==",
-      "requires": {
-        "b4a": "^1.6.4"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "ts-jest": {
-      "version": "28.0.8",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz",
-      "integrity": "sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==",
-      "requires": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^28.0.0",
-        "json5": "^2.2.1",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "^21.0.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
-    },
-    "tslint": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.3",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.13.0",
-        "tsutils": "^2.29.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-          "dev": true
-        },
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "tslint-config-prettier": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
-      "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
-      "dev": true
-    },
-    "tslint-plugin-prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz",
-      "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-prettier": "^2.2.0",
-        "lines-and-columns": "^1.1.6",
-        "tslib": "^1.7.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-    },
-    "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-    },
-    "typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="
-    },
-    "unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "requires": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="
-    },
-    "update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "requires": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "urlpattern-polyfill": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
-      "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg=="
-    },
-    "v8-to-istanbul": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
-      }
-    },
-    "walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "requires": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      }
-    },
-    "ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "requires": {}
-    },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "requires": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      }
-    },
-    "yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-    },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
-    },
-    "zod": {
-      "version": "3.23.8",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
-      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g=="
-    }
-  }
-}

From f8fb173445bcd5f108c0c292dca8c079371e2014 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 1 Oct 2024 14:59:08 +0200
Subject: [PATCH 199/210] Versions update

---
 applications/accounts/Dockerfile           | 2 +-
 applications/common/server/setup.py        | 2 +-
 applications/notifications/server/setup.py | 2 +-
 applications/samples/backend/setup.py      | 2 +-
 applications/volumemanager/server/setup.py | 2 +-
 applications/workflows/server/setup.py     | 2 +-
 libraries/client/cloudharness_cli/setup.py | 2 +-
 libraries/cloudharness-common/setup.py     | 2 +-
 libraries/cloudharness-utils/setup.py      | 2 +-
 libraries/models/setup.py                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/applications/accounts/Dockerfile b/applications/accounts/Dockerfile
index c14b452f..4e61bef4 100644
--- a/applications/accounts/Dockerfile
+++ b/applications/accounts/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/keycloak/keycloak:16.1.0
+FROM quay.io/keycloak/keycloak:16.1.1
 
 # add kubectl
 USER root
diff --git a/applications/common/server/setup.py b/applications/common/server/setup.py
index 838cb45c..1935137a 100644
--- a/applications/common/server/setup.py
+++ b/applications/common/server/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "openapi_server"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 
 # To install the library, run the following
 #
diff --git a/applications/notifications/server/setup.py b/applications/notifications/server/setup.py
index 4f4ecf1b..f625329c 100644
--- a/applications/notifications/server/setup.py
+++ b/applications/notifications/server/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "notifications"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 
 # To install the library, run the following
 #
diff --git a/applications/samples/backend/setup.py b/applications/samples/backend/setup.py
index be69d39f..a7a64a89 100644
--- a/applications/samples/backend/setup.py
+++ b/applications/samples/backend/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "samples"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 
 # To install the library, run the following
 #
diff --git a/applications/volumemanager/server/setup.py b/applications/volumemanager/server/setup.py
index 2d6ff8de..ea5b3b37 100644
--- a/applications/volumemanager/server/setup.py
+++ b/applications/volumemanager/server/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "volumemanager"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 
 # To install the library, run the following
 #
diff --git a/applications/workflows/server/setup.py b/applications/workflows/server/setup.py
index c89f97a9..230cdd9d 100644
--- a/applications/workflows/server/setup.py
+++ b/applications/workflows/server/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "workflows_api"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 
 # To install the library, run the following
 #
diff --git a/libraries/client/cloudharness_cli/setup.py b/libraries/client/cloudharness_cli/setup.py
index 2d976676..07fbb77a 100644
--- a/libraries/client/cloudharness_cli/setup.py
+++ b/libraries/client/cloudharness_cli/setup.py
@@ -12,7 +12,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "cloudharness-cli"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/libraries/cloudharness-common/setup.py b/libraries/cloudharness-common/setup.py
index 0971fe99..07184507 100644
--- a/libraries/cloudharness-common/setup.py
+++ b/libraries/cloudharness-common/setup.py
@@ -3,7 +3,7 @@
 
 
 NAME = "cloudharness"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/libraries/cloudharness-utils/setup.py b/libraries/cloudharness-utils/setup.py
index e92773ed..6a2b4b48 100644
--- a/libraries/cloudharness-utils/setup.py
+++ b/libraries/cloudharness-utils/setup.py
@@ -11,7 +11,7 @@
 
 
 NAME = "cloudharness_utils"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/libraries/models/setup.py b/libraries/models/setup.py
index d78224f8..7b9ca1f9 100644
--- a/libraries/models/setup.py
+++ b/libraries/models/setup.py
@@ -8,7 +8,7 @@
 HERE = dn(realpath(__file__))
 
 NAME = "cloudharness_model"
-VERSION = "2.3.0"
+VERSION = "2.4.0"
 REQUIREMENTS = [
     "Jinja2 >= 3.1.3",
     "oyaml >= 1.0",

From 5e6f324308a5f04a3943a5a8514595e3ccba2fc5 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 2 Oct 2024 10:38:17 +0200
Subject: [PATCH 200/210] CH-152 user attributes generic API

---
 .../cloudharness/auth/quota.py                | 120 ++-------------
 .../cloudharness/auth/user_attributes.py      | 140 ++++++++++++++++++
 2 files changed, 149 insertions(+), 111 deletions(-)
 create mode 100644 libraries/cloudharness-common/cloudharness/auth/user_attributes.py

diff --git a/libraries/cloudharness-common/cloudharness/auth/quota.py b/libraries/cloudharness-common/cloudharness/auth/quota.py
index 00137ef4..5f5d5a42 100644
--- a/libraries/cloudharness-common/cloudharness/auth/quota.py
+++ b/libraries/cloudharness-common/cloudharness/auth/quota.py
@@ -5,112 +5,24 @@
 from cloudharness_model.models import ApplicationConfig
 from cloudharness import log
 
+from .user_attributes import UserNotFound, _filter_attrs, _construct_attribute_tree, _compute_attributes_from_tree, get_user_attributes
 # quota tree node to hold the tree quota attributes
 
 
-class QuotaNode:
-    def __init__(self, name, attrs):
-        self.attrs = attrs
-        self.name = name
-        self.children = []
 
-    def addChild(self, child):
-        self.children.append(child)
-
-
-def _filter_quota_attrs(attrs, valid_keys_map):
-    # only use the attributes defined by the valid keys map
-    valid_attrs = {}
-    if attrs is None:
-        return valid_attrs
-    for key in attrs:
-        if key in valid_keys_map:
-            # map to value
-            valid_attrs.update({key: attrs[key][0]})
-    return valid_attrs
 
 
 def get_group_quotas(group, application_config: ApplicationConfig):
     base_quotas = application_config.get("harness", {}).get("quotas", {})
     valid_keys_map = {key for key in base_quotas}
-    return _compute_quotas_from_tree(_construct_quota_tree([group], valid_keys_map))
-
-
-def _construct_quota_tree(groups, valid_keys_map) -> QuotaNode:
-    root = QuotaNode("root", {})
-    for group in groups:
-        r = root
-        paths = group["path"].split("/")[1:]
-        # loop through all segements except the last segment
-        # the last segment is the one we want to add the attributes to
-        for segment in paths[0: len(paths) - 1]:
-            for child in r.children:
-                if child.name == segment:
-                    r = child
-                    break
-            else:
-                # no child found, add it with the segment name of the path
-                n = QuotaNode(segment, {})
-                r.addChild(n)
-                r = n
-        # add the child with it's attributes and last segment name
-        n = QuotaNode(
-            paths[len(paths) - 1],
-            _filter_quota_attrs(group["attributes"], valid_keys_map)
-        )
-        r.addChild(n)
-    return root
-
-
-def _compute_quotas_from_tree(node: QuotaNode):
-    """Recursively traverse the tree and find the quota per level
-    the lower leafs overrule parent leafs values
+    return _compute_attributes_from_tree(_construct_attribute_tree([group], valid_keys_map))
 
-    Args:
-        node (QuotaNode): the quota tree of QuotaNodes of the user for the given application
-
-    Returns:
-        dict: key/value pairs of the quotas
 
-    Example:
-        {'quota-ws-maxcpu': 1000, 'quota-ws-open': 10, 'quota-ws-max': 8}
-
-    Algorithm explanation:
-      /Base {'quota-ws-max': 12345, 'quota-ws-maxcpu': 50, 'quota-ws-open': 1}\n
-      /Base/Base 1/Base 1 1 {'quota-ws-maxcpu': 2, 'quota-ws-open': 10}\n
-      /Base/Base 2 {'quota-ws-max': 8, 'quota-ws-maxcpu': 250}\n
-      /Low CPU {'quota-ws-max': 3, 'quota-ws-maxcpu': 1000, 'quota-ws-open': 1}\n
-
-      result: {'quota-ws-maxcpu': 1000, 'quota-ws-open': 10, 'quota-ws-max': 8}\n
-      quota-ws-maxcpu from path "/Low CPU"\n
-        --> overrules paths "/Base/Base 1/Base 1 1" and "/Base/Base 2" (higher value)\n
-        --> /Base quota-ws-max is not used because this one is not the lowest
-            leaf with this attribute (Base 1 1 and Base 2 are "lower")\n
-      quota-ws-open from path "/Base/Base 1/Base 1 1"\n
-      quota-ws-max from path "/Base/Base 2"\n
-    """
-    new_attrs = {}
-    for child in node.children:
-        child_attrs = _compute_quotas_from_tree(child)
-        for key in child_attrs:
-            try:
-                # we expect all quota values to be numbers: the unit is implicit and
-                # defined at usage time
-                child_val = attribute_to_quota(child_attrs[key])
-            except:
-                # value not a float, skip
-                continue
-            if not key in new_attrs or new_attrs[key] < child_val:
-                new_attrs.update({key: child_val})
-    for key in new_attrs:
-        node.attrs.update({key: new_attrs[key]})
-    return node.attrs
 
 
 def attribute_to_quota(attr_value: str):
     return float(re.sub("[^0-9.]", "", attr_value) if type(attr_value) is str else attr_value)
 
-
 def get_user_quotas(application_config: ApplicationConfig = None, user_id: str = None) -> dict:
     """Get the user quota from Keycloak and application
 
@@ -126,28 +38,14 @@ def get_user_quotas(application_config: ApplicationConfig = None, user_id: str =
     """
     if not application_config:
         application_config = get_current_configuration()
-
     base_quotas = application_config.get("harness", {}).get("quotas", {})
+    
+    
+    valid_keys_map = {key for key in base_quotas}
+
     try:
-        auth_client = AuthClient()
-        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:
+        return get_user_attributes(user_id, valid_keys_map=valid_keys_map, default_attributes=base_quotas)
+
+    except UserNotFound as e:
         log.warning("Quotas not available: error retrieving user: %s", user_id)
         return base_quotas
-
-    valid_keys_map = {key for key in base_quotas}
-
-    group_quotas = _compute_quotas_from_tree(
-        _construct_quota_tree(
-            user["userGroups"],
-            valid_keys_map))
-    user_quotas = _filter_quota_attrs(user["attributes"], valid_keys_map)
-    for key in group_quotas:
-        if key not in user_quotas:
-            user_quotas.update({key: group_quotas[key]})
-    for key in base_quotas:
-        if key not in user_quotas:
-            user_quotas.update({key: attribute_to_quota(base_quotas[key])})
-    return user_quotas
diff --git a/libraries/cloudharness-common/cloudharness/auth/user_attributes.py b/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
new file mode 100644
index 00000000..7da20b72
--- /dev/null
+++ b/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
@@ -0,0 +1,140 @@
+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 import log
+
+class KCAttributeNode:
+    def __init__(self, name, attrs):
+        self.attrs = attrs
+        self.name = name
+        self.children = []
+
+    def addChild(self, child):
+        self.children.append(child)
+
+
+def _filter_attrs(attrs, valid_keys_map):
+    # only use the attributes defined by the valid keys map
+    valid_attrs = {}
+    if attrs is None:
+        return valid_attrs
+    for key in attrs:
+        if key in valid_keys_map:
+            # map to value
+            valid_attrs.update({key: attrs[key][0]})
+    return valid_attrs
+
+def _construct_attribute_tree(groups, valid_keys_map) -> KCAttributeNode:
+    """Construct a tree of attributes from the user groups"""
+    root = KCAttributeNode("root", {})
+    for group in groups:
+        r = root
+        paths = group["path"].split("/")[1:]
+        # loop through all segements except the last segment
+        # the last segment is the one we want to add the attributes to
+        for segment in paths[0: len(paths) - 1]:
+            for child in r.children:
+                if child.name == segment:
+                    r = child
+                    break
+            else:
+                # no child found, add it with the segment name of the path
+                n = KCAttributeNode(segment, {})
+                r.addChild(n)
+                r = n
+        # add the child with it's attributes and last segment name
+        n = KCAttributeNode(
+            paths[len(paths) - 1],
+            _filter_attrs(group["attributes"], valid_keys_map)
+        )
+        r.addChild(n)
+    return root
+
+
+class UserNotFound(Exception):
+    pass
+
+def _compute_attributes_from_tree(node: KCAttributeNode, transform_value_fn=lambda x: x):
+    """Recursively traverse the tree and find the attributes per level
+    the lower leafs overrule parent leafs values
+
+    Args:
+        node (QuotaNode): the quota tree of QuotaNodes of the user for the given application
+        transform_value_fn (function): function to transform the value of the attribute
+
+    Returns:
+        dict: key/value pairs of the quotas
+
+    Example:
+        {'quota-ws-maxcpu': 1000, 'quota-ws-open': 10, 'quota-ws-max': 8}
+
+    Algorithm explanation:
+      /Base {'quota-ws-max': 12345, 'quota-ws-maxcpu': 50, 'quota-ws-open': 1}\n
+      /Base/Base 1/Base 1 1 {'quota-ws-maxcpu': 2, 'quota-ws-open': 10}\n
+      /Base/Base 2 {'quota-ws-max': 8, 'quota-ws-maxcpu': 250}\n
+      /Low CPU {'quota-ws-max': 3, 'quota-ws-maxcpu': 1000, 'quota-ws-open': 1}\n
+
+      result: {'quota-ws-maxcpu': 1000, 'quota-ws-open': 10, 'quota-ws-max': 8}\n
+      quota-ws-maxcpu from path "/Low CPU"\n
+        --> overrules paths "/Base/Base 1/Base 1 1" and "/Base/Base 2" (higher value)\n
+        --> /Base quota-ws-max is not used because this one is not the lowest
+            leaf with this attribute (Base 1 1 and Base 2 are "lower")\n
+      quota-ws-open from path "/Base/Base 1/Base 1 1"\n
+      quota-ws-max from path "/Base/Base 2"\n
+    """
+    new_attrs = {}
+    for child in node.children:
+        child_attrs = _compute_attributes_from_tree(child)
+        for key in child_attrs:
+            try:
+                child_val = transform_value_fn(child_attrs[key])
+            except:
+                # value not a float, skip
+                continue
+            if not key in new_attrs or new_attrs[key] < child_val:
+                new_attrs.update({key: child_val})
+    for key in new_attrs:
+        node.attrs.update({key: new_attrs[key]})
+    return node.attrs
+
+
+
+def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attributes={}, transform_value_fn=lambda x: x) -> dict:
+    """Get the user attributes from Keycloak recursively from the user attributes and groups
+
+    Args:
+        user_id (str): the Keycloak user id or username to get the quotas for
+        valid_keys_map (dict): the valid keys to use for the attributes
+        default_attributes (dict): the default attributes to use if the user does not have the attribute
+
+    Returns:
+        dict: key/value pairs of the user attributes
+
+    Example:
+        {'quota-ws-maxcpu': 1000, 'quota-ws-open': 10, 'quota-ws-max': 8}
+    """
+    
+    try:
+        auth_client = AuthClient()
+        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:
+        log.warning("Quotas not available: error retrieving user: %s", user_id)
+        raise UserNotFound("User not found") from e
+
+
+    group_quotas = _compute_attributes_from_tree(
+        _construct_attribute_tree(
+            user["userGroups"],
+            valid_keys_map), transform_value_fn)
+    user_attrs = _filter_attrs(user["attributes"], valid_keys_map)
+    for key in group_quotas:
+        if key not in user_attrs:
+            user_attrs.update({key: group_quotas[key]})
+    for key in default_attributes:
+        if key not in user_attrs:
+            user_attrs.update({key: transform_value_fn(default_attributes[key])})
+    return user_attrs
\ No newline at end of file

From f4c604445170a83e61351721f5ecbdcbcdb7d362 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 2 Oct 2024 10:38:43 +0200
Subject: [PATCH 201/210] CH-152 add documentation

---
 docs/accounts.md | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/docs/accounts.md b/docs/accounts.md
index ff5e660c..d566d521 100644
--- a/docs/accounts.md
+++ b/docs/accounts.md
@@ -178,8 +178,35 @@ harness:
 
 The above configuration will create 3 client roles under the "myapp" client and 2 users.
 
----
+
 **NOTE**
-Users and client roles are defined as a one-off initialization: they
+> Users and client roles are defined as a one-off initialization: they
 can be configured only on a new deployment and cannot be updated.
----
+
+
+### Retrieve user attributes Python API
+
+The auth API provides a way to get user attributes merged with groups attributes recursively.
+This allows us to define an attribute that is common for different users per group.
+A common use case is the definition of usage quotas, for which cloudharness provides a
+high level API.
+
+Example retrieve attributes:
+
+```Python
+from clouharness.auth.user_attributes import get_user_attributes
+
+attributes = get_user_attributes(kc_user_id_or_name)
+```
+
+The API provides parameters for filtering and provide a set of default values.
+
+The user quotas API also assumes that a set of default values can be specified at application level
+on `harness/quotas` and all quotas attributes begin with the `quota-` prefix.
+
+Example:
+
+```Python
+from clouharness.auth.quotas import get_user_quotas
+quotas = get_user_quotas(kc_user_id_or_name) # retrieves default quotas values from the current application
+```

From 7cd5cf08bc7c04c1f9cc72d31c543d7dfc828963 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 2 Oct 2024 10:41:47 +0200
Subject: [PATCH 202/210] chore: linting fix

---
 libraries/cloudharness-common/cloudharness/auth/quota.py | 9 ++-------
 .../cloudharness/auth/user_attributes.py                 | 9 +++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/auth/quota.py b/libraries/cloudharness-common/cloudharness/auth/quota.py
index 5f5d5a42..d004443b 100644
--- a/libraries/cloudharness-common/cloudharness/auth/quota.py
+++ b/libraries/cloudharness-common/cloudharness/auth/quota.py
@@ -9,20 +9,16 @@
 # quota tree node to hold the tree quota attributes
 
 
-
-
-
 def get_group_quotas(group, application_config: ApplicationConfig):
     base_quotas = application_config.get("harness", {}).get("quotas", {})
     valid_keys_map = {key for key in base_quotas}
     return _compute_attributes_from_tree(_construct_attribute_tree([group], valid_keys_map))
 
 
-
-
 def attribute_to_quota(attr_value: str):
     return float(re.sub("[^0-9.]", "", attr_value) if type(attr_value) is str else attr_value)
 
+
 def get_user_quotas(application_config: ApplicationConfig = None, user_id: str = None) -> dict:
     """Get the user quota from Keycloak and application
 
@@ -39,8 +35,7 @@ def get_user_quotas(application_config: ApplicationConfig = None, user_id: str =
     if not application_config:
         application_config = get_current_configuration()
     base_quotas = application_config.get("harness", {}).get("quotas", {})
-    
-    
+
     valid_keys_map = {key for key in base_quotas}
 
     try:
diff --git a/libraries/cloudharness-common/cloudharness/auth/user_attributes.py b/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
index 7da20b72..403addd2 100644
--- a/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
+++ b/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
@@ -5,6 +5,7 @@
 from cloudharness_model.models import ApplicationConfig
 from cloudharness import log
 
+
 class KCAttributeNode:
     def __init__(self, name, attrs):
         self.attrs = attrs
@@ -26,6 +27,7 @@ def _filter_attrs(attrs, valid_keys_map):
             valid_attrs.update({key: attrs[key][0]})
     return valid_attrs
 
+
 def _construct_attribute_tree(groups, valid_keys_map) -> KCAttributeNode:
     """Construct a tree of attributes from the user groups"""
     root = KCAttributeNode("root", {})
@@ -56,6 +58,7 @@ def _construct_attribute_tree(groups, valid_keys_map) -> KCAttributeNode:
 class UserNotFound(Exception):
     pass
 
+
 def _compute_attributes_from_tree(node: KCAttributeNode, transform_value_fn=lambda x: x):
     """Recursively traverse the tree and find the attributes per level
     the lower leafs overrule parent leafs values
@@ -100,7 +103,6 @@ def _compute_attributes_from_tree(node: KCAttributeNode, transform_value_fn=lamb
     return node.attrs
 
 
-
 def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attributes={}, transform_value_fn=lambda x: x) -> dict:
     """Get the user attributes from Keycloak recursively from the user attributes and groups
 
@@ -115,7 +117,7 @@ def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attribut
     Example:
         {'quota-ws-maxcpu': 1000, 'quota-ws-open': 10, 'quota-ws-max': 8}
     """
-    
+
     try:
         auth_client = AuthClient()
         if not user_id:
@@ -125,7 +127,6 @@ def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attribut
         log.warning("Quotas not available: error retrieving user: %s", user_id)
         raise UserNotFound("User not found") from e
 
-
     group_quotas = _compute_attributes_from_tree(
         _construct_attribute_tree(
             user["userGroups"],
@@ -137,4 +138,4 @@ def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attribut
     for key in default_attributes:
         if key not in user_attrs:
             user_attrs.update({key: transform_value_fn(default_attributes[key])})
-    return user_attrs
\ No newline at end of file
+    return user_attrs

From 687ed91abdd90f277804f5401245e0a410458e66 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 2 Oct 2024 11:42:26 +0200
Subject: [PATCH 203/210] Fix tests dependencies

---
 test/test-e2e/yarn.lock | 1491 +++++++++++++++++++--------------------
 1 file changed, 731 insertions(+), 760 deletions(-)

diff --git a/test/test-e2e/yarn.lock b/test/test-e2e/yarn.lock
index 3104b346..a276525c 100644
--- a/test/test-e2e/yarn.lock
+++ b/test/test-e2e/yarn.lock
@@ -2,297 +2,291 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@ampproject/remapping@^2.2.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.20.0":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz"
-  integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
+"@babel/compat-data@^7.25.2":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
+  integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
 
 "@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz"
-  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-module-transforms" "^7.20.2"
-    "@babel/helpers" "^7.20.5"
-    "@babel/parser" "^7.20.5"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
-    convert-source-map "^1.7.0"
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
+  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-module-transforms" "^7.25.2"
+    "@babel/helpers" "^7.25.0"
+    "@babel/parser" "^7.25.0"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.2"
+    "@babel/types" "^7.25.2"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/generator@^7.20.5", "@babel/generator@^7.7.2":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz"
-  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
+"@babel/generator@^7.25.0", "@babel/generator@^7.25.6", "@babel/generator@^7.7.2":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c"
+  integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==
   dependencies:
-    "@babel/types" "^7.20.5"
-    "@jridgewell/gen-mapping" "^0.3.2"
+    "@babel/types" "^7.25.6"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-compilation-targets@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"
-  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
-  dependencies:
-    "@babel/compat-data" "^7.20.0"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
-    semver "^6.3.0"
-
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-module-transforms@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"
-  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.20.2"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
-
-"@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helpers@^7.20.5":
-  version "7.20.6"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz"
-  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
-
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
+"@babel/helper-compilation-targets@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
+  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
+  dependencies:
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-module-transforms@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
+  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.2"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
+
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
+"@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
+
+"@babel/helpers@^7.25.0":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60"
+  integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==
+  dependencies:
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.6"
+
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.7"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"
-  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f"
+  integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==
+  dependencies:
+    "@babel/types" "^7.25.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-bigint@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
   integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-import-meta@^7.8.3":
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-import-attributes@^7.24.7":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz#6d4c78f042db0e82fd6436cd65fec5dc78ad2bde"
+  integrity sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.20.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"
-  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
-"@babel/template@^7.18.10", "@babel/template@^7.3.3":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.2":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz"
-  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.5"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.5"
-    "@babel/types" "^7.20.5"
-    debug "^4.1.0"
+"@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz#04db9ce5a9043d9c635e75ae7969a2cd50ca97ff"
+  integrity sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
+
+"@babel/template@^7.25.0", "@babel/template@^7.3.3":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
+  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2", "@babel/traverse@^7.7.2":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41"
+  integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.6"
+    "@babel/parser" "^7.25.6"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.6"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz"
-  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.3.3":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
+  integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==
   dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
-  resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
   integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
@@ -303,12 +297,12 @@
 
 "@istanbuljs/schema@^0.1.2":
   version "0.1.3"
-  resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
 "@jest/console@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.3.tgz#2030606ec03a18c31803b8a36382762e447655df"
   integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -320,7 +314,7 @@
 
 "@jest/core@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-28.1.3.tgz#0ebf2bd39840f1233cd5f2d1e6fc8b71bd5a1ac7"
   integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==
   dependencies:
     "@jest/console" "^28.1.3"
@@ -355,7 +349,7 @@
 
 "@jest/environment@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-28.1.3.tgz#abed43a6b040a4c24fdcb69eab1f97589b2d663e"
   integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==
   dependencies:
     "@jest/fake-timers" "^28.1.3"
@@ -365,14 +359,14 @@
 
 "@jest/expect-utils@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-28.1.3.tgz#58561ce5db7cd253a7edddbc051fb39dda50f525"
   integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==
   dependencies:
     jest-get-type "^28.0.2"
 
 "@jest/expect@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-28.1.3.tgz#9ac57e1d4491baca550f6bdbd232487177ad6a72"
   integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==
   dependencies:
     expect "^28.1.3"
@@ -380,7 +374,7 @@
 
 "@jest/fake-timers@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-28.1.3.tgz#230255b3ad0a3d4978f1d06f70685baea91c640e"
   integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -392,7 +386,7 @@
 
 "@jest/globals@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-28.1.3.tgz#a601d78ddc5fdef542728309894895b4a42dc333"
   integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -401,7 +395,7 @@
 
 "@jest/reporters@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-28.1.3.tgz#9adf6d265edafc5fc4a434cfb31e2df5a67a369a"
   integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
@@ -432,14 +426,14 @@
 
 "@jest/schemas@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
   integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
   dependencies:
     "@sinclair/typebox" "^0.24.1"
 
 "@jest/source-map@^28.1.2":
   version "28.1.2"
-  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-28.1.2.tgz#7fe832b172b497d6663cdff6c13b0a920e139e24"
   integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.13"
@@ -448,7 +442,7 @@
 
 "@jest/test-result@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.3.tgz#5eae945fd9f4b8fcfce74d239e6f725b6bf076c5"
   integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
   dependencies:
     "@jest/console" "^28.1.3"
@@ -458,7 +452,7 @@
 
 "@jest/test-sequencer@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz#9d0c283d906ac599c74bde464bc0d7e6a82886c3"
   integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==
   dependencies:
     "@jest/test-result" "^28.1.3"
@@ -468,7 +462,7 @@
 
 "@jest/transform@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
   integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -489,7 +483,7 @@
 
 "@jest/types@^26.6.2":
   version "26.6.2"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
   integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
@@ -500,7 +494,7 @@
 
 "@jest/types@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
   integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
   dependencies:
     "@jest/schemas" "^28.1.3"
@@ -510,45 +504,37 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@puppeteer/browsers@2.3.0":
   version "2.3.0"
@@ -566,19 +552,19 @@
 
 "@sinclair/typebox@^0.24.1":
   version "0.24.51"
-  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
   integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.6"
-  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
   integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
   dependencies:
     type-detect "4.0.8"
 
 "@sinonjs/fake-timers@^9.1.2":
   version "9.1.2"
-  resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
   integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
@@ -589,122 +575,129 @@
   integrity sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==
 
 "@types/babel__core@^7.1.14":
-  version "7.1.20"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz"
-  integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
   dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
+  version "7.6.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
+  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.3"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz"
-  integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7"
+  integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.20.7"
 
 "@types/graceful-fs@^4.1.3":
-  version "4.1.5"
-  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
   dependencies:
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
 
 "@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@26.0.24":
   version "26.0.24"
-  resolved "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a"
   integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
-"@types/node@*", "@types/node@13.13.52":
+"@types/node@*":
+  version "22.7.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc"
+  integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==
+  dependencies:
+    undici-types "~6.19.2"
+
+"@types/node@13.13.52":
   version "13.13.52"
-  resolved "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7"
   integrity sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==
 
 "@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
+  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
 "@types/prettier@^2.1.5":
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz"
-  integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
+  integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
 
 "@types/puppeteer@3.0.8":
   version "3.0.8"
-  resolved "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-3.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-3.0.8.tgz#f5431d58bd99d6ef9b6d93f0cc5a0f344559b6b3"
   integrity sha512-YmaPF3KLyDNJfTMlbONOWsAfUh9j0up8xA1G/uyz4c8yD80C2VUM5OTjf+sAS89EN6A6gas0oEzJThICf4OUpw==
   dependencies:
     "@types/node" "*"
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
 "@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+  version "21.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^15.0.0":
-  version "15.0.14"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz"
-  integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==
+  version "15.0.19"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.19.tgz#328fb89e46109ecbdb70c295d96ff2f46dfd01b9"
+  integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@types/yargs@^17.0.8":
-  version "17.0.17"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz"
-  integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g==
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
+  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@types/yauzl@^2.9.1":
-  version "2.10.0"
-  resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"
-  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
+  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
   dependencies:
     "@types/node" "*"
 
@@ -717,7 +710,7 @@ agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
 
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
@@ -725,43 +718,43 @@ aggregate-error@^3.0.0:
 
 ansi-colors@^4.1.1:
   version "4.1.3"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
 ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 ansi-styles@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 anymatch@^3.0.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
@@ -769,7 +762,7 @@ anymatch@^3.0.3:
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
@@ -788,17 +781,17 @@ ast-types@^0.13.4:
 
 astral-regex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-b4a@^1.6.4:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.6.tgz#a4cc349a3851987c3c4ac2d7785c18744f6da9ba"
-  integrity sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==
+b4a@^1.6.4, b4a@^1.6.6:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4"
+  integrity sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==
 
 babel-jest@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
   integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
   dependencies:
     "@jest/transform" "^28.1.3"
@@ -811,7 +804,7 @@ babel-jest@^28.1.3:
 
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
-  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -822,7 +815,7 @@ babel-plugin-istanbul@^6.1.1:
 
 babel-plugin-jest-hoist@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
   integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
   dependencies:
     "@babel/template" "^7.3.3"
@@ -831,26 +824,29 @@ babel-plugin-jest-hoist@^28.1.3:
     "@types/babel__traverse" "^7.0.6"
 
 babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"
-  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
+  integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-import-meta" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-import-attributes" "^7.24.7"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
 babel-preset-jest@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
   integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
   dependencies:
     babel-plugin-jest-hoist "^28.1.3"
@@ -858,27 +854,27 @@ babel-preset-jest@^28.1.3:
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.0.0, bare-events@^2.2.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.4.2.tgz#3140cca7a0e11d49b3edc5041ab560659fd8e1f8"
-  integrity sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.0.tgz#305b511e262ffd8b9d5616b056464f8e1b3329cc"
+  integrity sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==
 
 bare-fs@^2.1.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.3.1.tgz#cdbd63dac7a552dfb2b87d18c822298d1efd213d"
-  integrity sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.3.5.tgz#05daa8e8206aeb46d13c2fe25a2cd3797b0d284a"
+  integrity sha512-SlE9eTxifPDJrT6YgemQ1WGFleevzwY+XAP1Xqgl56HtcrisC2CHCZ2tq6dBpcH2TnNxwUEUGhweo+lrQtYuiw==
   dependencies:
     bare-events "^2.0.0"
     bare-path "^2.0.0"
     bare-stream "^2.0.0"
 
 bare-os@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.4.0.tgz#5de5e3ba7704f459c9656629edca7cc736e06608"
-  integrity sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.4.4.tgz#01243392eb0a6e947177bb7c8a45123d45c9b1a9"
+  integrity sha512-z3UiI2yi1mK0sXeRdc4O1Kk8aOa/e+FNWZcTiPB/dfTWyLypuE99LibgRaQki914Jq//yAWylcAt+mknKdixRQ==
 
 bare-path@^2.0.0, bare-path@^2.1.0:
   version "2.1.3"
@@ -888,15 +884,16 @@ bare-path@^2.0.0, bare-path@^2.1.0:
     bare-os "^2.1.0"
 
 bare-stream@^2.0.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.1.3.tgz#070b69919963a437cc9e20554ede079ce0a129b2"
-  integrity sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.3.0.tgz#5bef1cab8222517315fca1385bd7f08dff57f435"
+  integrity sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==
   dependencies:
-    streamx "^2.18.0"
+    b4a "^1.6.6"
+    streamx "^2.20.0"
 
 base64-js@^1.3.1:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 basic-ftp@^5.0.2:
@@ -906,7 +903,7 @@ basic-ftp@^5.0.2:
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -919,43 +916,43 @@ braces@^3.0.3:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.21.3:
-  version "4.21.4"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+browserslist@^4.23.1:
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4"
+  integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==
   dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
+    caniuse-lite "^1.0.30001663"
+    electron-to-chromium "^1.5.28"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.0"
 
 bs-logger@0.x:
   version "0.2.6"
-  resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
   dependencies:
     fast-json-stable-stringify "2.x"
 
 bser@2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
   integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
-  resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer@^5.2.1:
   version "5.7.1"
-  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
     base64-js "^1.3.1"
@@ -963,32 +960,32 @@ buffer@^5.2.1:
 
 builtin-modules@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.2.0:
   version "6.3.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001439"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz"
-  integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
+caniuse-lite@^1.0.30001663:
+  version "1.0.30001666"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001666.tgz#112d77e80f1762f62a1b71ba92164e0cb3f3dd13"
+  integrity sha512-gD14ICmoV5ZZM1OdzPWmpx+q4GyefaK06zi8hmfHV5xe4/2nOQX3+Dw5o+fSqOws2xVwL9j+anOPFwHzdEdV4g==
 
-chalk@^2.0.0, chalk@^2.3.0:
+chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -997,7 +994,7 @@ chalk@^2.0.0, chalk@^2.3.0:
 
 chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
@@ -1005,7 +1002,7 @@ chalk@^4.0.0, chalk@^4.1.0:
 
 char-regex@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
 chromium-bidi@0.6.2:
@@ -1018,30 +1015,30 @@ chromium-bidi@0.6.2:
     zod "3.23.8"
 
 ci-info@^3.2.0:
-  version "3.7.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz"
-  integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 cjs-module-lexer@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz"
-  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz#707413784dbb3a72aa11c2f2b042a0bef4004170"
+  integrity sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
 cli-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
 cli-truncate@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
   integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
   dependencies:
     slice-ansi "^3.0.0"
@@ -1049,7 +1046,7 @@ cli-truncate@^2.1.0:
 
 cliui@^8.0.1:
   version "8.0.1"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
   integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
@@ -1058,66 +1055,71 @@ cliui@^8.0.1:
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
 collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 colorette@^2.0.16:
-  version "2.0.19"
-  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 commander@^2.12.1:
   version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^6.2.0:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cosmiconfig@^7.0.0:
   version "7.1.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
   integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
@@ -1138,7 +1140,7 @@ cosmiconfig@^9.0.0:
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
@@ -1150,29 +1152,22 @@ data-uri-to-buffer@^6.0.2:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz#8a58bb67384b261a38ef18bea1810cb01badd28b"
   integrity sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^4.3.4, debug@^4.3.5:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
-  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.4, debug@^4.3.5:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 dedent@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
 deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 degenerator@^5.0.0:
   version "5.0.1"
@@ -1185,7 +1180,7 @@ degenerator@^5.0.0:
 
 detect-newline@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 devtools-protocol@0.0.1312386:
@@ -1195,47 +1190,48 @@ devtools-protocol@0.0.1312386:
 
 diff-sequences@^26.6.2:
   version "26.6.2"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
   integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
 diff-sequences@^28.1.1:
   version "28.1.1"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
 diff@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-electron-to-chromium@^1.4.251:
-  version "1.4.284"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"
-  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+electron-to-chromium@^1.5.28:
+  version "1.5.31"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.31.tgz#b1478418769dec72ea70d9fdf147a81491857f10"
+  integrity sha512-QcDoBbQeYt0+3CWcK/rEbuHvwpbT/8SV9T3OSgs6cX1FlcUAkgrkqbg9zLnDrMM/rLamzQwal4LYFCiWk861Tg==
 
 emittery@^0.10.2:
   version "0.10.2"
-  resolved "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 end-of-stream@^1.1.0:
   version "1.4.4"
-  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 enquirer@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
+  integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
   dependencies:
     ansi-colors "^4.1.1"
+    strip-ansi "^6.0.1"
 
 env-paths@^2.2.1:
   version "2.2.1"
@@ -1244,24 +1240,24 @@ env-paths@^2.2.1:
 
 error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+escalade@^3.1.1, escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
 escodegen@^2.1.0:
@@ -1277,7 +1273,7 @@ escodegen@^2.1.0:
 
 eslint-plugin-prettier@^2.2.0:
   version "2.7.0"
-  resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.7.0.tgz#b4312dcf2c1d965379d7f9d5b5f8aaadc6a45904"
   integrity sha512-CStQYJgALoQBw3FsBzH0VOVDRnJ/ZimUlpLm226U8qgqYJfPOY/CPK6wyRInMxh73HSKg5wyRwdS4BVYYHwokA==
   dependencies:
     fast-diff "^1.1.1"
@@ -1285,7 +1281,7 @@ eslint-plugin-prettier@^2.2.0:
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 estraverse@^5.2.0:
@@ -1300,7 +1296,7 @@ esutils@^2.0.2:
 
 execa@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
   dependencies:
     cross-spawn "^7.0.0"
@@ -1315,7 +1311,7 @@ execa@^4.1.0:
 
 execa@^5.0.0:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
@@ -1330,12 +1326,12 @@ execa@^5.0.0:
 
 exit@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expect@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec"
   integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
   dependencies:
     "@jest/expect-utils" "^28.1.3"
@@ -1356,9 +1352,9 @@ extract-zip@^2.0.1:
     "@types/yauzl" "^2.9.1"
 
 fast-diff@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
 fast-fifo@^1.2.0, fast-fifo@^1.3.2:
   version "1.3.2"
@@ -1367,19 +1363,19 @@ fast-fifo@^1.2.0, fast-fifo@^1.3.2:
 
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fb-watchman@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
   integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
 fd-slicer@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
   integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
   dependencies:
     pend "~1.2.0"
@@ -1393,7 +1389,7 @@ fill-range@^7.1.1:
 
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
@@ -1410,49 +1406,49 @@ fs-extra@^11.2.0:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
 get-package-type@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
 get-stream@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-uri@^6.0.1:
@@ -1467,7 +1463,7 @@ get-uri@^6.0.1:
 
 glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
@@ -1479,39 +1475,34 @@ glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-graceful-fs@^4.2.9:
-  version "4.2.10"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 html-escaper@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.1:
@@ -1532,53 +1523,53 @@ https-proxy-agent@^7.0.3, https-proxy-agent@^7.0.5:
 
 human-signals@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
 human-signals@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 husky@6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
   integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
 
 ieee754@^1.1.13:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
 import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
+  integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
   dependencies:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
@@ -1586,7 +1577,7 @@ inflight@^1.0.4:
 
 inherits@2:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ip-address@^9.0.5:
@@ -1599,64 +1590,64 @@ ip-address@^9.0.5:
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+is-core-module@^2.13.0:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.2"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-fn@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
 
 is-regexp@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
 
 is-stream@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
 istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
   integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
     "@babel/core" "^7.12.3"
@@ -1666,17 +1657,17 @@ istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
     semver "^6.3.0"
 
 istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
+    make-dir "^4.0.0"
     supports-color "^7.1.0"
 
 istanbul-lib-source-maps@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
   integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
@@ -1684,16 +1675,16 @@ istanbul-lib-source-maps@^4.0.0:
     source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
 jest-changed-files@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-28.1.3.tgz#d9aeee6792be3686c47cb988a8eaf82ff4238831"
   integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==
   dependencies:
     execa "^5.0.0"
@@ -1701,7 +1692,7 @@ jest-changed-files@^28.1.3:
 
 jest-circus@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-28.1.3.tgz#d14bd11cf8ee1a03d69902dc47b6bd4634ee00e4"
   integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -1726,7 +1717,7 @@ jest-circus@^28.1.3:
 
 jest-cli@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-28.1.3.tgz#558b33c577d06de55087b8448d373b9f654e46b2"
   integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==
   dependencies:
     "@jest/core" "^28.1.3"
@@ -1744,7 +1735,7 @@ jest-cli@^28.1.3:
 
 jest-config@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-28.1.3.tgz#e315e1f73df3cac31447eed8b8740a477392ec60"
   integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -1772,7 +1763,7 @@ jest-config@^28.1.3:
 
 jest-diff@^26.0.0:
   version "26.6.2"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
   integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==
   dependencies:
     chalk "^4.0.0"
@@ -1782,7 +1773,7 @@ jest-diff@^26.0.0:
 
 jest-diff@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
   integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==
   dependencies:
     chalk "^4.0.0"
@@ -1792,19 +1783,19 @@ jest-diff@^28.1.3:
 
 jest-docblock@^21.0.0:
   version "21.2.0"
-  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
   integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
 
 jest-docblock@^28.1.1:
   version "28.1.1"
-  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8"
   integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==
   dependencies:
     detect-newline "^3.0.0"
 
 jest-each@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-28.1.3.tgz#bdd1516edbe2b1f3569cfdad9acd543040028f81"
   integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -1815,7 +1806,7 @@ jest-each@^28.1.3:
 
 jest-environment-node@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-28.1.3.tgz#7e74fe40eb645b9d56c0c4b70ca4357faa349be5"
   integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -1827,17 +1818,17 @@ jest-environment-node@^28.1.3:
 
 jest-get-type@^26.3.0:
   version "26.3.0"
-  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
 jest-get-type@^28.0.2:
   version "28.0.2"
-  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
   integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
 
 jest-haste-map@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
   integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -1856,7 +1847,7 @@ jest-haste-map@^28.1.3:
 
 jest-leak-detector@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz#a6685d9b074be99e3adee816ce84fd30795e654d"
   integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==
   dependencies:
     jest-get-type "^28.0.2"
@@ -1864,7 +1855,7 @@ jest-leak-detector@^28.1.3:
 
 jest-matcher-utils@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
   integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
   dependencies:
     chalk "^4.0.0"
@@ -1874,7 +1865,7 @@ jest-matcher-utils@^28.1.3:
 
 jest-message-util@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.3.tgz#232def7f2e333f1eecc90649b5b94b0055e7c43d"
   integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==
   dependencies:
     "@babel/code-frame" "^7.12.13"
@@ -1889,7 +1880,7 @@ jest-message-util@^28.1.3:
 
 jest-mock@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-28.1.3.tgz#d4e9b1fc838bea595c77ab73672ebf513ab249da"
   integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -1897,17 +1888,17 @@ jest-mock@^28.1.3:
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
 jest-regex-util@^28.0.2:
   version "28.0.2"
-  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
   integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
 
 jest-resolve-dependencies@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz#8c65d7583460df7275c6ea2791901fa975c1fe66"
   integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==
   dependencies:
     jest-regex-util "^28.0.2"
@@ -1915,7 +1906,7 @@ jest-resolve-dependencies@^28.1.3:
 
 jest-resolve@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-28.1.3.tgz#cfb36100341ddbb061ec781426b3c31eb51aa0a8"
   integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==
   dependencies:
     chalk "^4.0.0"
@@ -1930,7 +1921,7 @@ jest-resolve@^28.1.3:
 
 jest-runner@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-28.1.3.tgz#5eee25febd730b4713a2cdfd76bdd5557840f9a1"
   integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==
   dependencies:
     "@jest/console" "^28.1.3"
@@ -1957,7 +1948,7 @@ jest-runner@^28.1.3:
 
 jest-runtime@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-28.1.3.tgz#a57643458235aa53e8ec7821949e728960d0605f"
   integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==
   dependencies:
     "@jest/environment" "^28.1.3"
@@ -1985,7 +1976,7 @@ jest-runtime@^28.1.3:
 
 jest-snapshot@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-28.1.3.tgz#17467b3ab8ddb81e2f605db05583d69388fc0668"
   integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -2014,7 +2005,7 @@ jest-snapshot@^28.1.3:
 
 jest-util@^28.0.0, jest-util@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
   integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -2026,7 +2017,7 @@ jest-util@^28.0.0, jest-util@^28.1.3:
 
 jest-validate@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-28.1.3.tgz#e322267fd5e7c64cea4629612c357bbda96229df"
   integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==
   dependencies:
     "@jest/types" "^28.1.3"
@@ -2038,7 +2029,7 @@ jest-validate@^28.1.3:
 
 jest-watcher@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.3.tgz#c6023a59ba2255e3b4c57179fc94164b3e73abd4"
   integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
   dependencies:
     "@jest/test-result" "^28.1.3"
@@ -2052,7 +2043,7 @@ jest-watcher@^28.1.3:
 
 jest-worker@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
   integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
   dependencies:
     "@types/node" "*"
@@ -2061,7 +2052,7 @@ jest-worker@^28.1.3:
 
 jest@^28.1.0:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-28.1.3.tgz#e9c6a7eecdebe3548ca2b18894a50f45b36dfc6b"
   integrity sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==
   dependencies:
     "@jest/core" "^28.1.3"
@@ -2071,12 +2062,12 @@ jest@^28.1.0:
 
 js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
   version "3.14.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
@@ -2096,18 +2087,18 @@ jsbn@1.1.0:
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+json5@^2.2.1, json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonfile@^6.0.1:
   version "6.1.0"
@@ -2120,22 +2111,22 @@ jsonfile@^6.0.1:
 
 kleur@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 leven@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 lint-staged@10.5.4:
   version "10.5.4"
-  resolved "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665"
   integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==
   dependencies:
     chalk "^4.1.0"
@@ -2156,7 +2147,7 @@ lint-staged@10.5.4:
 
 listr2@^3.2.2:
   version "3.14.0"
-  resolved "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
   integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
   dependencies:
     cli-truncate "^2.1.0"
@@ -2170,19 +2161,19 @@ listr2@^3.2.2:
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
 lodash.memoize@4.x:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 log-symbols@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
     chalk "^4.1.0"
@@ -2190,7 +2181,7 @@ log-symbols@^4.0.0:
 
 log-update@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
   integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
   dependencies:
     ansi-escapes "^4.3.0"
@@ -2198,40 +2189,40 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
-    yallist "^4.0.0"
+    yallist "^3.0.2"
 
 lru-cache@^7.14.1:
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
-make-dir@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
   dependencies:
-    semver "^6.0.0"
+    semver "^7.5.3"
 
 make-error@1.x:
   version "1.3.6"
-  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 makeerror@1.0.12:
   version "1.0.12"
-  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
   integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
     tmpl "1.0.5"
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 micromatch@^4.0.2, micromatch@^4.0.4:
@@ -2244,20 +2235,20 @@ micromatch@^4.0.2, micromatch@^4.0.4:
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 minimatch@^3.0.4, minimatch@^3.1.1:
   version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 mitt@3.0.1:
   version "3.0.1"
@@ -2266,19 +2257,19 @@ mitt@3.0.1:
 
 mkdirp@^0.5.3:
   version "0.5.6"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 netmask@^2.0.2:
@@ -2288,71 +2279,71 @@ netmask@^2.0.2:
 
 node-int64@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.7.tgz"
-  integrity sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ==
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 normalize-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
 p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
 p-limit@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
 p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 pac-proxy-agent@^7.0.1:
@@ -2379,14 +2370,14 @@ pac-resolver@^7.0.1:
 
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -2396,71 +2387,71 @@ parse-json@^5.0.0, parse-json@^5.2.0:
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pend@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
+  integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
 
 picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pirates@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
 please-upgrade-node@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
   integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
   dependencies:
     semver-compare "^1.0.0"
 
 prettier@2.6.2:
   version "2.6.2"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
   integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
 
 pretty-format@^26.0.0, pretty-format@^26.6.2:
   version "26.6.2"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"
   integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
   dependencies:
     "@jest/types" "^26.6.2"
@@ -2470,7 +2461,7 @@ pretty-format@^26.0.0, pretty-format@^26.6.2:
 
 pretty-format@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
   integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
   dependencies:
     "@jest/schemas" "^28.1.3"
@@ -2485,7 +2476,7 @@ progress@^2.0.3:
 
 prompts@^2.0.1:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
     kleur "^3.0.3"
@@ -2511,9 +2502,9 @@ proxy-from-env@^1.1.0:
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"
+  integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -2546,134 +2537,127 @@ queue-tick@^1.0.1:
 
 react-is@^17.0.1:
   version "17.0.2"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
   integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
     resolve-from "^5.0.0"
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-from@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
+  integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
 
 resolve@^1.20.0, resolve@^1.3.2:
-  version "1.22.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
-    is-core-module "^2.9.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
 restore-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
   integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
 rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+  integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
 rimraf@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
 rxjs@^7.5.1:
-  version "7.6.0"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz"
-  integrity sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
 semver-compare@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
 
-semver@7.x, semver@^7.3.5:
-  version "7.3.8"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^5.3.0:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^6.0.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^7.6.3:
+semver@7.x, semver@^7.3.5, semver@^7.5.3, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
+semver@^5.3.0:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+
+semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 sisteransi@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
   integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
   dependencies:
     ansi-styles "^4.0.0"
@@ -2682,7 +2666,7 @@ slice-ansi@^3.0.0:
 
 slice-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
   integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
     ansi-styles "^4.0.0"
@@ -2713,7 +2697,7 @@ socks@^2.8.3:
 
 source-map-support@0.5.13:
   version "0.5.13"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
   integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -2721,7 +2705,7 @@ source-map-support@0.5.13:
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sprintf-js@^1.1.3:
@@ -2731,20 +2715,20 @@ sprintf-js@^1.1.3:
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 stack-utils@^2.0.3:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
-streamx@^2.15.0, streamx@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.18.0.tgz#5bc1a51eb412a667ebfdcd4e6cf6a6fc65721ac7"
-  integrity sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==
+streamx@^2.15.0, streamx@^2.20.0:
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.20.1.tgz#471c4f8b860f7b696feb83d5b125caab2fdbb93c"
+  integrity sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==
   dependencies:
     fast-fifo "^1.3.2"
     queue-tick "^1.0.1"
@@ -2754,12 +2738,12 @@ streamx@^2.15.0, streamx@^2.18.0:
 
 string-argv@0.3.1:
   version "0.3.1"
-  resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
   integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
 string-length@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
@@ -2767,7 +2751,7 @@ string-length@^4.0.1:
 
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
@@ -2776,7 +2760,7 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
 
 stringify-object@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
   integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
   dependencies:
     get-own-enumerable-property-symbols "^3.0.0"
@@ -2785,50 +2769,50 @@ stringify-object@^3.3.0:
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
 strip-bom@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-color@^8.0.0:
   version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
     has-flag "^4.0.0"
 
 supports-hyperlinks@^2.0.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
   integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
@@ -2836,7 +2820,7 @@ supports-hyperlinks@^2.0.0:
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 tar-fs@^3.0.6:
@@ -2861,7 +2845,7 @@ tar-stream@^3.1.5:
 
 terminal-link@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
   integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
   dependencies:
     ansi-escapes "^4.2.1"
@@ -2869,7 +2853,7 @@ terminal-link@^2.0.0:
 
 test-exclude@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
   integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
@@ -2877,37 +2861,37 @@ test-exclude@^6.0.0:
     minimatch "^3.0.4"
 
 text-decoder@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.1.1.tgz#5df9c224cebac4a7977720b9f083f9efa1aefde8"
-  integrity sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.0.tgz#85f19d4d5088e0b45cd841bdfaeac458dbffeefc"
+  integrity sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==
   dependencies:
     b4a "^1.6.4"
 
 through@^2.3.8:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 tmpl@1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
 ts-jest@^28.0.2:
   version "28.0.8"
-  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-28.0.8.tgz#cd204b8e7a2f78da32cf6c95c9a6165c5b99cc73"
   integrity sha512-5FaG0lXmRPzApix8oFG8RKjAz4ehtm8yMKOTy5HX3fY6W8kmvOrmcY0hKDElW52FJov+clhUbrKAqofnj4mXTg==
   dependencies:
     bs-logger "0.x"
@@ -2921,27 +2905,22 @@ ts-jest@^28.0.2:
 
 tslib@^1.13.0, tslib@^1.7.1, tslib@^1.8.1:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
-
-tslib@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"
-  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+tslib@^2.0.1, tslib@^2.1.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
 
 tslint-config-prettier@1.18.0:
   version "1.18.0"
-  resolved "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"
+  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
   integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
 
 tslint-plugin-prettier@2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz#73fe71bf9f03842ac48c104122ca9b1de012ecf4"
   integrity sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==
   dependencies:
     eslint-plugin-prettier "^2.2.0"
@@ -2950,7 +2929,7 @@ tslint-plugin-prettier@2.3.0:
 
 tslint@6.1.3:
   version "6.1.3"
-  resolved "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
   integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -2969,25 +2948,25 @@ tslint@6.1.3:
 
 tsutils@^2.29.0:
   version "2.29.0"
-  resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 type-detect@4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
 type-fest@^0.21.3:
   version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 typescript@^4.6.4:
-  version "4.9.4"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"
-  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 unbzip2-stream@^1.4.3:
   version "1.4.3"
@@ -2997,18 +2976,23 @@ unbzip2-stream@^1.4.3:
     buffer "^5.2.1"
     through "^2.3.8"
 
+undici-types@~6.19.2:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+
 universalify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-update-browserslist-db@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+update-browserslist-db@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
+  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.2.0"
+    picocolors "^1.1.0"
 
 urlpattern-polyfill@10.0.0:
   version "10.0.0"
@@ -3016,31 +3000,31 @@ urlpattern-polyfill@10.0.0:
   integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==
 
 v8-to-istanbul@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"
-  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
+  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
+    convert-source-map "^2.0.0"
 
 walker@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
     makeerror "1.0.12"
 
 which@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
   integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
     ansi-styles "^4.0.0"
@@ -3049,7 +3033,7 @@ wrap-ansi@^6.2.0:
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
@@ -3058,12 +3042,12 @@ wrap-ansi@^7.0.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
@@ -3076,38 +3060,25 @@ ws@^8.18.0:
 
 y18n@^5.0.5:
   version "5.0.8"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yaml@^1.10.0:
   version "1.10.2"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^17.3.1:
-  version "17.6.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz"
-  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yargs@^17.7.2:
+yargs@^17.3.1, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -3122,7 +3093,7 @@ yargs@^17.7.2:
 
 yauzl@^2.10.0:
   version "2.10.0"
-  resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
   dependencies:
     buffer-crc32 "~0.2.3"
@@ -3130,7 +3101,7 @@ yauzl@^2.10.0:
 
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
 zod@3.23.8:

From 2effbe5b3c5009655f47940dcdc2650cf108cc56 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 2 Oct 2024 12:20:50 +0200
Subject: [PATCH 204/210] Fix puppeteer image

---
 test/test-e2e/Dockerfile | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/test/test-e2e/Dockerfile b/test/test-e2e/Dockerfile
index ef17adee..768214a8 100644
--- a/test/test-e2e/Dockerfile
+++ b/test/test-e2e/Dockerfile
@@ -1,17 +1,6 @@
-FROM node:20
-
-# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
-# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
-# installs, work.
-RUN apt-get update \
-    && apt-get install -y wget gnupg \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update \
-    && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
-      --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
+FROM ghcr.io/puppeteer/puppeteer:22
 
+USER root
 # If running Docker >= 1.13.0 use docker run's --init arg to reap zombie processes, otherwise
 # uncomment the following lines to have `dumb-init` as PID 1
 # ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_x86_64 /usr/local/bin/dumb-init

From 71a29004dbeb507b5362f7bdc1131d1501550f7a Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Wed, 2 Oct 2024 12:42:18 +0200
Subject: [PATCH 205/210] Fix puppeteer image

---
 test/test-e2e/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-e2e/Dockerfile b/test/test-e2e/Dockerfile
index 768214a8..b2e830d6 100644
--- a/test/test-e2e/Dockerfile
+++ b/test/test-e2e/Dockerfile
@@ -23,7 +23,7 @@ RUN yarn install --timeout 99999999
 
 # Run everything after as non-privileged user.
 
-
+RUN npx puppeteer browsers install chrome
 COPY --chown=test . . 
 USER test
 CMD ["yarn", "test"]
\ No newline at end of file

From 59446a2b5680ac5d75514784a812f99a4efe8dfa Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Thu, 3 Oct 2024 10:39:52 +0200
Subject: [PATCH 206/210] CH-152 small refactoring

---
 .../cloudharness/auth/quota.py                   |  2 +-
 .../cloudharness/auth/user_attributes.py         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/cloudharness-common/cloudharness/auth/quota.py b/libraries/cloudharness-common/cloudharness/auth/quota.py
index d004443b..cbe428ad 100644
--- a/libraries/cloudharness-common/cloudharness/auth/quota.py
+++ b/libraries/cloudharness-common/cloudharness/auth/quota.py
@@ -39,7 +39,7 @@ def get_user_quotas(application_config: ApplicationConfig = None, user_id: str =
     valid_keys_map = {key for key in base_quotas}
 
     try:
-        return get_user_attributes(user_id, valid_keys_map=valid_keys_map, default_attributes=base_quotas)
+        return get_user_attributes(user_id, valid_keys=valid_keys_map, default_attributes=base_quotas)
 
     except UserNotFound as e:
         log.warning("Quotas not available: error retrieving user: %s", user_id)
diff --git a/libraries/cloudharness-common/cloudharness/auth/user_attributes.py b/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
index 403addd2..03714958 100644
--- a/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
+++ b/libraries/cloudharness-common/cloudharness/auth/user_attributes.py
@@ -16,19 +16,19 @@ def addChild(self, child):
         self.children.append(child)
 
 
-def _filter_attrs(attrs, valid_keys_map):
+def _filter_attrs(attrs, valid_keys):
     # only use the attributes defined by the valid keys map
     valid_attrs = {}
     if attrs is None:
         return valid_attrs
     for key in attrs:
-        if key in valid_keys_map:
+        if key in valid_keys:
             # map to value
             valid_attrs.update({key: attrs[key][0]})
     return valid_attrs
 
 
-def _construct_attribute_tree(groups, valid_keys_map) -> KCAttributeNode:
+def _construct_attribute_tree(groups, valid_keys) -> KCAttributeNode:
     """Construct a tree of attributes from the user groups"""
     root = KCAttributeNode("root", {})
     for group in groups:
@@ -49,7 +49,7 @@ def _construct_attribute_tree(groups, valid_keys_map) -> KCAttributeNode:
         # add the child with it's attributes and last segment name
         n = KCAttributeNode(
             paths[len(paths) - 1],
-            _filter_attrs(group["attributes"], valid_keys_map)
+            _filter_attrs(group["attributes"], valid_keys)
         )
         r.addChild(n)
     return root
@@ -103,12 +103,12 @@ def _compute_attributes_from_tree(node: KCAttributeNode, transform_value_fn=lamb
     return node.attrs
 
 
-def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attributes={}, transform_value_fn=lambda x: x) -> dict:
+def get_user_attributes(user_id: str = None, valid_keys={}, default_attributes={}, transform_value_fn=lambda x: x) -> dict:
     """Get the user attributes from Keycloak recursively from the user attributes and groups
 
     Args:
         user_id (str): the Keycloak user id or username to get the quotas for
-        valid_keys_map (dict): the valid keys to use for the attributes
+        valid_keys (iterable): the valid keys to use for the attributes
         default_attributes (dict): the default attributes to use if the user does not have the attribute
 
     Returns:
@@ -130,8 +130,8 @@ def get_user_attributes(user_id: str = None, valid_keys_map={}, default_attribut
     group_quotas = _compute_attributes_from_tree(
         _construct_attribute_tree(
             user["userGroups"],
-            valid_keys_map), transform_value_fn)
-    user_attrs = _filter_attrs(user["attributes"], valid_keys_map)
+            valid_keys), transform_value_fn)
+    user_attrs = _filter_attrs(user["attributes"], valid_keys)
     for key in group_quotas:
         if key not in user_attrs:
             user_attrs.update({key: group_quotas[key]})

From 2aa5bf9b28abbe74010787e5279995e3e4dea7cd Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Thu, 3 Oct 2024 14:35:21 +0200
Subject: [PATCH 207/210] Fix samples resource paths

---
 applications/samples/frontend/index.html            |   2 +-
 .../frontend/public/{ => assets}/favicon.png        | Bin
 .../samples/frontend/public/{ => assets}/logo.png   | Bin
 applications/samples/frontend/src/App.tsx           |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename applications/samples/frontend/public/{ => assets}/favicon.png (100%)
 rename applications/samples/frontend/public/{ => assets}/logo.png (100%)

diff --git a/applications/samples/frontend/index.html b/applications/samples/frontend/index.html
index d0f66997..10344a23 100644
--- a/applications/samples/frontend/index.html
+++ b/applications/samples/frontend/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="/favicon.png" />
+  <link rel="icon" type="image/svg+xml" href="/assets/favicon.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>CloudHarness sample application</title>
 </head>
diff --git a/applications/samples/frontend/public/favicon.png b/applications/samples/frontend/public/assets/favicon.png
similarity index 100%
rename from applications/samples/frontend/public/favicon.png
rename to applications/samples/frontend/public/assets/favicon.png
diff --git a/applications/samples/frontend/public/logo.png b/applications/samples/frontend/public/assets/logo.png
similarity index 100%
rename from applications/samples/frontend/public/logo.png
rename to applications/samples/frontend/public/assets/logo.png
diff --git a/applications/samples/frontend/src/App.tsx b/applications/samples/frontend/src/App.tsx
index a6a2ac78..e96e68ff 100644
--- a/applications/samples/frontend/src/App.tsx
+++ b/applications/samples/frontend/src/App.tsx
@@ -4,7 +4,7 @@ import Version from './components/Version';
 
 const Main = () => (
   <>
-    <img src="/logo.png" width="800" />
+    <img src="/assets/logo.png" width="800" />
     <h1>Sample React application is working!</h1>
     <Version />
     <RestTest />

From bf2b204ffe5737689933c1171cdb14ceae4a49da Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Thu, 3 Oct 2024 18:13:21 +0200
Subject: [PATCH 208/210] e2e tests fix

---
 test/test-e2e/Dockerfile         |  40 +---
 test/test-e2e/docker-compose.yml |  10 +
 test/test-e2e/package.json       |   2 +-
 test/test-e2e/yarn.lock          | 344 ++++++++++++++++---------------
 4 files changed, 196 insertions(+), 200 deletions(-)
 create mode 100644 test/test-e2e/docker-compose.yml

diff --git a/test/test-e2e/Dockerfile b/test/test-e2e/Dockerfile
index ef17adee..4630caed 100644
--- a/test/test-e2e/Dockerfile
+++ b/test/test-e2e/Dockerfile
@@ -1,40 +1,18 @@
-FROM node:20
+FROM ghcr.io/puppeteer/puppeteer:23
 
-# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
-# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
-# installs, work.
-RUN apt-get update \
-    && apt-get install -y wget gnupg \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update \
-    && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
-      --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
-
-# If running Docker >= 1.13.0 use docker run's --init arg to reap zombie processes, otherwise
-# uncomment the following lines to have `dumb-init` as PID 1
-# ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_x86_64 /usr/local/bin/dumb-init
-# RUN chmod +x /usr/local/bin/dumb-init
-# ENTRYPOINT ["dumb-init", "--"]
-
-# Uncomment to skip the chromium download when installing puppeteer. If you do,
-# you'll need to launch puppeteer with:
-#     browser.launch({executablePath: 'google-chrome-stable'})
-# ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
+USER root
 RUN mkdir -p /home/test
-RUN groupadd -r test && useradd -r -g test -G audio,video test \
-    && chown -R test:test /home/test
+RUN  chown -R pptruser /home/test
 WORKDIR /home/test
-USER test
+# Install Chrome for the root user: Codefresh runs the container as root
+RUN npx puppeteer browsers install chrome 
+
+USER pptruser
 COPY package.json . 
 COPY yarn.lock . 
 RUN yarn install --timeout 99999999
 
+COPY --chown=pptruser . . 
+ENV APP_URL=https://github.com
 
-# Run everything after as non-privileged user.
-
-
-COPY --chown=test . . 
-USER test
 CMD ["yarn", "test"]
\ No newline at end of file
diff --git a/test/test-e2e/docker-compose.yml b/test/test-e2e/docker-compose.yml
new file mode 100644
index 00000000..32036d29
--- /dev/null
+++ b/test/test-e2e/docker-compose.yml
@@ -0,0 +1,10 @@
+version: "3"
+services:
+  tests:
+    image: test-e2e
+    environment:
+    - APP_URL=https://samples.test-ch.dev.metacell.us
+    - USERNAME=sample@testuser.com
+    - PASSWORD=test
+    volumes:
+      - ../../applications/samples/test/e2e:/home/test/__tests__/samples'
diff --git a/test/test-e2e/package.json b/test/test-e2e/package.json
index 3760a824..f184bb87 100644
--- a/test/test-e2e/package.json
+++ b/test/test-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Filippo Ledda <filippo@metacell.us>",
   "dependencies": {
     "jest": "^28.1.0",
-    "puppeteer": "22.14.0",
+    "puppeteer": "^23.0.0",
     "ts-jest": "^28.0.2",
     "typescript": "^4.6.4"
   },
diff --git a/test/test-e2e/yarn.lock b/test/test-e2e/yarn.lock
index a276525c..f3d2748d 100644
--- a/test/test-e2e/yarn.lock
+++ b/test/test-e2e/yarn.lock
@@ -10,131 +10,131 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
-  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.25.7.tgz#438f2c524071531d643c6f0188e1e28f130cebc7"
+  integrity sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==
   dependencies:
-    "@babel/highlight" "^7.24.7"
+    "@babel/highlight" "^7.25.7"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.25.2":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
-  integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
+"@babel/compat-data@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.7.tgz#b8479fe0018ef0ac87b6b7a5c6916fcd67ae2c9c"
+  integrity sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==
 
 "@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
-  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.7.tgz#1b3d144157575daf132a3bc80b2b18e6e3ca6ece"
+  integrity sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.24.7"
-    "@babel/generator" "^7.25.0"
-    "@babel/helper-compilation-targets" "^7.25.2"
-    "@babel/helper-module-transforms" "^7.25.2"
-    "@babel/helpers" "^7.25.0"
-    "@babel/parser" "^7.25.0"
-    "@babel/template" "^7.25.0"
-    "@babel/traverse" "^7.25.2"
-    "@babel/types" "^7.25.2"
+    "@babel/code-frame" "^7.25.7"
+    "@babel/generator" "^7.25.7"
+    "@babel/helper-compilation-targets" "^7.25.7"
+    "@babel/helper-module-transforms" "^7.25.7"
+    "@babel/helpers" "^7.25.7"
+    "@babel/parser" "^7.25.7"
+    "@babel/template" "^7.25.7"
+    "@babel/traverse" "^7.25.7"
+    "@babel/types" "^7.25.7"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.25.0", "@babel/generator@^7.25.6", "@babel/generator@^7.7.2":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c"
-  integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==
+"@babel/generator@^7.25.7", "@babel/generator@^7.7.2":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.7.tgz#de86acbeb975a3e11ee92dd52223e6b03b479c56"
+  integrity sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==
   dependencies:
-    "@babel/types" "^7.25.6"
+    "@babel/types" "^7.25.7"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^2.5.1"
+    jsesc "^3.0.2"
 
-"@babel/helper-compilation-targets@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
-  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
+"@babel/helper-compilation-targets@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz#11260ac3322dda0ef53edfae6e97b961449f5fa4"
+  integrity sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==
   dependencies:
-    "@babel/compat-data" "^7.25.2"
-    "@babel/helper-validator-option" "^7.24.8"
-    browserslist "^4.23.1"
+    "@babel/compat-data" "^7.25.7"
+    "@babel/helper-validator-option" "^7.25.7"
+    browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-module-imports@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
-  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
-  dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-module-transforms@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
-  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.24.7"
-    "@babel/helper-simple-access" "^7.24.7"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    "@babel/traverse" "^7.25.2"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
-  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
-
-"@babel/helper-simple-access@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
-  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
-  dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-string-parser@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
-  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
-
-"@babel/helper-validator-identifier@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
-  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
-
-"@babel/helper-validator-option@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
-  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
-
-"@babel/helpers@^7.25.0":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60"
-  integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==
-  dependencies:
-    "@babel/template" "^7.25.0"
-    "@babel/types" "^7.25.6"
-
-"@babel/highlight@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
-  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.24.7"
+"@babel/helper-module-imports@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz#dba00d9523539152906ba49263e36d7261040472"
+  integrity sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==
+  dependencies:
+    "@babel/traverse" "^7.25.7"
+    "@babel/types" "^7.25.7"
+
+"@babel/helper-module-transforms@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz#2ac9372c5e001b19bc62f1fe7d96a18cb0901d1a"
+  integrity sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.25.7"
+    "@babel/helper-simple-access" "^7.25.7"
+    "@babel/helper-validator-identifier" "^7.25.7"
+    "@babel/traverse" "^7.25.7"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.25.7", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz#8ec5b21812d992e1ef88a9b068260537b6f0e36c"
+  integrity sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==
+
+"@babel/helper-simple-access@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz#5eb9f6a60c5d6b2e0f76057004f8dacbddfae1c0"
+  integrity sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==
+  dependencies:
+    "@babel/traverse" "^7.25.7"
+    "@babel/types" "^7.25.7"
+
+"@babel/helper-string-parser@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz#d50e8d37b1176207b4fe9acedec386c565a44a54"
+  integrity sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==
+
+"@babel/helper-validator-identifier@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz#77b7f60c40b15c97df735b38a66ba1d7c3e93da5"
+  integrity sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==
+
+"@babel/helper-validator-option@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz#97d1d684448228b30b506d90cace495d6f492729"
+  integrity sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==
+
+"@babel/helpers@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.7.tgz#091b52cb697a171fe0136ab62e54e407211f09c2"
+  integrity sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==
+  dependencies:
+    "@babel/template" "^7.25.7"
+    "@babel/types" "^7.25.7"
+
+"@babel/highlight@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.7.tgz#20383b5f442aa606e7b5e3043b0b1aafe9f37de5"
+  integrity sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f"
-  integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.25.7":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.7.tgz#99b927720f4ddbfeb8cd195a363ed4532f87c590"
+  integrity sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==
   dependencies:
-    "@babel/types" "^7.25.6"
+    "@babel/types" "^7.25.7"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -165,11 +165,11 @@
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-import-attributes@^7.24.7":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz#6d4c78f042db0e82fd6436cd65fec5dc78ad2bde"
-  integrity sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz#d78dd0499d30df19a598e63ab895e21b909bc43f"
+  integrity sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.25.7"
 
 "@babel/plugin-syntax-import-meta@^7.10.4":
   version "7.10.4"
@@ -242,41 +242,41 @@
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz#04db9ce5a9043d9c635e75ae7969a2cd50ca97ff"
-  integrity sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
-
-"@babel/template@^7.25.0", "@babel/template@^7.3.3":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
-  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
-  dependencies:
-    "@babel/code-frame" "^7.24.7"
-    "@babel/parser" "^7.25.0"
-    "@babel/types" "^7.25.0"
-
-"@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2", "@babel/traverse@^7.7.2":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41"
-  integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==
-  dependencies:
-    "@babel/code-frame" "^7.24.7"
-    "@babel/generator" "^7.25.6"
-    "@babel/parser" "^7.25.6"
-    "@babel/template" "^7.25.0"
-    "@babel/types" "^7.25.6"
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz#bfc05b0cc31ebd8af09964650cee723bb228108b"
+  integrity sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.7"
+
+"@babel/template@^7.25.7", "@babel/template@^7.3.3":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.7.tgz#27f69ce382855d915b14ab0fe5fb4cbf88fa0769"
+  integrity sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==
+  dependencies:
+    "@babel/code-frame" "^7.25.7"
+    "@babel/parser" "^7.25.7"
+    "@babel/types" "^7.25.7"
+
+"@babel/traverse@^7.25.7", "@babel/traverse@^7.7.2":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.7.tgz#83e367619be1cab8e4f2892ef30ba04c26a40fa8"
+  integrity sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==
+  dependencies:
+    "@babel/code-frame" "^7.25.7"
+    "@babel/generator" "^7.25.7"
+    "@babel/parser" "^7.25.7"
+    "@babel/template" "^7.25.7"
+    "@babel/types" "^7.25.7"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.3.3":
-  version "7.25.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
-  integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.25.7", "@babel/types@^7.3.3":
+  version "7.25.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.7.tgz#1b7725c1d3a59f328cb700ce704c46371e6eef9b"
+  integrity sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==
   dependencies:
-    "@babel/helper-string-parser" "^7.24.8"
-    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/helper-string-parser" "^7.25.7"
+    "@babel/helper-validator-identifier" "^7.25.7"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -536,12 +536,12 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@puppeteer/browsers@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.3.0.tgz#791ea7d80450fea24eb19fb1d70c367ad4e08cae"
-  integrity sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==
+"@puppeteer/browsers@2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.4.0.tgz#a0dd0f4e381e53f509109ae83b891db5972750f5"
+  integrity sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==
   dependencies:
-    debug "^4.3.5"
+    debug "^4.3.6"
     extract-zip "^2.0.1"
     progress "^2.0.3"
     proxy-agent "^6.4.0"
@@ -916,7 +916,7 @@ braces@^3.0.3:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.23.1:
+browserslist@^4.24.0:
   version "4.24.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4"
   integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==
@@ -1005,10 +1005,10 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-chromium-bidi@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.6.2.tgz#91f9daa20984833b52221084480fbe0465b29c67"
-  integrity sha512-4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==
+chromium-bidi@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.8.0.tgz#ffd79dad7db1fcc874f1c55fcf46ded05a884269"
+  integrity sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug==
   dependencies:
     mitt "3.0.1"
     urlpattern-polyfill "10.0.0"
@@ -1152,7 +1152,7 @@ data-uri-to-buffer@^6.0.2:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz#8a58bb67384b261a38ef18bea1810cb01badd28b"
   integrity sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.4, debug@^4.3.5:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.4, debug@^4.3.6, debug@^4.3.7:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
   integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -1183,10 +1183,10 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-devtools-protocol@0.0.1312386:
-  version "0.0.1312386"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz#5ab824d6f1669ec6c6eb0fba047e73601d969052"
-  integrity sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==
+devtools-protocol@0.0.1342118:
+  version "0.0.1342118"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz#ea136fc1701572c0830233dcb414dc857e582e0a"
+  integrity sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==
 
 diff-sequences@^26.6.2:
   version "26.6.2"
@@ -2085,10 +2085,10 @@ jsbn@1.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
   integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+jsesc@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
+  integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
 
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
@@ -2509,26 +2509,29 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-puppeteer-core@22.14.0:
-  version "22.14.0"
-  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-22.14.0.tgz#5bb466adba725c966b0a86f0337a476d4c68ebec"
-  integrity sha512-rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==
+puppeteer-core@23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-23.5.0.tgz#f7fb015f0a39b2d85f54df10864c0761b05953db"
+  integrity sha512-+5ed+625GuQ2emRHqYec8khT9LP14FWzv8hYl0HiM6hnnlNzdVU9uDJIPHeCPLIWxq15ost9MeF8kBk4R3eiFw==
   dependencies:
-    "@puppeteer/browsers" "2.3.0"
-    chromium-bidi "0.6.2"
-    debug "^4.3.5"
-    devtools-protocol "0.0.1312386"
+    "@puppeteer/browsers" "2.4.0"
+    chromium-bidi "0.8.0"
+    debug "^4.3.7"
+    devtools-protocol "0.0.1342118"
+    typed-query-selector "^2.12.0"
     ws "^8.18.0"
 
-puppeteer@22.14.0:
-  version "22.14.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-22.14.0.tgz#11697c929f5d9d7eac5a3438a0ff12dc65aedcbe"
-  integrity sha512-MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==
+puppeteer@^23.0.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-23.5.0.tgz#5cafaff6181beb930567c860482eccfe79dad3a8"
+  integrity sha512-jnUx5M0YtFva7vXr39qqsxgB46JiwXJavuM1Hgsqbd9WWiGTEUt9klGpTxyHi+ZQf3NUgleDhNsnI10IK8Ebsg==
   dependencies:
-    "@puppeteer/browsers" "2.3.0"
+    "@puppeteer/browsers" "2.4.0"
+    chromium-bidi "0.8.0"
     cosmiconfig "^9.0.0"
-    devtools-protocol "0.0.1312386"
-    puppeteer-core "22.14.0"
+    devtools-protocol "0.0.1342118"
+    puppeteer-core "23.5.0"
+    typed-query-selector "^2.12.0"
 
 queue-tick@^1.0.1:
   version "1.0.1"
@@ -2963,6 +2966,11 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+typed-query-selector@^2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/typed-query-selector/-/typed-query-selector-2.12.0.tgz#92b65dbc0a42655fccf4aeb1a08b1dddce8af5f2"
+  integrity sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==
+
 typescript@^4.6.4:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"

From f580decce03a723325253a4b899e9d2ccc55c3ec Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Thu, 3 Oct 2024 18:36:06 +0200
Subject: [PATCH 209/210] Fix test pipeline (remove deployment delete)

---
 .../codefresh-template-test.yaml                 | 14 +-------------
 deployment/codefresh-test.yaml                   | 16 ++--------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/deployment-configuration/codefresh-template-test.yaml b/deployment-configuration/codefresh-template-test.yaml
index 84284c0d..2486c981 100644
--- a/deployment-configuration/codefresh-template-test.yaml
+++ b/deployment-configuration/codefresh-template-test.yaml
@@ -132,16 +132,4 @@ steps:
     when:
       condition:
         all:
-          error: '"${{FAILED}}" == "failed"'
-  delete_deployment:
-    title: "Delete deployment"
-    description: The deployment is deleted at the end of the pipeline
-    image: codefresh/kubectl
-    stage: qa
-    commands:
-      - kubectl config use-context ${{CLUSTER_NAME}}
-      - kubectl delete ns test-${{NAMESPACE_BASENAME}}
-    when:
-      condition:
-        all:
-          delete: ${{DELETE_ON_SUCCESS}} == "true"
\ No newline at end of file
+          error: '"${{FAILED}}" == "failed"'
\ No newline at end of file
diff --git a/deployment/codefresh-test.yaml b/deployment/codefresh-test.yaml
index c20d94bc..3a144406 100644
--- a/deployment/codefresh-test.yaml
+++ b/deployment/codefresh-test.yaml
@@ -522,7 +522,7 @@ steps:
   approval:
     type: pending-approval
     stage: qa
-    title: Approve anyway and delete deployment
+    title: Approve anyway
     description: The pipeline will fail after ${{WAIT_ON_FAIL}} minutes
     timeout:
       timeUnit: minutes
@@ -531,16 +531,4 @@ steps:
     when:
       condition:
         all:
-          error: '"${{FAILED}}" == "failed"'
-  delete_deployment:
-    title: Delete deployment
-    description: The deployment is deleted at the end of the pipeline
-    image: codefresh/kubectl
-    stage: qa
-    commands:
-    - kubectl config use-context ${{CLUSTER_NAME}}
-    - kubectl delete ns test-${{NAMESPACE_BASENAME}}
-    when:
-      condition:
-        all:
-          delete: '${{DELETE_ON_SUCCESS}} == "true"'
\ No newline at end of file
+          error: '"${{FAILED}}" == "failed"'
\ No newline at end of file

From af3703e2a48cdc485864ccd204aa3a293e016695 Mon Sep 17 00:00:00 2001
From: Filippo Ledda <filippo@metacell.us>
Date: Tue, 8 Oct 2024 10:16:15 +0200
Subject: [PATCH 210/210] Fix skaffold for local dev

---
 tools/deployment-cli-tools/ch_cli_tools/skaffold.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 22320082..9609ad86 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -220,7 +220,7 @@ def identify_unicorn_based_main(candidates):
                 'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
             }
         }
-    if backend == COMPOSE_ENGINE or not helm_values.tag:
+    if backend == COMPOSE_ENGINE or helm_values.tag and not helm_values.local:
         skaffold_conf['build']['tagPolicy'] = {
             'envTemplate': {
                 'template': '"{{.TAG}}"'